Index: AlarmDefs.h =================================================================== diff -u -rf64f3f0b5d3a015a41d7c784b549d9b46667e70b -r0b1e7ab83ee790a766978a013da5e21ee6732890 --- AlarmDefs.h (.../AlarmDefs.h) (revision f64f3f0b5d3a015a41d7c784b549d9b46667e70b) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 0b1e7ab83ee790a766978a013da5e21ee6732890) @@ -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_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED = 303, ///< HD service time interval has elapsed 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_DG_DISINFECT_HAS_BEEN_EXPIRED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED, 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_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED, 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: DGDefs.h =================================================================== diff -u -r1c89aebf8dc382b17637f6a81da3b7c50a881780 -r0b1e7ab83ee790a766978a013da5e21ee6732890 --- DGDefs.h (.../DGDefs.h) (revision 1c89aebf8dc382b17637f6a81da3b7c50a881780) +++ DGDefs.h (.../DGDefs.h) (revision 0b1e7ab83ee790a766978a013da5e21ee6732890) @@ -63,15 +63,14 @@ DG_POST_STATE_TEMPERATURE_SENSORS, ///< Temperature Sensors POST state DG_POST_STATE_ACCELEROMETER, ///< Accelerometer POST state DG_POST_STATE_PRESSURES, ///< Pressure sensors POST state - DG_POST_STATE_RO_PUMP, ///< RO pump POST state DG_POST_STATE_DRAIN_PUMP, ///< Drain pump POST state DG_POST_STATE_CONCENTRATE_PUMPS, ///< Concentrate pumps POST state DG_POST_STATE_CONDUCTIVITY_SENSORS, ///< Conductivity sensors POST state DG_POST_STATE_RESERVOIRS, ///< Reservoirs POST state DG_POST_STATE_UV_REACTORS, ///< UV reactors POST state DG_POST_STATE_THERMISTORS, ///< Thermistors POST state DG_POST_STATE_FANS, ///< Fans POST state - DG_POST_STATE_DIALYSATE_FLOW_SENSOR, ///< Dialysate flow sensor POST state + DG_POST_STATE_FLOW_SENSORS, ///< Flow sensors POST state DG_POST_STATE_WATCHDOG, ///< Watchdog POST test state DG_POST_STATE_SAFETY_SHUTDOWN, ///< Safety shutdown POST test state DG_POST_STATE_LOAD_CELL, ///< Load cells POST state @@ -546,6 +545,12 @@ DG_EVENT_CONCENTRATE_CAP_SWITCH_CHANGE, ///< DG concentrate cap switch change DG_EVENT_DIALYSATE_CAP_SWITCH_CHANGE, ///< DG dialysate cap switch change DG_EVENT_CPU_RAM_ERROR_STATUS, ///< DG processor RAM error + DG_EVENT_CAL_RECORD_UPDATE, ///< DG new calibration record updated + DG_EVENT_SYSTEM_RECORD_UPDATE, ///< DG new system record has been updated + DG_EVENT_SERVICE_UPDATE, ///< DG new service record has been updated + DG_EVENT_USAGE_INFO_UPDATE, ///< DG new usage information has been updated + DG_EVENT_SW_CONFIG_UPDATE, ///< DG new software configuration has been updated + DG_EVENT_NO_EVENT, ///< DG no event has been updated NUM_OF_DG_EVENT_IDS ///< Total number of DG events }; typedef enum DG_Event_List DG_EVENT_ID_T; ///< Type for DG event list enumeration Index: HDDefs.h =================================================================== diff -u -r0912fa3d431339074134e4c698cd3930333049dd -r0b1e7ab83ee790a766978a013da5e21ee6732890 --- HDDefs.h (.../HDDefs.h) (revision 0912fa3d431339074134e4c698cd3930333049dd) +++ HDDefs.h (.../HDDefs.h) (revision 0b1e7ab83ee790a766978a013da5e21ee6732890) @@ -7,8 +7,8 @@ * * @file HDDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 07-Sep-2022 +* @author (last) Dong Nguyen +* @date (last) 08-Sep-2022 * * @author (original) Sean Nash * @date (original) 29-May-2020