Index: MsgDefs.h =================================================================== diff -u -ra01144534759117e70ca8300e49954cd149b4b6a -r1fc9f40cb246c14cdc975b6e979bcde7fef48822 --- MsgDefs.h (.../MsgDefs.h) (revision a01144534759117e70ca8300e49954cd149b4b6a) +++ MsgDefs.h (.../MsgDefs.h) (revision 1fc9f40cb246c14cdc975b6e979bcde7fef48822) @@ -55,22 +55,22 @@ MSG_ID_TD_EVENT = 0x17, ///< TD general event MSG_ID_DD_EVENT = 0x18, ///< DD general event 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_TD_VOLTAGES_DATA = 0x23, ///< TD broadcast voltages data - MSG_ID_TD_BUBBLES_DATA = 0x24, ///< TD broadcast bubbles data - MSG_ID_DD_CONDUCTIVITY_DATA = 0x25, ///< DD conductivity sensor readings - MSG_ID_TD_AIR_PUMP_DATA = 0x26, ///< TD broadcast air pump data - MSG_ID_TD_SWITCHES_DATA = 0x27, ///< TD broadcast switches data - MSG_ID_POWER_OFF_WARNING = 0x28, ///< TD broadcast for a power off warning - MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x29, ///< TD off button request message to UI for user confirmation - MSG_ID_PRESSURE_DATA = 0x2A, ///< TD broadcast pressure data - MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x2B, ///< DD concentrate pump data - MSG_ID_DD_TEMPERATURE_DATA = 0x2C, ///< DD temperature data - MSG_ID_DIALYSATE_PUMPS_DATA = 0x2D, ///< DD dialysate pumps data - MSG_ID_DD_HEATERS_DATA = 0x2E, ///< DD heaters data - MSG_ID_DD_LEVEL_DATA = 0x2F, ///< DD level data + MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x1A, ///< UI TD reset in service mode request + MSG_ID_DD_VALVES_STATES_DATA = 0x1B, ///< DD broadcast valve states + MSG_ID_DD_PRESSURES_DATA = 0x1C, ///< DD pressure sensor readings + MSG_ID_TD_VOLTAGES_DATA = 0x1D, ///< TD broadcast voltages data + MSG_ID_TD_BUBBLES_DATA = 0x1E, ///< TD broadcast bubbles data + MSG_ID_DD_CONDUCTIVITY_DATA = 0x1F, ///< DD conductivity sensor readings + MSG_ID_TD_AIR_PUMP_DATA = 0x20, ///< TD broadcast air pump data + MSG_ID_TD_SWITCHES_DATA = 0x21, ///< TD broadcast switches data + MSG_ID_POWER_OFF_WARNING = 0x22, ///< TD broadcast for a power off warning + MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23, ///< TD off button request message to UI for user confirmation + MSG_ID_PRESSURE_DATA = 0x24, ///< TD broadcast pressure data + MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25, ///< DD concentrate pump data + MSG_ID_DD_TEMPERATURE_DATA = 0x26, ///< DD temperature data + MSG_ID_DIALYSATE_PUMPS_DATA = 0x27, ///< DD dialysate pumps data + MSG_ID_DD_HEATERS_DATA = 0x28, ///< DD heaters data + MSG_ID_DD_LEVEL_DATA = 0x29, ///< DD level data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -131,6 +131,9 @@ MSG_ID_DD_DIALYSATE_PUMPS_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xA020, ///< DD dialysate pumps target pressure override request MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_CURRENT_OVERRIDE_REQUEST = 0xA021, ///< DD dialysate pumps measured current override request MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_DIRECTION_OVERRIDE_REQUEST = 0xA022, ///< DD dialysate pumps measured direction override request + MSG_ID_DD_HEATERS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA023, ///< DD heaters data publish interval override request + MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA024, ///< DD levels data publish interval override request + MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST = 0xA025, ///< DD levels status 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