Index: DGDefs.h =================================================================== diff -u -rbd7c05c530bc9236288e36f9b6ff675c5e31472c -r6c2740ce90a21745d887e43be822a97154ae5596 --- DGDefs.h (.../DGDefs.h) (revision bd7c05c530bc9236288e36f9b6ff675c5e31472c) +++ DGDefs.h (.../DGDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) @@ -7,8 +7,8 @@ * * @file DGDefs.h * -* @author (last) Michael Garthwaite -* @date (last) 16-May-2023 +* @author (last) Dara Navaei +* @date (last) 31-May-2023 * * @author (original) Sean Nash * @date (original) 29-May-2020 Index: HDDefs.h =================================================================== diff -u -re52a734267f68afe0147f7114965a1847c3c6dc2 -r6c2740ce90a21745d887e43be822a97154ae5596 --- HDDefs.h (.../HDDefs.h) (revision e52a734267f68afe0147f7114965a1847c3c6dc2) +++ HDDefs.h (.../HDDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) @@ -837,6 +837,4 @@ NUM_OF_CONFIRMATION_REQUEST_STATUS ///< Number of confirmation status } CONFIRMATION_REQUEST_STATUS_T; -/**@}*/ - #endif Index: MsgDefs.h =================================================================== diff -u -re52a734267f68afe0147f7114965a1847c3c6dc2 -r6c2740ce90a21745d887e43be822a97154ae5596 --- MsgDefs.h (.../MsgDefs.h) (revision e52a734267f68afe0147f7114965a1847c3c6dc2) +++ MsgDefs.h (.../MsgDefs.h) (revision 6c2740ce90a21745d887e43be822a97154ae5596) @@ -230,6 +230,8 @@ 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 #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -388,6 +390,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 +502,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