Index: MsgDefs.h =================================================================== diff -u -rb0eae01186e2262b46b949ee8fd5fbb12af6f538 -r703d1cb8a00d95cf672b0a3a9f179e14c47800db --- MsgDefs.h (.../MsgDefs.h) (revision b0eae01186e2262b46b949ee8fd5fbb12af6f538) +++ MsgDefs.h (.../MsgDefs.h) (revision 703d1cb8a00d95cf672b0a3a9f179e14c47800db) @@ -55,20 +55,24 @@ 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_RO_EVENT = 0x2B, ///< RO general event + 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 + MSG_ID_RO_EVENT = 0x2A, ///< RO general event - // 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 @@ -111,6 +115,27 @@ 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_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA012, ///< DD concentrate pump publish interval override request + MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA013, ///< DD concentrate pump target speed override request + MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST = 0xA014, ///< DD concentrate pump measured speed override request + MSG_ID_DD_CONCENTRATE_PUMP_PARKED_OVERRIDE_REQUEST = 0xA015, ///< DD concentrate pump parked override request + MSG_ID_DD_CONCENTRATE_PUMP_PARK_FAULT_OVERRIDE_REQUEST = 0xA016, ///< DD concentrate pump park fault override request + MSG_ID_DD_CONCENTRATE_PUMP_PARK_REQUEST_OVERRIDE_REQUEST = 0xA017, ///< DD concentrate pump park request override request + MSG_ID_DD_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA018, ///< DD temperature sensor publish interval override request + MSG_ID_DD_TEMPERATURE_SENSOR_MEASURED_TEMPERATURE_OVERRIDE_REQUEST = 0xA019, ///< DD temperature sensor measured temperature override request + MSG_ID_DD_TEMPERATURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA01A, ///< DD temperature sensor read counter override request + MSG_ID_DD_TEMPERATURE_SENSOR_BARO_READ_COUNTER_OVERRIDE_REQUEST = 0xA01B, ///< DD temperature sensor baro sensor read counter override request + MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST = 0xA01C, ///< DD temperature sensor baro sensor coefficient CRC override request + MSG_ID_DD_DIALYSATE_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA01D, ///< DD dialysate pumps data publish interval override request + MSG_ID_DD_DIALYSATE_PUMPS_TARGET_SPEED_OVERRIDE_REQUEST = 0xA01E, ///< DD dialysate pumps target speed override request + MSG_ID_DD_DIALYSATE_PUMPS_MEASURED_SPEED_OVERRIDE_REQUEST = 0xA01F, ///< DD dialysate pumps measured speed override request + 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_HEATERS_DUTY_CYCLE_OVERRIDE_REQUEST = 0xA024, ///< DD heaters dutycycle override request + MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA025, ///< DD levels data publish interval override request + MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST = 0xA026, ///< 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