Index: AlarmDefs.h =================================================================== diff -u -rf1859adcdab20e4703fd84322ba8f0aafe04e03e -r220bfef736823b311cf0fe588c073881aadd75df --- AlarmDefs.h (.../AlarmDefs.h) (revision f1859adcdab20e4703fd84322ba8f0aafe04e03e) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 220bfef736823b311cf0fe588c073881aadd75df) @@ -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 // 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____AVAILABLE_28 = 117, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_29 = 118, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_30 = 119, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_31 = 120, ///< This alarm ID is available for use 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 @@ -562,10 +562,10 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_28, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_29, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_30, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID____AVAILABLE_31, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -873,10 +873,10 @@ { 3, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_PRIMARY_HEATER_CJ_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_TRIMMER_HEATER_CJ_TEMP_OUT_OF_RANGE }, + { 3, ALARM_ID____AVAILABLE_28 }, + { 3, ALARM_ID____AVAILABLE_29 }, + { 3, ALARM_ID____AVAILABLE_30 }, + { 3, ALARM_ID____AVAILABLE_31 }, { 3, ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE }, { 3, ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE },