Index: AlarmDefs.h =================================================================== diff -u -rbecfbc4d11de64248085cde7f064d4e1cf63f978 -r48ed2dcdf3dd2c2a3b642ccb1acb765b41132af2 --- AlarmDefs.h (.../AlarmDefs.h) (revision becfbc4d11de64248085cde7f064d4e1cf63f978) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 48ed2dcdf3dd2c2a3b642ccb1acb765b41132af2) @@ -152,10 +152,10 @@ ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114, ///< HD venous air bubble detector self-test failure ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115, ///< DG temperature sensor out of range ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116, ///< DG temperature sensor ADC out of range - ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117, ///< DG primary heater internal temperature out of range - ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118, ///< DG primary heater cold junction temperature out of range - ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119, ///< DG trimmer heater internal temperature out of range - ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120, ///< DG trimmer heater cold junction temperature out of range + ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 117, ///< DG primary heater internal temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE = 118, ///< DG primary heater cold junction temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 119, ///< DG trimmer heater internal temperature out of range // TODO remove when DEN-11750 was merged + ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE = 120, ///< DG trimmer heater cold junction temperature out of range // TODO remove when DEN-11750 was merged ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 121, ///< DG main primary heater voltage out of range ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE = 122, ///< DG small primary heater voltage out of range ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE = 123, ///< DG trimmer heater voltage out of range