Index: AlarmDefs.h =================================================================== diff -u -rc312551a9fd141133e3f0c7d2e4ddc2e5fa0359a -ra41b7d75b95a4d95303049396d35b5a6f42069f0 --- AlarmDefs.h (.../AlarmDefs.h) (revision c312551a9fd141133e3f0c7d2e4ddc2e5fa0359a) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a41b7d75b95a4d95303049396d35b5a6f42069f0) @@ -69,6 +69,10 @@ ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT = 38, ///< DD CD3 conductivity sensor freshness/error timeout fault ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT = 39, ///< DD CD4 conductivity sensor freshness/error timeout fault ALARM_ID_TD_VENOUS_BUBBLE_DETECTED = 40, ///< TD venous bubble detected + ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR = 41, ///< DD concentrate pump CP1 speed control error + ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR = 42, ///< DD concentrate pump CP2 speed control error + ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE = 43, ///< DD concentrate pumps hall sensor out of range + ALARM_ID_DD_CONCENTRATE_PUMP_FAULT = 44, ///< DD concentrate pump fault NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -243,6 +247,10 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 12, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , ALARM_ID_TD_VENOUS_BUBBLE_DETECTED, }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CONCENTRATE_PUMP_FAULT }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -283,6 +291,10 @@ { 110, ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT }, { 110, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT }, { 110, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT }, + { 110, ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR }, + { 110, ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR }, + { 110, ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_CONCENTRATE_PUMP_FAULT }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, @@ -353,6 +365,10 @@ { 38 , ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD3) Error | DD conductivity sensor located after balancing chamber reporting error or not being read successfully | Conductvity Sensor (CD3) is reporting an error or FPGA is failing to read sensor. | "}, { 39 , ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT , "DD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor (CD4) Error | DD conductivity sensor located in spent dialysate path reporting error or not being read successfully | Conductvity Sensor (CD4) is reporting an error or FPGA is failing to read sensor. | "}, { 40 , ALARM_ID_TD_VENOUS_BUBBLE_DETECTED , "TD | Venous Air Detected | Air detected in the venous air trap.\n- Confirm arterial access placement and confirm\nconnections are secure.\n- Treatment must be terminated without rinseback. | Blood Stop: Venous Air Bubble | HD venous air bubble detected alarm | If bubbles are detected during the treatment. | "}, + { 41 , ALARM_ID_DD_CP1_SPEED_CONTROL_ERROR , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: CP1 Speed Fault | DD concentrate pump CP1 speed control error | If the concentrate pump CP1 speed > 0.02 tolerance for a certain period of time. | "}, + { 42 , ALARM_ID_DD_CP2_SPEED_CONTROL_ERROR , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: CP2 Speed Fault | DD concentrate pump CP2 speed control error | If the concentrate pump CP1 speed > 0.02 tolerance for a certain period of time. | "}, + { 43 , ALARM_ID_DD_CONC_PUMP_HALL_SENSOR_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: CP1 CP2 Speed Range | DD concentrate pump hall sensor out of range. | Hall sensor pulse to pulse timing is < 1ms (speed too fast). | "}, + { 44 , ALARM_ID_DD_CONCENTRATE_PUMP_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: CP1/CP2 Fault | DD concentrate pump fault | If the concentrate pumps fault is reported by the FPGA. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -rc312551a9fd141133e3f0c7d2e4ddc2e5fa0359a -ra41b7d75b95a4d95303049396d35b5a6f42069f0 --- MsgDefs.h (.../MsgDefs.h) (revision c312551a9fd141133e3f0c7d2e4ddc2e5fa0359a) +++ MsgDefs.h (.../MsgDefs.h) (revision a41b7d75b95a4d95303049396d35b5a6f42069f0) @@ -61,6 +61,7 @@ MSG_ID_TD_VOLTAGES_DATA = 0x23, ///< TD broadcast voltages data MSG_ID_TD_BUBBLES_DATA = 0x24, ///< TD broadcast bubbles data MSG_ID_DD_CONDUCTIVITY_DATA = 0x25, ///< DD conductivity sensor readings + MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x26, ///< DD concentrate pump data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -92,6 +93,12 @@ MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA00F, ///< DD conductivity sensor read counter request MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA010, ///< DD conductivity sensor error counter request MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA011, ///< DD conductivity sensor publish interval override request + MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA012, ///< DD concentrate pump publish interval override request + MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA013, ///< DD concentrate pump target speed override request + MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST = 0xA014, ///< DD concentrate pump measured speed override request + MSG_ID_DD_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST = 0xA015, ///< DD concentrate pump parked override request + MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST = 0xA016, ///< DD concentrate pump park fault override request + MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST = 0xA017, ///< DD concentrate pump park request override request MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log