Index: MsgDefs.h =================================================================== diff -u -r60c09a5d4d3143212223491719d1e8edc5efc3da -ra0e0ce9504b1f2b4425201e8949be37c58a52c79 --- MsgDefs.h (.../MsgDefs.h) (revision 60c09a5d4d3143212223491719d1e8edc5efc3da) +++ MsgDefs.h (.../MsgDefs.h) (revision a0e0ce9504b1f2b4425201e8949be37c58a52c79) @@ -8,8 +8,8 @@ * * @file MsgDefs.h * -* @author (last) Dara Navaei -* @date (last) 15-May-2023 +* @author (last) Sean Nash +* @date (last) 24-May-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 @@ -230,6 +230,10 @@ MSG_ID_DG_START_STOP_HEAT_DISINFECT_ACTIVE_COOL = 0xC6, ///< DG heat disinfect active cool start/stop command MSG_ID_HD_AIR_PUMP_DATA = 0xC7, ///< HD air pump data publish 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -388,6 +392,7 @@ MSG_ID_HD_SEND_TEST_CONFIGURATION = 0x8095, ///< HD send test configuration 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_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 @@ -499,6 +504,7 @@ MSG_ID_DG_SET_LOAD_CELLS_TARE_VALUES = 0xA06C, ///< DG set load cells tare values 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_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 @@ -531,8 +537,8 @@ REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16, ///< A saline bolus is in progress REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18, ///< The Heparin pre-stop setting is greater than the treatment duration - REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH = 19, ///< Arterial pressure low and high alarm limits are not inconsistent - REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH = 20, ///< Venous pressure low and high alarm limits are inconsistent + REQUEST_REJECT_REASON_AVAILABLE_1 = 19, ///< Not used + REQUEST_REJECT_REASON_AVAILABLE_2 = 20, ///< Not used REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21, ///< Saline bolus volume maximum has been reached - no more saline allowed REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22, ///< A saline bolus is not in progress REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23, ///< Requested user action is disabled in current state