Index: MsgDefs.h =================================================================== diff -u -r4afc5fdb64135add3051d793f05cc15e52df6f89 -rce08089a43f8148e3b0d7b67b1286afc30012089 --- MsgDefs.h (.../MsgDefs.h) (revision 4afc5fdb64135add3051d793f05cc15e52df6f89) +++ MsgDefs.h (.../MsgDefs.h) (revision ce08089a43f8148e3b0d7b67b1286afc30012089) @@ -9,7 +9,7 @@ * @file MsgDefs.h * * @author (last) Sean -* @date (last) 30-Jul-2024 +* @date (last) 16-Sep-2024 * * @author (original) Sean * @date (original) 30-Jul-2024 @@ -57,17 +57,35 @@ MSG_ID_TD_DD_ALARMS_REQUEST = 0x19, ///< TD request for DD to re-send trigger messages for each active alarm MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x20, ///< UI TD reset in service mode request MSG_ID_DD_VALVES_STATES_DATA = 0x21, ///< DD broadcast valve states + MSG_ID_DD_PRESSURES_DATA = 0x22, ///< DD pressure sensor readings + MSG_ID_DD_CONDUCTIVITY_DATA = 0x25, ///< DD conductivity sensor readings // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID MSG_ID_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_TD_TESTER_MESSAGE, ///< TD tester log-in MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001, ///< TD reset request MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002, ///< TD send test configuration to Dialin + MSG_ID_TD_VENOUS_BUBBLE_OVERRIDE_REQUEST = 0x8003, ///< TD override request for the venous bubble detector - MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID - MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in - MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001, ///< DD reset request - MSG_ID_DD_SEND_TEST_CONFIGURATION = 0xA002, ///< DD send test configuration to Dialin + MSG_ID_FIRST_DD_TESTER_MESSAGE = 0xA000, ///< First DD test message ID + MSG_ID_DD_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_DD_TESTER_MESSAGE, ///< DD tester log-in + MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001, ///< DD reset request + MSG_ID_DD_SEND_TEST_CONFIGURATION = 0xA002, ///< DD send test configuration to Dialin + MSG_ID_DD_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA003, ///< DD valve publish interval override request + MSG_ID_DD_VALVE_STATE_OVERRIDE_REQUEST = 0xA004, ///< DD valve state override request + MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005, ///< DD valve sensed state override request + MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006, ///< DD pressure sensor override request + MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007, ///< DD pressure sensor temperature override request + MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008, ///< DD pressure sensor read counter request + MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009, ///< DD pressure sensor error counter request + MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A, ///< DD pressure sensor publish interval override request + MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B, ///< DD pressure sensor filter readings override request + MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xA00C, ///< DD pressure sensor filter temperature override request + MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA00D, ///< DD conductivity sensor reading override request + MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA00E, ///< DD conductivity sensor temperature override request + MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA00F, ///< DD conductivity sensor read counter request + MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA010, ///< DD conductivity sensor error counter request + MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA011, ///< DD conductivity sensor publish interval override request MSG_ID_TD_DEBUG_EVENT = 0xFFF1, ///< TD debug event text to be logged in event log MSG_ID_DD_DEBUG_EVENT = 0xFFF2, ///< DD debug event text to be logged in event log