Index: AlarmDefs.h =================================================================== diff -u -r054087c0c6bff77a622d1cc718fd27a887d7d923 -r5797b65b3af9e0d039c596354bdc59e7caa7ec01 --- AlarmDefs.h (.../AlarmDefs.h) (revision 054087c0c6bff77a622d1cc718fd27a887d7d923) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 5797b65b3af9e0d039c596354bdc59e7caa7ec01) @@ -266,11 +266,13 @@ ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, ///< DG chemical disinfect could not reach to target temperature ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, ///< DG chemical disinfect inlet pressure and temperature sensors out of range ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, ///< DG chemical disinfect inlet conductivity and temperature out of range - ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CALIBRATION, ///< DG load cells invalid calibration - ALARM_ID_DG_FLOW_SENSORS_INVALID_CALIBRATION, ///< DG flow sensors invalid calibration - ALARM_ID_DG_COND_SENSORS_INVALID_CALIBRATION, ///< DG conductivity sensors invalid calibration - ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_NV_RECORD, ///< DG drain line volume invalid non-volatile record - ALARM_ID_DG_RESERVOIRS_INVALID_NV_RECORD, ///< DG reservoirs invalid non-volatile record + ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, ///< DG load cells invalid calibration record + ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, ///< DG flow sensors invalid calibration record + ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD, ///< DG conductivity sensors invalid calibration record + ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD, ///< DG drain line volume invalid calibration record + ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, ///< DG reservoirs invalid calibration record + ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD, ///< DG acid concentrate calibration record + ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD, ///< DG bicarb concentrate calibration record NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -399,6 +401,13 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, ALARM_ID_HD_UI_POST_FAILED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, // Machine fault high priority alarms { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_HD_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -622,11 +631,6 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_FLOW_SENSORS_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_COND_SENSORS_INVALID_CALIBRATION, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_NV_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_RESERVOIRS_INVALID_NV_RECORD, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck ID Escalate In Escalate To #endif // included by AlarmMgmt.c Index: DGDefs.h =================================================================== diff -u -ra3423542cf15d36156ff66d5b18a3e36ae8088c4 -r5797b65b3af9e0d039c596354bdc59e7caa7ec01 --- DGDefs.h (.../DGDefs.h) (revision a3423542cf15d36156ff66d5b18a3e36ae8088c4) +++ DGDefs.h (.../DGDefs.h) (revision 5797b65b3af9e0d039c596354bdc59e7caa7ec01) @@ -63,10 +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_DRAIN_PUMP, ///< Drain pump POST state DG_POST_STATE_WATCHDOG, ///< Watchdog POST test state DG_POST_STATE_LOAD_CELL, ///< Load cells POST state DG_POST_STATE_COMPLETED, ///< POST completed successfully state