Index: MsgDefs.h =================================================================== diff -u -r6127fd41333abb1468519001c5afe44de708d5f5 -r1631a258f1e9fc2d08b017e61d7a868aaffbe93d --- MsgDefs.h (.../MsgDefs.h) (revision 6127fd41333abb1468519001c5afe44de708d5f5) +++ MsgDefs.h (.../MsgDefs.h) (revision 1631a258f1e9fc2d08b017e61d7a868aaffbe93d) @@ -9,7 +9,7 @@ * @file MsgDefs.h * * @author (last) Dara Navaei -* @date (last) 23-May-2022 +* @date (last) 06-Sep-2022 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -195,7 +195,7 @@ MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, ///< DG dialysate flow meter data (liter/minute) + MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< DG dialysate flow meter data (liter/minute) MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios @@ -207,7 +207,15 @@ MSG_ID_DG_BAD_FILL_SUB_STATE = 0xAF, ///< DG broadcast of idle mode bad fill sub-state MSG_ID_UI_REQUEST_SERVICE_MODE = 0xB0, ///< UI request to HD to go to service mode MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST = 0xB1, ///< HD response to UI request to go to service mode - MSG_ID_UI_CHANGED_SCREEN_BRIGHTNESS = 0xB2, ///< HD changed screen brightness + MSG_ID_HD_REQUEST_UI_FINAL_POST_RESULT = 0xB2, ///< HD request to UI for final POST result + MSG_ID_DG_FLOW_SENSORS_DATA = 0xB3, ///< DG flow sensors data publish + MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4, ///< DG response to HD request to go to service mode + MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5, ///< HD request for DG to re-send trigger messages for each active alarm + MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode + MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message + MSG_ID_HD_REQUEST_DG_USAGE_INFO = 0xB8, ///< HD request DG usage info + MSG_ID_HD_BATTERY_MANAGEMENT_DATA = 0xB9, ///< HD battery management logging data + MSG_ID_HD_BATTERY_STATUS_DATA = 0xBA, ///< HD battery status logging data #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -242,7 +250,7 @@ MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018, ///< Venous pressure measured override request MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019, ///< Blood pump occlusion pressure measured override request MSG_ID_BLOOD_ROTOR_COUNT_OVERRIDE = 0x801A, ///< Blood pump rotor count override request - MSG_ID_SET_ARTERIAL_PRESSURE_OFFSET = 0x801B, ///< Set arterial pressure offset request + MSG_ID____AVAILABLE_1 = 0x801B, ///< Unused - this message ID is available for use MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C, ///< Pressure and occlusion broadcast interval override request MSG_ID_SET_RTC_DATE_TIME = 0x801D, ///< RTC set date/time request MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E, ///< Dialysate outlet flow broadcast interval override request @@ -311,7 +319,7 @@ MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0x805E, ///< HD air bubble detector status override request MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x805F, ///< HD blood prime volume override request MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0x8060, ///< HD air bubble detector self-test request - MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0x8061, ///< HD fan RPM alarm start time override request TODO remove once DEN-12224 merged into staging + MSG_ID____AVAILABLE_2 = 0x8061, ///< Unused - this message ID is available for use MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062, ///< HD switches status override request MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request @@ -346,6 +354,7 @@ MSG_ID_HD_SET_BLOOD_LEAK_2_EMB_MODE = 0x8081, ///< HD set blood leak sensor to embedded mode MSG_ID_HD_SET_BLOOD_LEAK_EMB_MODE_COMMAND = 0x8082, ///< HD set blood leak embedded mode command MSG_ID_HD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0x8083, ///< HD send blood leak embedded mode response + MSG_ID_HD_SEND_ALARMS_COMMAND = 0x8084, ///< HD re-send trigger messages for all active alarms 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 @@ -419,7 +428,7 @@ MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE = 0xA046, ///< DG drain pump measured RPM override MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD = 0xA047, ///< Clears all DG alarms (even if non-recoverable or fault) MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0xA048, ///< DG alarm information broadcast interval override request - MSG_ID_DG_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0xA049, ///< DG fan RPM alarm start time offset override request // TODO remove once DEN-12224 is implemented + MSG_ID____AVAILABLE_3 = 0xA049, ///< Unused - this message ID is available for use MSG_ID_DG_GET_SW_CONFIG_RECORD = 0xA04A, ///< DG get software configuration record request MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B, ///< DG set software configuration record MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C, ///< DG send software configuration record @@ -432,6 +441,8 @@ MSG_ID_DG_GET_USAGE_INFO_RECORD = 0xA053, ///< DG get usage information record MSG_ID_DG_SET_USAGE_INFO_RECORD = 0xA054, ///< DG set usage information record MSG_ID_DG_SEND_USAGE_INFO_RECORD = 0xA055, ///< DG send usage information record + MSG_ID_DG_SET_OP_MODE_REQUEST = 0xA056, ///< DG set operation mode request + MSG_ID_DG_RESERVOIR_TARE_REQUEST = 0xA057, ///< DG reservoir tare request MSG_ID_HD_DEBUG_EVENT = 0xFFF1, ///< HD debug event text to be logged in event log MSG_ID_DG_DEBUG_EVENT = 0xFFF2, ///< DG debug event text to be logged in event log