Index: AlarmDefs.h =================================================================== diff -u -r6ee23eee6b5c994ee6711667492adc984a778fbd -rff6c8b4e1cc4bb082d553c821cbad11aa1bc5e3b --- AlarmDefs.h (.../AlarmDefs.h) (revision 6ee23eee6b5c994ee6711667492adc984a778fbd) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ff6c8b4e1cc4bb082d553c821cbad11aa1bc5e3b) @@ -192,6 +192,7 @@ ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 154, ///< HD syringe pump occlusion alarm ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 155, ///< HD syringe pump syringe removed alarm ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 156, ///< HD syringe pump not stopped in off state error + ALARM_ID_HD_BLOOD_LEAK_DETECTED = 157, ///< HD blood leak detected alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -454,6 +455,7 @@ { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION { ALARM_PRIORITY_MEDIUM, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED { ALARM_PRIORITY_HIGH, 4, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR + { ALARM_PRIORITY_HIGH, 6, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE, TRUE, FALSE, FALSE, TRUE, FALSE }, // ALARM_ID_HD_BLOOD_LEAK_DETECTED // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: MsgDefs.h =================================================================== diff -u -ra910cd524ab7423973c54ab2215490911344ab09 -rff6c8b4e1cc4bb082d553c821cbad11aa1bc5e3b --- MsgDefs.h (.../MsgDefs.h) (revision a910cd524ab7423973c54ab2215490911344ab09) +++ MsgDefs.h (.../MsgDefs.h) (revision ff6c8b4e1cc4bb082d553c821cbad11aa1bc5e3b) @@ -137,6 +137,7 @@ MSG_ID_HD_SYRINGE_PUMP_DATA = 0x69, ///< HD broadcast of syringe pump data MSG_ID_HD_FLUID_LEAK_STATE = 0x6A, ///< HD broadcast of fluid leak state MSG_ID_DG_FLUID_LEAK_STATE = 0x6B, ///< DG broadcast of fluid leak state + MSG_ID_HD_BLOOD_LEAK_STATE = 0x6C, ///< HD broadcast of blood leak state // TODO - test msg - remove later MSG_ID_DG_LOAD_CELL_RAW_DATA_BROADCAST = 0x998, @@ -223,6 +224,8 @@ MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0x8049, ///< HD syringe pump measured home override request MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0x804A, ///< HD syringe pump measured position override request MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0x804B, ///< HD syringe pump measured volume delivered override request + MSG_ID_HD_BLOOD_LEAK_SEND_INTERVAL_OVERRIDE = 0x804C, ///< HD blood leak state broadcast interval override request + MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0x804D, ///< HD blood leak state detector override request MSG_ID_FIRST_DG_TESTER_MESSAGE = 0xA000, ///< First DG test message ID MSG_ID_DG_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DG_TESTER_MESSAGE, ///< DG tester log-in