Index: MsgDefs.h =================================================================== diff -u -rfcc847f153e13c90c6ae494df728861516ebc245 -re083277d48b8e96a07b52e1e2362f03766a062ae --- MsgDefs.h (.../MsgDefs.h) (revision fcc847f153e13c90c6ae494df728861516ebc245) +++ MsgDefs.h (.../MsgDefs.h) (revision e083277d48b8e96a07b52e1e2362f03766a062ae) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Dara Navaei -* @date (last) 08-Jul-2023 +* @author (last) James Walter Taylor +* @date (last) 16-Aug-2023 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -35,7 +35,7 @@ MSG_ID_ALARM_TRIGGERED = 0x3, ///< Alarm triggered event MSG_ID_ALARM_CLEARED = 0x4, ///< Alarm cleared event MSG_ID_BLOOD_FLOW_DATA = 0x5, ///< HD broadcast of blood flow/pump data - MSG_ID_MSG_AVAILABLE_7 = 0x6, ///< Unused MSG_ID + MSG_ID_UI_POST_TX_NEXT_REQUEST = 0x6, ///< UI next screen request in post treatment mode MSG_ID_UI_CHECK_IN = 0x7, ///< UI check-in with HD MSG_ID_DIALYSATE_FLOW_DATA = 0x8, ///< HD broadcast of dialysate inlet flow/pump data MSG_ID_PRESSURE_OCCLUSION_DATA = 0x9, ///< HD broadcast of pressure/occlusion data @@ -155,12 +155,12 @@ MSG_ID_HD_VOLTAGES_DATA = 0x7B, ///< HD voltages data publish MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0x7C, ///< HD response to UI set alarm audio volume request MSG_ID_HD_ALARM_INFORMATION_DATA = 0x7D, ///< HD alarm information broadcast message - MSG_ID_MSG_AVAILABLE_8 = 0x7E, ///< Message ID available + MSG_ID_HD_POST_TX_NEXT_CMD_RESPONSE = 0x7E, ///< HD next screen request in post treatment mode response MSG_ID_UI_DISINFECT_REQUEST = 0x7F, ///< UI disinfection selection MSG_ID_HD_DISINFECT_RESPONSE = 0x80, ///< HD response to disinfection selection MSG_ID_DG_SEND_SERVICE_SCHEDULE_DATA_TO_HD = 0x81, ///< DG send service schedule data to HD MSG_ID_HD_REQUEST_SERVICE_RECORD_FROM_HD = 0x82, ///< HD request service schedule data from HD - MSG_ID_MSG_AVAILABLE_4 = 0x83, ///< Message available for use + MSG_ID_DG_PARK_CONCENTRATE_PUMPS_CMD_REQUEST = 0x83, ///< HD request DG to park concentrate pumps MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0x84, ///< DG broadcast of heat disinfection mode time data MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0x85, ///< DG broadcast of chemical disinfection mode time data MSG_ID_DG_VOLTAGES_DATA = 0x86, ///< DG voltages data publish @@ -234,7 +234,7 @@ MSG_ID_DG_RO_PERMEATE_SAMPLE_DATA = 0xCA, ///< DG RO permeate sample mode data broadcast MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG = 0xCB, ///< HD send RO permeate sample dispense request to DG MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD = 0xCD, ///< DG send RO permeate sample dispense ready to HD - MSG_ID_DG_DRAIN_MODE_DATA = 0xCE ///< DG drain mode data broadcast message + MSG_ID_DG_DRAIN_MODE_DATA = 0xCE, ///< DG drain mode data broadcast message #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -394,6 +394,8 @@ MSG_ID_HD_RESET_ALL_TEST_CONFIGURATIONS = 0x8096, ///< HD reset all the configurations MSG_ID_HD_SET_TEST_CONFIGURATION = 0x8097, ///< HD set test configuration MSG_ID_HD_SIGNAL_RECOVER_FROM_FAULT_MODE = 0x8098, ///< HD signal recover from fault mode + MSG_ID_HD_RAM_STATUS_OVERRIDE = 0x8099, ///< HD RAM status bit override + MSG_ID_HD_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0x809A, ///< HD Valve data broadcast interval 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 @@ -410,7 +412,7 @@ MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE = 0xA00C, ///< Drain pump data broadcast interval override request MSG_ID_LOAD_CELLL_SEND_INTERVAL_OVERRIDE = 0xA00D, ///< Load cell data broadcast interval override request MSG_ID_VALVE_STATE_OVERRIDE = 0xA00E, ///< Valve state override request - MSG_ID_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA00F, ///< Valve data broadcast interval override request + MSG_ID_DG_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0xA00F, ///< DG Valve data broadcast interval override request MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE = 0xA010, ///< Temperature sensor override request MSG_ID_START_STOP_PRIMARY_HEATER = 0xA011, ///< Start/stop primary heaters MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE = 0xA012, ///< Temperature sensors data publish override @@ -506,6 +508,9 @@ MSG_ID_DG_SEND_LOAD_CELLS_TARE_VALUES = 0xA06D, ///< DG send load cells tare values to dialin MSG_ID_DG_SET_COND_SENSOR_CAL_TABLE = 0xA06E, ///< DG set conductivity sensor's calibration table MSG_ID_DG_SIGNAL_RECOVER_FROM_FAULT_MODE = 0xA06F, ///< DG signal recover from fault mode + MSG_ID_DG_DRAIN_MODE_BROADCAST_INTERVAL_OVERRIDE = 0xA070, ///< DG drain mode broadcast interval override + MSG_ID_DG_DIALIN_RO_ONLY_MODE_STATUS_REQUEST = 0xA071, ///< DG dialin ro only mode status request + MSG_ID_DG_RAM_STATUS_OVERRIDE = 0xA072, ///< DG RAM status bit override 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