Index: AlarmDefs.h =================================================================== diff -u -r29bd4f5f91cab7323920f732ce5b6d8e4f934e64 -r9f95339827998f096d1d8ec05775e7d3ac6f6cc6 --- AlarmDefs.h (.../AlarmDefs.h) (revision 29bd4f5f91cab7323920f732ce5b6d8e4f934e64) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 9f95339827998f096d1d8ec05775e7d3ac6f6cc6) @@ -254,7 +254,8 @@ ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 216, ///< HD venous air bubble detector self-test failure ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 217, ///< HD venous air bubble detector treatment fault ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 218, ///< HD venous air bubble detector rinseback fault - + ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTED = 219, ///< HD arterial air bubble detected alarm + ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 220, ///< HD venous air bubble detected alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration Index: MsgDefs.h =================================================================== diff -u -r87782635fa31d480f1a60f2ffb2558f48940fb47 -r9f95339827998f096d1d8ec05775e7d3ac6f6cc6 --- MsgDefs.h (.../MsgDefs.h) (revision 87782635fa31d480f1a60f2ffb2558f48940fb47) +++ MsgDefs.h (.../MsgDefs.h) (revision 9f95339827998f096d1d8ec05775e7d3ac6f6cc6) @@ -157,6 +157,7 @@ MSG_ID_HD_ALARM_INFORMATION = 0x7D, ///< HD alarm information broadcast message MSG_ID_DG_VOLTAGES_DATA = 0x86, ///< DG voltages data publish MSG_ID_DG_CHEM_DISINFECT_DATA = 0x87, ///< DG chemical disinfect data publish + MSG_ID_HD_BUBBLES_DATA = 0x93, ///< HD broadcast of air bubble detectors data #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -256,6 +257,9 @@ MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE = 0x805A, ///< HD syringe pump encoder status override request MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE = 0x805B, ///< HD syringe pump ADC and DAC status override request MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE = 0x805C, ///< HD syringe pump ADC read counter override request + MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE = 0x805D, ///< HD air bubble detectors data broadcast interval override request + MSG_ID_HD_BUBBLES_STATUS_OVERRIDE = 0x805E, ///< HD air bubble detectors status override request + MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST = 0x8060, ///< HD air bubble detectors self-test 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