Index: AlarmDefs.h =================================================================== diff -u -r658fa851133254365e280aada7d4c7af250b7e52 -r8a50a1153331b7caabb91f6e37f3ebad37d0965c --- AlarmDefs.h (.../AlarmDefs.h) (revision 658fa851133254365e280aada7d4c7af250b7e52) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 8a50a1153331b7caabb91f6e37f3ebad37d0965c) @@ -151,7 +151,7 @@ ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT = 113, ///< HD blood leak zero command fault. ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 114, ///< HD venous air bubble detector self-test failure ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE = 115, ///< DG temperature sensor out of range - ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE = 116, ///< DG temperature sensor ADC out of range + ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT = 116, ///< DG temperature sensor ADC fault ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED = 117, ///< DG CAN message not acked ALARM_ID_DG_RTC_CONFIG_ERROR = 118, ///< DG RTC config error ALARM_ID_DG_RTC_BATTERY_LOW = 119, ///< DG RTC battery low error @@ -228,13 +228,13 @@ ALARM_ID_DRAIN_PUMP_OFF_FAULT = 190, ///< DG drain pump off fault ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE = 191, ///< DG flow rate out of upper range ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 192, ///< DG flow rate out of lower range - ALARM_ID__AVAILABLE_13 = 193, ///< + ALARM_ID__AVAILABLE_13 = 193, ///< Alarm available for use ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 194, ///< DG RO pump duty cycle out of range ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 195, ///< DG RO pump pressure out of range - ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT = 196, ///< DG temperature sensor error flag fault. - ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT = 197, ///< DG temperature sensors ADC fault + ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT = 196, ///< DG temperature sensor error bit fault + ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT = 197, ///< DG temperature sensors FPGA fault ALARM_ID__AVAILABLE_10 = 198, ///< Alarm ID available for use - ALARM_ID__AVAILABLE_14 = 199, ///< + ALARM_ID__AVAILABLE_14 = 199, ///< Alarm ID available for use ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 200, ///< DG thermistors/sensors temperature out of range ALARM_ID_PRE_TREATMENT_WET_FLOW_TEST_FAILURE = 201, ///< HD pre-treatment mode wet self-test lc vs FMD failure ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_NORMAL_TEST_FAILURE = 202, ///< HD pre-treatment mode dry pressure normal self-test failure @@ -565,7 +565,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_DG_RTC_CONFIG_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_DG_RTC_BATTERY_LOW, 0, ALARM_ID_NO_ALARM }, @@ -648,8 +648,8 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_10, 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, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_14, 0, ALARM_ID_NO_ALARM }, @@ -745,7 +745,7 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, TRUE , FALSE, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_FLOW_TOO_LOW_WHILE_HEATER_ON, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To @@ -879,7 +879,7 @@ { 3, ALARM_ID_HD_BLOOD_LEAK_ZERO_CMD_FAULT }, { 3, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, - { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_ADC_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT }, { 3, ALARM_ID_DG_CAN_MESSAGE_NOT_ACKED }, { 3, ALARM_ID_DG_RTC_CONFIG_ERROR }, { 3, ALARM_ID_DG_RTC_BATTERY_LOW }, @@ -925,8 +925,8 @@ { 3, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, { 3, ALARM_ID_DRAIN_PUMP_OFF_FAULT }, { 3, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, - { 3, ALARM_ID_DG_TEMPERATURE_SENSORS_ADC_FAULT }, - { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_FAULT }, + { 3, ALARM_ID_DG_TEMPERATURE_SENSORS_FPGA_FAULT }, + { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_ERROR_BIT_FAULT }, { 3, ALARM_ID_DG_LOAD_CELL_ADC_ERROR }, { 3, ALARM_ID_DG_FPGA_COMM_TIMEOUT }, { 3, ALARM_ID__AVAILABLE_7 }, @@ -949,6 +949,7 @@ { 3, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT }, { 3, ALARM_ID_HD_RTC_BATTERY_LOW }, + { 3, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -993,7 +994,6 @@ { 799, ALARM_ID_HD_BATTERY_PACK_ERROR_DETECTED }, { 799, ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT }, { 799, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED }, - { 799, ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION }, { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_HIGH_RANGE }, { 799, ALARM_ID_INLET_WATER_CONDUCTIVITY_IN_LOW_RANGE }, { 799, ALARM_ID_INLET_WATER_TEMPERATURE_IN_LOW_RANGE },