Index: AlarmDefs.h =================================================================== diff -u -r1fc9f40cb246c14cdc975b6e979bcde7fef48822 -r703d1cb8a00d95cf672b0a3a9f179e14c47800db --- AlarmDefs.h (.../AlarmDefs.h) (revision 1fc9f40cb246c14cdc975b6e979bcde7fef48822) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 703d1cb8a00d95cf672b0a3a9f179e14c47800db) @@ -106,6 +106,9 @@ ALARM_ID_DD_INLET_WATER_PRESSURE_IN_HIGH_RANGE = 75, ///< DD inlet water pressure input high range ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE = 76, ///< DD inlet water pressure output low range ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE = 77, ///< DD inlet water pressure output high range + ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD = 78, ///< RO can message not acked by DD fault + ALARM_ID_RO_FPGA_COMM_TIMEOUT = 79, ///< RO FPGA communication timeout + ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS = 80, ///< RO too many bad crcs NUM_OF_ALARM_IDS ///< Number of alarms }; @@ -320,6 +323,9 @@ // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_MEDIUM, 431, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE }, { ALARM_PRIORITY_MEDIUM, 430, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE }, + { ALARM_PRIORITY_HIGH, 111, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_RO_FPGA_COMM_TIMEOUT }, + { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -344,6 +350,7 @@ { 10, ALARM_ID_TD_VOLTAGE_OUT_OF_RANGE }, { 10, ALARM_ID_TD_ARTERIAL_PRESSURE_OUT_OF_RANGE }, { 10, ALARM_ID_TD_VENOUS_PRESSURE_OUT_OF_RANGE }, + { 10, ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS }, { 12, ALARM_ID_TD_VENOUS_BUBBLE_DETECTED }, { 100, ALARM_ID_TD_AC_POWER_LOST_IN_TREATMENT }, { 110, ALARM_ID_DD_CRITICAL_DATA_ERROR }, @@ -363,6 +370,7 @@ { 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_RO_FPGA_COMM_TIMEOUT }, { 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 }, @@ -389,6 +397,7 @@ { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD }, + { 111, ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 200, ALARM_ID_TD_VENOUS_PRESSURE_LOW }, { 201, ALARM_ID_TD_VENOUS_PRESSURE_HIGH }, { 202, ALARM_ID_TD_ARTERIAL_PRESSURE_LOW }, @@ -506,6 +515,9 @@ // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition { 76 , ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_LOW_RANGE , "DD | Incoming Water Pressure Output Low | Water inlet pressure after regulator is low.\n- Treatment is currently paused.\n- Check the incoming water supply.\n- When the pressure is within target range\nResume/OK button will be available.\n- Press Resume/OK to continue treatment. | DD: Inlet Water Pres Output Low | DD Inlet water pressure output too low | Inlet water pressure output < 11 PSI. | "}, { 77 , ALARM_ID_DD_INLET_WATER_PRESSURE_OUT_HIGH_RANGE , "DD | Incoming Water Pressure Output High | Water inlet pressure after regulator is high.\n- Treatment is currently paused.\n- Check the incoming water supply.\n- When the pressure is within target range\nResume/OK button will be available.\n- Press Resume/OK to continue treatment. | DD: Inlet Water Pres Output High | DD inlet water pressure output is too high | If the inlet water pressure output is > 20 psig. | "}, + { 78 , ALARM_ID_RO_CAN_MESSAGE_NOT_ACKED_BY_DD , "RO | Communication Error | A communication problem has been detected.\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. | Loss of DD Comm (DD ACK) | HD to DD comm error. | HD message to DD that requires acknowledge was not acknowledged within a certain time. | "}, + { 79 , ALARM_ID_RO_FPGA_COMM_TIMEOUT , "RO | 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: FPGA Com | DD FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, + { 80 , ALARM_ID_RO_COMM_TOO_MANY_BAD_CRCS , "RO | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: CAN CRC Com | Too many bad CRCs detected on received system messages | If too many bad messages CRCs are received within a set period of time | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r83743c433516c53e32ee0807b25401965848f6a3 -r703d1cb8a00d95cf672b0a3a9f179e14c47800db --- MsgDefs.h (.../MsgDefs.h) (revision 83743c433516c53e32ee0807b25401965848f6a3) +++ MsgDefs.h (.../MsgDefs.h) (revision 703d1cb8a00d95cf672b0a3a9f179e14c47800db) @@ -71,6 +71,7 @@ MSG_ID_DIALYSATE_PUMPS_DATA = 0x27, ///< DD dialysate pumps data MSG_ID_DD_HEATERS_DATA = 0x28, ///< DD heaters data MSG_ID_DD_LEVEL_DATA = 0x29, ///< DD level data + MSG_ID_RO_EVENT = 0x2A, ///< RO general event // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID