Index: AlarmDefs.h =================================================================== diff -u -r51cd9ec1134d4078f387ebc0e568f04d197bedcd -r248ede8f3cd6ae4a9f45236bbc68ec1e84603e53 --- AlarmDefs.h (.../AlarmDefs.h) (revision 51cd9ec1134d4078f387ebc0e568f04d197bedcd) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 248ede8f3cd6ae4a9f45236bbc68ec1e84603e53) @@ -82,7 +82,7 @@ AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR = 46, ///< Last disinfection date CRC error ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47, ///< Pressure at outlet of RO pump is out of range ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48, ///< DG temperature sensors fault - ALARM_ID___AVAILABLE_1 = 49, ///< AVAILABLE + ALARM_ID_FPGA_COMM_TIMEOUT = 49, ///< FPGA communication down for too long ALARM_ID_HD_COMM_TIMEOUT = 50, ///< HD communication timeout ALARM_ID_VALVE_CONTROL_FAILURE = 51, ///< FPGA not accepting commanded valve states ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52, ///< Blood pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed @@ -123,24 +123,24 @@ ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 87, ///< Blood flow sensor signal strength too low ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 88, ///< Dialysate flow sensor signal strength too low ALARM_ID_EMPTY_SALINE_BAG = 89, ///< Saline bag is empty - ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE = 90, ///< Saline bolus volume check failure. - ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91, ///< FPGA reports failure reading arterial pressure sensor. - ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92, ///< FPGA reports failure reading venous pressure sensor. + ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE = 90, ///< Saline bolus volume check failure + ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91, ///< FPGA reports failure reading arterial pressure sensor + ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92, ///< FPGA reports failure reading venous pressure sensor ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93, ///< UV reactor not healthy (either inlet or outlet) - ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94, ///< Post-acid concentrate conductivity out of range. - ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95, ///< Post-bicarb concentrate conductivity out of range. - ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96, ///< RO pump flow rate out of range. - ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE = 97, ///< DG thermistors/sensors temperature out of range. - ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98, ///< DG fan RPM out of range. - ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99, ///< DG dialysate fill runs out of time. - ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100, ///< DG concentrate pump CP1 speed control error. - ALARM_ID_CP2_SPEED_CONTROL_ERROR = 101, ///< DG concentrate pump CP2 speed control error. - ALARM_ID_FLOW_RATE_OUT_OF_RANGE = 102, ///< DG flow rate out of range. - ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 103, ///< DG RO pump pressure out of range. - ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104, ///< DG drain pump RPM out of range. - ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105, ///< DG heaters cold junction temperature out of range. - ALARM_ID_DG_HEATERS_FAULT = 106, ///< DG heaters fault. - ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING = 107, ///< HD end of treatment warning. + ALARM_ID_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94, ///< Post-acid concentrate conductivity out of range + ALARM_ID_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95, ///< Post-bicarb concentrate conductivity out of range + ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96, ///< RO pump flow rate out of range + ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE = 97, ///< DG thermistors/sensors temperature out of range + ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98, ///< DG fan RPM out of range + ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99, ///< DG dialysate fill runs out of time + ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100, ///< DG concentrate pump CP1 speed control error + ALARM_ID_CP2_SPEED_CONTROL_ERROR = 101, ///< DG concentrate pump CP2 speed control error + ALARM_ID_FLOW_RATE_OUT_OF_RANGE = 102, ///< DG flow rate out of range + ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 103, ///< DG RO pump pressure out of range + ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104, ///< DG drain pump RPM out of range + ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105, ///< DG heaters cold junction temperature out of range + ALARM_ID_DG_HEATERS_FAULT = 106, ///< DG heaters fault + ALARM_ID_END_OF_DIALYSIS_TREATMENT_WARNING = 107, ///< HD end of treatment warning ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM = 108, ///< HD end of treatment alarm (user not acting to end treatment) ALARM_ID_END_OF_DIALYSIS_TREATMENT_ALARM_HIGH = 109, ///< HD end of treatment alarm (high priority - user still not acting to end treatment) NUM_OF_ALARM_IDS ///< Total number of alarms @@ -280,7 +280,7 @@ { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // AlARM_ID_NVDATA_DISINFECTION_DATE_CRC_ERROR { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_TEMPERATURE_SENSORS_OUT_OF_RANGE - { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // *** AVAILABLE *** + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_FPGA_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_COMM_TIMEOUT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, FALSE }, // ALARM_ID_VALVE_CONTROL_FAILURE { ALARM_PRIORITY_HIGH, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK