Index: AlarmDefs.h =================================================================== diff -u -r3085649d7458c30e3e522453a181b8232428548a -r4e7d179ea8455a45ba8304ca68f50e7bf0359ab2 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3085649d7458c30e3e522453a181b8232428548a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 4e7d179ea8455a45ba8304ca68f50e7bf0359ab2) @@ -7,8 +7,8 @@ * * @file AlarmDefs.h * -* @author (last) Dara Navaei -* @date (last) 06-Sep-2022 +* @author (last) Dong Nguyen +* @date (last) 08-Sep-2022 * * @author (original) Sean * @date (original) 11-Feb-2020 @@ -340,6 +340,7 @@ ALARM_ID_DG_CPU_RAM_ERROR = 302, ///< DG processor RAM error ALARM_ID__AVAILABLE_4 = 303, ///< Alarm ID available for use ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record + ALARM_ID_HD_CPU_RAM_ERROR = 305, ///< HD processor RAM error NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -772,9 +773,10 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 999, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM } }; // Priority Rank Fault DFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -987,6 +989,8 @@ { 3, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_CPU_RAM_ERROR }, + { 3, ALARM_ID_HD_CPU_RAM_ERROR }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1083,7 +1087,6 @@ { 999, ALARM_ID_HD_DISINFECT_FLUSH }, { 999, ALARM_ID_HD_DISINFECT_HEAT }, { 999, ALARM_ID_HD_DISINFECT_CHEM }, - { 999, ALARM_ID_DG_CPU_RAM_ERROR }, { 999, ALARM_ID_NO_ALARM }, }; Index: MsgDefs.h =================================================================== diff -u -r5c75b8c0b97cc94a707d785009fa5525c9488fde -r4e7d179ea8455a45ba8304ca68f50e7bf0359ab2 --- MsgDefs.h (.../MsgDefs.h) (revision 5c75b8c0b97cc94a707d785009fa5525c9488fde) +++ MsgDefs.h (.../MsgDefs.h) (revision 4e7d179ea8455a45ba8304ca68f50e7bf0359ab2) @@ -354,6 +354,9 @@ MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082, ///< HD set blood leak embedded mode command MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083, ///< HD send blood leak embedded mode response MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084, ///< HD re-send trigger messages for all active alarms request + MSG_ID_HD_BLOOD_PUMP_SET_PWM = 0x8085, + MSG_ID_HD_DIAL_IN_SET_PWM = 0x8086, + MSG_ID_HD_DIAL_OUT_SET_PWM = 0x8087, MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in