Index: AlarmDefs.h =================================================================== diff -u -r4afc5fdb64135add3051d793f05cc15e52df6f89 -r2b130f2da3f26b9888dd582d05595cbd65e8c193 --- AlarmDefs.h (.../AlarmDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2b130f2da3f26b9888dd582d05595cbd65e8c193) @@ -54,6 +54,8 @@ ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DD FPGA communication down for too long ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE = 24, ///< TD alarm audio failed POST ALARM_ID_DD_VALVE_CONTROL_FAILURE = 25, ///< DD FPGA not accepting commanded valve states + ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT = 26, ///< TD arterial pressure sensor freshness/error timeout fault + ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT = 27, ///< TD venous pressure sensor freshness/error timeout fault NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -156,7 +158,7 @@ ALARM_PRIORITY_T alarmPriority; ///< Priority of alarm U32 alarmSubRank; ///< Alarm's rank within it's priority BOOL alarmIsFault; ///< Alarm is a system fault? - BOOL alarmIsDDFault; ///< Alarm is a fault for DD + BOOL alarmIsDDFault; ///< Alarm is a fault for DD? BOOL alarmStops; ///< Alarm activation should cause a controlled stop BOOL alarmConditionClearImmed; ///< Alarm condition is cleared immediately (does not persist after alarm triggered) BOOL alarmNoClear; ///< Alarm cannot be cleared (unrecoverable)? @@ -212,6 +214,9 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_ALARM_AUDIO_SELF_TEST_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_VALVE_CONTROL_FAILURE }, + // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID + { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT }, + { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT }, }; // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID @@ -231,6 +236,8 @@ { 10, ALARM_ID_TD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, { 10, ALARM_ID_TD_WATCHDOG_EXPIRED }, { 10, ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS }, + { 10, ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT }, + { 10, ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT }, { 110, ALARM_ID_DD_CRITICAL_DATA_ERROR }, { 110, ALARM_ID_DD_WATCHDOG_EXPIRED }, { 110, ALARM_ID_DD_SOFTWARE_FAULT }, @@ -265,7 +272,7 @@ const ALARM_MANUAL_T ALARM_MANUAL_TABLE[] = { - // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition + // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition { 0 , ALARM_ID_NO_ALARM , "N/A | | | | Indication for when no alarms is a possible situation | N/A | "}, { 1 , ALARM_ID_TD_SOFTWARE_FAULT , "TD | 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: SW Invalid State | HD Software fault. Software found itself in an unexpected state | If the specific software faults listed in alarm management SW faults has been detected | "}, { 2 , ALARM_ID_DD_SOFTWARE_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: Software Invalid State | DD software fault. Software found itself in an unexpected state | If the specific software faults listed in alarm management SW faults has been detected | "}, @@ -292,7 +299,9 @@ { 23 , ALARM_ID_DD_FPGA_COMM_TIMEOUT , "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: FPGA Com | DD FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, { 24 , ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE , "TD | 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. | HD POST: Primary Alarm Current | HD alarm audio failed POST | If alarm audio current is NOT in expected range for than 1 second while alarm tone is being output | "}, { 25 , ALARM_ID_DD_VALVE_CONTROL_FAILURE , "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: Valve Control | DD FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, - // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition + // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition + { 26 , ALARM_ID_TD_ARTERIAL_SENSOR_TIMEOUT_FAULT , "TD | 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. | TD Arterial Pressure Sensor Error | TD arterial pressure sensor reporting error or not being read successfully | Arterial pressure sensor is reporting an error or FPGA is failing to read sensor. | "}, + { 27 , ALARM_ID_TD_VENOUS_SENSOR_TIMEOUT_FAULT , "TD | 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. | TD Venous Pressure Sensor Error | TD venous pressure sensor reporting error or not being read successfully | Venous pressure sensor is reporting an error or FPGA is failing to read sensor. | "}, }; #endif // manual alarms Index: MsgDefs.h =================================================================== diff -u -r4ac2b0b91acdec2e1a4081b6571af63c39d1a801 -r2b130f2da3f26b9888dd582d05595cbd65e8c193 --- MsgDefs.h (.../MsgDefs.h) (revision 4ac2b0b91acdec2e1a4081b6571af63c39d1a801) +++ MsgDefs.h (.../MsgDefs.h) (revision 2b130f2da3f26b9888dd582d05595cbd65e8c193) @@ -22,7 +22,7 @@ // ********** public definitions ********** /** - * @addtogroup Messages + * @addtogroup Messaging * @{ */ @@ -56,6 +56,7 @@ MSG_ID_DD_EVENT = 0x18, ///< DD general event MSG_ID_TD_DD_ALARMS_REQUEST = 0x19, ///< TD request for DD to re-send trigger messages for each active alarm MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x20, ///< UI TD reset in service mode request + MSG_ID_DD_VALVES_STATES_DATA = 0x21, ///< DD broadcast valve states // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID