Index: MsgDefs.h =================================================================== diff -u -r6c2740ce90a21745d887e43be822a97154ae5596 -r2534a2bbec436c17fa56c329c7143a104d87b7e4 --- MsgDefs.h (.../MsgDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) +++ MsgDefs.h (.../MsgDefs.h) (revision 2534a2bbec436c17fa56c329c7143a104d87b7e4) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Sean Nash -* @date (last) 24-May-2023 +* @author (last) Michael Garthwaite +* @date (last) 08-Aug-2023 * * @author (original) Sean * @date (original) 27-Feb-2020 @@ -155,11 +155,11 @@ 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_HD_DISINFECT_STANDBY_DATA = 0x7E, ///< HD broadcast of standby disinfect data + MSG_ID_MSG_AVAILABLE_8 = 0x7E, ///< Message ID available MSG_ID_UI_DISINFECT_REQUEST = 0x7F, ///< UI disinfection selection MSG_ID_HD_DISINFECT_RESPONSE = 0x80, ///< HD response to disinfection selection - MSG_ID_MSG_AVAILABLE_2 = 0x81, ///< Message available for use - MSG_ID_MSG_AVAILABLE_3 = 0x82, ///< Message available for use + 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_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 @@ -169,7 +169,7 @@ MSG_ID_UI_SERVICE_INFO_REQUEST = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data - MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data + MSG_ID_DG_SERVICE_SCHEDULE_DATA_TO_UI = 0x8C, ///< DG service schedule data to UI MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E, ///< HD POST single test result MSG_ID_HD_POST_FINAL_TEST_RESULT = 0x8F, ///< HD POST final test result @@ -214,7 +214,7 @@ MSG_ID_HD_DG_SERVICE_MODE_REQUEST = 0xB6, ///< HD request for DG to to go to service mode MSG_ID_DG_RTC_EPOCH_DATA = 0xB7, ///< DG RTC epoch broadcast message MSG_ID_HD_DG_USAGE_INFO_REQUEST = 0xB8, ///< HD request DG usage info - MSG_ID_HD_DG_SERVICE_RECORD_REQUEST = 0xB9, ///< HD request DG service record + MSG_ID_MSG_AVAILABLE_9 = 0xB9, ///< Message ID available MSG_ID_HD_UI_CONFIRMATION_REQUEST = 0xBA, ///< HD request UI confirmation MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xBB, ///< UI confirmation result response MSG_ID_UI_SET_DG_RO_MODE = 0xBC, ///< UI set DG RO mode @@ -232,6 +232,9 @@ MSG_ID_HD_SEND_CHEM_FLUSH_SAMPLE_PASS_FAIL_TO_DG = 0xC8, ///< HD send chemical disinfect flush sample pass/fail to DG MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST = 0xC9, ///< DG start/stop RO permeate sample mode command request 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -391,6 +394,7 @@ 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_VALVES_STATES_PUBLISH_INTERVAL_OVERRIDE = 0x8099, ///< 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 @@ -407,7 +411,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 @@ -456,7 +460,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0xA03E, ///< DG send scheduled runs to CAN bus to be received in Dialin (equivalent to publish) MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0xA03F, ///< DG fluid leak state broadcast interval override request MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0xA040, ///< DG fluid leak state detector override request - MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0xA041, ///< DG flush mode data publish interval override + MSG_ID_MSG_AVAILABLE_11 = 0xA041, ///< DG message ID available MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0xA042, ///< DG filter flush time period override MSG_ID_DG_FANS_RPM_OVERRIDE = 0xA043, ///< DG fans RPM override MSG_ID_FLOW_DATA_PUBLISH_INTERVAL_OVERRIDE = 0xA044, ///< Flow data broadcast interval override request @@ -479,7 +483,7 @@ 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_DG_CPLD_PUBLISH_INTERVAL_OVERRIDE = 0xA058, ///< DG CPLD publish interval override + MSG_ID_MSG_AVAILABLE_10 = 0xA058, ///< DG message ID available MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE = 0xA059, ///< DG drain pump current override request MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE = 0xA05A, ///< DG drain pump direction override request MSG_ID_DG_RO_FEEDBACK_VOLTAGE_OVERRIDE = 0xA05B, ///< DG RO feedback voltage override @@ -503,6 +507,7 @@ 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_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