Index: AlarmDefs.h =================================================================== diff -u -ra6cb0bf3379278338730790fd6f95b2cfb3df501 -rc7e23b20ef6dd78ceabbf4d532366d7ef788ff21 --- AlarmDefs.h (.../AlarmDefs.h) (revision a6cb0bf3379278338730790fd6f95b2cfb3df501) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c7e23b20ef6dd78ceabbf4d532366d7ef788ff21) @@ -78,7 +78,7 @@ ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 40, ///< Dialysis outlet pump failed motor off check. Measured speed while commanded off ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 41, ///< Dialysis outlet pump failed motor direction check. Measured vs. commanded ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 42, ///< Dialysis outlet pump failed rotor speed check. Mismatch with rotor and motor speeds - ALARM_ID__AVAILABLE_5 = 43, ///< Alarm ID available + ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT = 43, ///< Main primary heater FPGA fault. ALARM_ID_UI_COMM_TIMEOUT = 44, ///< User interface communication timeout ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45, ///< HD too many bad communications CRC ALARM_ID_CAN_MESSAGE_NOT_ACKED = 46, ///< System message that required acknowledgment was not acknowledged @@ -125,7 +125,7 @@ ALARM_ID_DG_HEATING_INVALID_CAL_RECORD = 87, ///< DG heating invalid calibration record ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 88, ///< DG concentrate pumps hall sensor out of range ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error - ALARM_ID_DG_LOAD_CELL_FPGA_READ_ERROR = 90, ///< DG load cells FPGA read error. + ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT = 90, ///< DG load cells A1/B1 FPGA fault ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE = 91, ///< HD No dialysate flow data receive in the last 3 seconds ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS = 92, ///< DG conductivity sensor bad status. ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE = 93, ///< DG outlet primary conductivity out of range @@ -147,7 +147,7 @@ ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109, ///< HD syringe pump volume check error ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR = 110, ///< HD syringe pump speed check error ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 111, ///< HD syringe pump not stopped in off state error - ALARM_ID__AVAILABLE_7 = 112, ///< Alarm ID available + ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT = 112, ///< DG load cells A1/B1 FPGA fault ALARM_ID__AVAILABLE_8 = 113, ///< Alarm ID available 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 @@ -215,7 +215,7 @@ ALARM_ID_DG_SOFTWARE_FAULT = 177, ///< DG software fault. Software found itself in an unexpected state ALARM_ID_HD_COMM_TIMEOUT = 178, ///< HD communication timeout ALARM_ID_DG_FPGA_COMM_TIMEOUT = 179, ///< DG FPGA communication down for too long - ALARM_ID_DG_LOAD_CELL_ADC_ERROR = 180, ///< DG load cell ADC error + ALARM_ID__AVAILABLE_13 = 180, ///< Alarm ID available for use ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 181, ///< DG load cells weight out of range for tare ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD = 182, ///< DG load cells invalid calibration ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 183, ///< DG invalid load cell value @@ -503,7 +503,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DIAL_OUT_PUMP_ROTOR_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__AVAILABLE_5, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To @@ -552,7 +552,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SENSOR_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_LOAD_CELL_FPGA_READ_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_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_DIALYSATE_FLOW_DATA_NOT_RECEIVE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -575,7 +575,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_7, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_8, 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 }, @@ -646,7 +646,7 @@ { ALARM_PRIORITY_HIGH, 799, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_SOFTWARE_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TIMEOUT, 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_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELL_ADC_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, @@ -837,7 +837,7 @@ { 3, ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK }, { 3, ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, { 3, ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, - { 3, ALARM_ID__AVAILABLE_5 }, + { 3, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT }, { 3, ALARM_ID_UI_COMM_TIMEOUT }, { 3, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, { 3, ALARM_ID_CAN_MESSAGE_NOT_ACKED }, @@ -882,7 +882,7 @@ { 3, ALARM_ID_DG_HEATING_INVALID_CAL_RECORD }, { 3, ALARM_ID_DG_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, - { 3, ALARM_ID_DG_LOAD_CELL_FPGA_READ_ERROR }, + { 3, ALARM_ID_DG_LOAD_CELL_A1_B1_FPGA_FAULT }, { 3, ALARM_ID_HD_DIALYSATE_FLOW_DATA_NOT_RECEIVE }, { 3, ALARM_ID_DG_CONDUCTIVITY_SENSOR_BAD_STATUS }, { 3, ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE }, @@ -900,7 +900,7 @@ { 3, ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR }, { 3, ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR }, - { 3, ALARM_ID__AVAILABLE_7 }, + { 3, ALARM_ID_DG_LOAD_CELL_A2_B2_FPGA_FAULT }, { 3, ALARM_ID__AVAILABLE_8 }, { 3, ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE }, { 3, ALARM_ID_DG_TEMPERATURE_SENSOR_OUT_OF_RANGE }, @@ -952,7 +952,7 @@ { 3, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, { 3, ALARM_ID__AVAILABLE_11 }, { 3, ALARM_ID__AVAILABLE_1 }, - { 3, ALARM_ID_DG_LOAD_CELL_ADC_ERROR }, + { 3, ALARM_ID__AVAILABLE_13 }, { 3, ALARM_ID_DG_FPGA_COMM_TIMEOUT }, { 3, ALARM_ID_CONDUCTIVITY_SENSOR_FAULT }, { 3, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT },