Index: AlarmDefs.h =================================================================== diff -u -r63682305bd0bc572b4531eb28706f8003a34e677 -r38720354352504d0cbda0a54a368fc9ad79b3920 --- AlarmDefs.h (.../AlarmDefs.h) (revision 63682305bd0bc572b4531eb28706f8003a34e677) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 38720354352504d0cbda0a54a368fc9ad79b3920) @@ -7,8 +7,8 @@ * * @file AlarmDefs.h * -* @author (last) Hung Nguyen -* @date (last) 11-Nov-2021 +* @author (last) Dara Navaei +* @date (last) 01-Dec-2021 * * @author (original) Sean * @date (original) 11-Feb-2020 @@ -193,7 +193,7 @@ ALARM_ID____AVAILABLE_22 = 155, ///< This alarm ID is available for use ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156, ///< HW usage data (treatment time in HD and total consumed water in DG) failure ALARM_ID____AVAILABLE_23 = 157, ///< This alarm ID is available for use - ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158, ///< Blood pump failed flow vs. motor speed check. + ALARM_ID____AVAILABLE_24 = 158, ///< Blood pump failed flow vs. motor speed check. ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159, ///< Dialysate inlet pump failed flow vs. motor speed check. ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160, ///< Blood pump rotor speed too high ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 161, ///< Blood flow sensor signal strength too low TODO remove this alarm when FMB fully removed @@ -606,7 +606,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_22, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_23, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_24, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, 0, ALARM_ID_NO_ALARM }, @@ -718,7 +718,7 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_TOUCH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_SDCARD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_RTC, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_POST_FAILURE_WIFI, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_WIFI, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_BLUETOOTH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_ETHERNET, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_SOUND, 0, ALARM_ID_NO_ALARM }, @@ -784,7 +784,6 @@ { 1, ALARM_ID_UI_POST_FAILURE_TOUCH }, { 1, ALARM_ID_UI_POST_FAILURE_SDCARD }, { 1, ALARM_ID_UI_POST_FAILURE_RTC }, - { 1, ALARM_ID_UI_POST_FAILURE_WIFI }, { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC }, @@ -935,7 +934,7 @@ { 799, ALARM_ID____AVAILABLE_22 }, { 799, ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR }, { 799, ALARM_ID____AVAILABLE_23 }, - { 799, ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, + { 799, ALARM_ID____AVAILABLE_24 }, { 799, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK }, { 799, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH }, { 799, ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW }, @@ -1030,6 +1029,7 @@ { 999, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT }, { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT }, { 999, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT }, + { 999, ALARM_ID_UI_POST_FAILURE_WIFI }, { 999, ALARM_ID_UI_POST_FAILURE_BLUETOOTH }, { 999, ALARM_ID_UI_POST_FAILURE_ETHERNET }, { 999, ALARM_ID_UI_POST_FAILURE_SOUND },