Index: MsgDefs.h =================================================================== diff -u -rc312551a9fd141133e3f0c7d2e4ddc2e5fa0359a -r075ed77facb411e2f9f8b33e0081b30ab2225e65 --- MsgDefs.h (.../MsgDefs.h) (revision c312551a9fd141133e3f0c7d2e4ddc2e5fa0359a) +++ MsgDefs.h (.../MsgDefs.h) (revision 075ed77facb411e2f9f8b33e0081b30ab2225e65) @@ -61,17 +61,36 @@ 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 // 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_BUBBLE_OVERRIDE_REQUEST = 0x8003, ///< TD override request for a given bubble detector - MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8004, ///< TD override request for the TD voltage data broadcast interval - MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST = 0x8005, ///< TD override request for a given TD voltage - MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8006, ///< TD override request for the TD bubble data broadcast interval - MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST = 0x8007, ///< TD override request for a given TD pressure + MSG_ID_TD_VOLTAGE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8004, ///< TD override request for the voltage data broadcast interval + MSG_ID_TD_VOLTAGE_OVERRIDE_REQUEST = 0x8005, ///< TD override request for a given voltage + MSG_ID_TD_BUBBLE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8006, ///< TD override request for the bubble data broadcast interval + MSG_ID_TD_PRESSURE_OVERRIDE_REQUEST = 0x8007, ///< TD override request for a given pressure + MSG_ID_TD_AIR_PUMP_SET_STATE_REQUEST = 0x8008, ///< TD set air pump state request + MSG_ID_TD_AIR_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8009, ///< TD override request for the air pump data broadcast interval + MSG_ID_TD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x800A, ///< TD override request for the switches data broadcast interval + MSG_ID_TD_SWITCH_STATE_OVERRIDE_REQUEST = 0x800B, ///< TD override request for a given switch + MSG_ID_TD_OFF_BUTTON_OVERRIDE_REQUEST = 0x800C, ///< TD override request for the off button + MSG_ID_TD_STOP_BUTTON_OVERRIDE_REQUEST = 0x800D, ///< TD override request for the stop button + MSG_ID_TD_ALARM_LAMP_PATTERN_OVERRIDE_REQUEST = 0x800E, ///< TD override request for the alarm lamp pattern + MSG_ID_TD_ALARM_AUDIO_LEVEL_OVERRIDE_REQUEST = 0x800F, ///< TD override request for the alarm audio level + MSG_ID_TD_ALARM_AUDIO_CURRENT_HG_OVERRIDE_REQUEST = 0x8010, ///< TD override request for the alarm audio HG current + MSG_ID_TD_ALARM_AUDIO_CURRENT_LG_OVERRIDE_REQUEST = 0x8011, ///< TD override request for the alarm audio LG current + MSG_ID_TD_BACKUP_ALARM_AUDIO_CURRENT_OVERRIDE_REQUEST = 0x8012, ///< TD override request for the backup alarm audio current + MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8013, ///< TD override request for the pressures data broadcast interval 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 @@ -92,7 +111,19 @@ 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_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