Index: MsgDefs.h =================================================================== diff -u -r87d1990f4497a62ed3ac7d3ed6ce370f1a5f7e5d -reb72962b808f938824804f1934af99655ea4a444 --- MsgDefs.h (.../MsgDefs.h) (revision 87d1990f4497a62ed3ac7d3ed6ce370f1a5f7e5d) +++ MsgDefs.h (.../MsgDefs.h) (revision eb72962b808f938824804f1934af99655ea4a444) @@ -85,7 +85,7 @@ MSG_ID_FP_LEVEL_DATA = 0x35, ///< FP broadcast level data MSG_ID_FP_FLOW_DATA = 0x36, ///< FP broadcast flow data MSG_ID_FP_CONDUCTIVITY_DATA = 0x37, ///< FP broadcast conductivity data - MSG_ID_DD_FP_START_STOP_CMD_REQUEST = 0x38, ///< DD requests FP to start/stop delivering the purified water + MSG_ID_AVAILABLE_6 = 0x38, ///< DD requests FP to start/stop delivering the purified water MSG_ID_FP_TEMPERATURE_DATA = 0x39, ///< FP temperatures data broadcast MSG_ID_FP_HEATER_DATA = 0x3A, ///< FP heater data broadcast MSG_ID_TD_TREATMENT_TIME_DATA = 0x3B, ///< TD treatment time data broadcast @@ -133,6 +133,8 @@ MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65, ///< TD blood pressure broadcast data MSG_ID_UI_ULTRAFILTRATION_CHANGE_VALIDATE_REQUEST = 0x66, ///< UI request to validate ultrafiltration volume change MSG_ID_TD_ULTRAFILTRATION_CHANGE_VALIDATE_RESPONSE = 0x67, ///< TD response to request to validate ultrafiltration volume change + MSG_ID_DD_VOLTAGES_DATA = 0x68, ///< DD voltage broadcast data + MSG_ID_DD_RINSE_PUMP_DATA = 0x69, ///< DD rinse pump data // service/test CAN messages MSG_ID_FIRST_TD_TESTER_MESSAGE = 0x8000, ///< First TD test message ID @@ -210,8 +212,8 @@ 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_AVAILABLE_2 = 0xA008, ///< DD Msg ID not used - available for use. + MSG_ID_AVAILABLE_3 = 0xA009, ///< DD Msg ID not used - available for use. 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 @@ -229,8 +231,8 @@ 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_AVAILABLE_2 = 0xA01B, ///< DD Msg ID not used - available for use. + MSG_ID_DD_AVAILABLE_3 = 0xA01C, ///< DD Msg ID not used - available for use. 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 @@ -281,6 +283,10 @@ MSG_ID_DD_BLOOD_LEAK_INTENSITY_MOVING_AVERAGE_OVERRIDE_REQUEST = 0xA04C, ///< DD blood leak intensity moving average override request MSG_ID_DD_BLOOD_LEAK_ZEROING_INTERVAL_IN_MS_OVERRIDE_REQUEST = 0xA04D, ///< DD blood leak zeroing interval in milliseconds override request MSG_ID_DD_BLOOD_LEAK_ZERO_REQUEST = 0xA04E, ///< DD blood leak zero request + MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA04F, ///< DD filtered conductivity sensor reading override request + MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA050, ///< DD filtered conductivity sensor temperature override request + MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051, ///< DD monitored voltage data publish interval override request + MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052, ///< DD monitored voltage override request MSG_ID_FIRST_FP_TESTER_MESSAGE = 0xB000, ///< First FP test message ID MSG_ID_FP_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_FP_TESTER_MESSAGE, ///< FP tester log-in @@ -295,8 +301,8 @@ MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009, ///< FP boost pumps data publish interval override request MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST = 0xB00A, ///< FP override request for pressure (mmHg) MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B, ///< FP override request for pressure sensor temperature (deg C) - MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C, ///< FP override request for pressure sensor read count - MSG_ID_FP_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D, ///< FP override request for pressure sensor error count + MSG_ID_FP_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xB00C, ///< FP pressure sensor filter readings override request + MSG_ID_FP_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST = 0xB00D, ///< FP pressure sensor filter temperature override request MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E, ///< FP pressures data publish interval override request MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F, ///< FP level data publish interval override request MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010, ///< FP override request for level sensor. @@ -333,6 +339,8 @@ MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0xB02F, ///< FP reset all the configurations MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030, ///< FP inlet pressure check data publish interval override request MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031, ///< FP inlet pressure check time override request + MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor reading override request + MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032, ///< FP filtered conductivity sensor temperature 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