Index: AlarmDefs.h =================================================================== diff -u -r5c95c9b661bf587d91fc47bc740ef004dcf2317d -r716fb373ea6574bbc7d16d84fdb4afc837511e9f --- AlarmDefs.h (.../AlarmDefs.h) (revision 5c95c9b661bf587d91fc47bc740ef004dcf2317d) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 716fb373ea6574bbc7d16d84fdb4afc837511e9f) @@ -45,8 +45,8 @@ ALARM_ID_HD_RTC_BATTERY_LOW = 7, ///< HD RTC battery low ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 8, ///< HD accelerometer failed POST ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 9, ///< DG accelerometer failed POST - ALARM_ID__AVAILABLE_2 = 10, ///< Alarm ID available for use - ALARM_ID__AVAILABLE_11 = 11, ///< Alarm ID available for use + ALARM_ID_HD_BLOOD_LEAK_FAULT = 10, //TODO remove when DEN-12931 was merged ///< Alarm ID available for use + ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 11, //TODO remove when DEN-12931 was merged ///< Alarm ID available for use ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION = 14, ///< HD blood flow invalid calibration @@ -455,8 +455,8 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_HD_RTC_BATTERY_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_11, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_FAULT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, @@ -760,8 +760,8 @@ { 1, ALARM_ID_UI_COMM_POST_FAILED }, { 1, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE }, - { 1, ALARM_ID__AVAILABLE_2 }, - { 1, ALARM_ID__AVAILABLE_11 }, + { 1, ALARM_ID_HD_BLOOD_LEAK_FAULT }, + { 1, ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_HD_BLOOD_FLOW_INVALID_CALIBRATION },