Index: AlarmDefs.h =================================================================== diff -u -r86c29423ffbd0613badc2879841a934d30317104 -r6ef36d1727d845984101852ea433cf5198db8d81 --- AlarmDefs.h (.../AlarmDefs.h) (revision 86c29423ffbd0613badc2879841a934d30317104) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6ef36d1727d845984101852ea433cf5198db8d81) @@ -337,6 +337,7 @@ ALARM_ID_DG_DISINFECT_HAS_BEEN_EXPIRED = 299, ///< DG disinfect has been expired ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED = 300, ///< DG service time interval has elapsed ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE = 301, ///< DG primary heater power voltage out of range + ALARM_ID_DG_CPU_RAM_ERROR = 302, ///< DG processor RAM error NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -485,7 +486,11 @@ { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_SENSOR_ZERO_SEQUENCE_FAILED, 0, ALARM_ID_NO_ALARM }, +<<<<<<< Updated upstream { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, +======= + { ALARM_PRIORITY_HIGH, 1, TRUE, TRUE, TRUE, TRUE , TRUE, TRUE, TRUE, TRUE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE, 0, ALARM_ID_NO_ALARM }, +>>>>>>> Stashed changes { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, ALARM_ID_NO_ALARM }, @@ -624,7 +629,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM, 0, ALARM_ID_NO_ALARM }, @@ -763,13 +768,15 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_UI_POST_FAILURE_CLOUDSYNC, 0, ALARM_ID_NO_ALARM }, +<<<<<<< Updated upstream { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { 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 }, -}; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To + { 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 } +}; // 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. const ALARM_RANK_T ALARM_RANK_TABLE[] = @@ -796,6 +803,10 @@ { 1, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_ACCELEROMETERS_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_ACCELEROMETERS_INVALID_CAL_RECORD }, +<<<<<<< Updated upstream +======= + { 1, ALARM_ID__AVAILABLE }, +>>>>>>> Stashed changes { 1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { 1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED }, @@ -1075,6 +1086,7 @@ { 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 -r86c29423ffbd0613badc2879841a934d30317104 -r6ef36d1727d845984101852ea433cf5198db8d81 --- DGDefs.h (.../DGDefs.h) (revision 86c29423ffbd0613badc2879841a934d30317104) +++ DGDefs.h (.../DGDefs.h) (revision 6ef36d1727d845984101852ea433cf5198db8d81) @@ -545,6 +545,7 @@ DG_EVENT_SUB_MODE_CHANGE, ///< DG Op sub-mode change event 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 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