Index: MsgDefs.h =================================================================== diff -u -r3648a780685d0f5b85ec80b65509db5faeaecb8a -r56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee --- MsgDefs.h (.../MsgDefs.h) (revision 3648a780685d0f5b85ec80b65509db5faeaecb8a) +++ MsgDefs.h (.../MsgDefs.h) (revision 56e52c3d5bd4fb29980ce9a8300fd4056db9e1ee) @@ -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 @@ -123,12 +123,25 @@ MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B, ///< TD treatment paused timer data. MSG_ID_DD_UF_DATA = 0x5C, ///< DD ultrafiltration data MSG_ID_FP_PERMEATE_TANK_DATA = 0x5D, ///< FP Permeate tank broadcast data - MSG_ID_UI_SALINE_BOLUS_REQUEST = 0x5E, ///< UI saline bolus request - MSG_ID_TD_SALINE_BOLUS_RESPONSE = 0x5F, ///< TD saline bolus response + MSG_ID_DD_SPENT_CHAMBER_FILL_DATA = 0x5E, ///< DD spent chamber fill broadcast data + MSG_ID_UI_SOLUTION_INFUSION_REQUEST = 0x5F, ///< UI solution infusion request + MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60, ///< TD solution infusion response + MSG_ID_DD_BLOOD_LEAK_DATA = 0x61, ///< DD blood leak data + MSG_ID_FP_INLET_PRESSURE_CHECK_DATA = 0x62, ///< FP Inlet Pressure Check broadcast data + MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63, ///< UI request to initiate a blood pressure reading + MSG_ID_TD_BLOOD_PRESSURE_READING = 0x64, ///< TD blood pressure reading to UI + 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 + MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT = 0x6A, ///< TD treatment log alarm event + MSG_ID_TD_TREATMENT_LOG_EVENT = 0x6B, ///< TD treatment log event + MSG_ID_TD_DATE_AND_TIME_REQUEST = 0x6C, ///< TD date and time request + MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D, ///< TD date and time response + MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E, ///< DD date and time request + MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F, ///< DD date and time response -#ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data -#endif // 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 @@ -189,6 +202,16 @@ MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037, ///< TD override request for blood flow alpha Y intercept MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038, ///< TD override request for blood flow wear A term MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039, ///< TD override request for blood flow wear B term + MSG_ID_TD_SET_TEST_CONFIGURATION = 0x803A, ///< TD set test configuration + MSG_ID_TD_GET_TEST_CONFIGURATION = 0x803B, ///< TD get test configuration + MSG_ID_TD_RESET_ALL_TEST_CONFIGURATIONS = 0x803C, ///< TD reset all the configurations + MSG_ID_TD_AIR_PUMP_POWER_RAISE_OVERRIDE_REQUEST = 0x803D, ///< TD override request for air pump power level used to raise air trap level + MSG_ID_TD_AIR_PUMP_POWER_LOWER_OVERRIDE_REQUEST = 0x803E, ///< TD override request for air pump power level used to lower air trap level + MSG_ID_TD_HARD_STOP_BLOOD_PUMP = 0x803F, ///< TD hard stop blood pump + MSG_ID_TD_BARO_MFG_CRC_OVERRIDE = 0x8040, ///< TD barometric pressure sensor manufacturing CRC override. + MSG_ID_TD_BARO_PRESSURE_OVERRIDE = 0x8041, ///< TD barometric pressure sensor override. + MSG_ID_TD_TEMPERATURE_OVERRIDE = 0x8042, ///< TD temperature sensor override. + MSG_ID_TD_TEMPERATURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8043, ///< TD temperature sensor publish interval broadcast override. 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 @@ -199,8 +222,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 @@ -218,8 +241,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 @@ -254,15 +277,27 @@ MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST = 0xA03C, ///< DD heaters PWM period override request MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03D, ///< DD Pre generate dialysate mode data publish interval override request MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD Post generate dialysate mode data publish interval override request - MSG_ID_DD_AVAILABLE_TO_USE_3 = 0xA03F, ///< DD start pre-gen dialysate mode override request - MSG_ID_DD_AVAILABLE_TO_USE_2 = 0xA040, ///< DD stop pre-gen dialysate mode override request + MSG_ID_DD_SEND_BLOOD_LEAK_EMB_MODE_RESPONSE = 0xA03F, ///< DD send blood embedded mode response + MSG_ID_DD_SPENT_CHAMB_FILL_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request MSG_ID_DD_AVAILABLE_TO_USE_4 = 0xA041, ///< DD stop gen dialysate mode override request MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042, ///< DD set/reset safety shutdown override request -#ifdef __PUMPTEST__ - MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00, ///< DD piston pump data publish interval override request - MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01, ///< DD piston pump start/stop override request - MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02, ///< DD piston pump fill after dispense control -#endif + MSG_ID_DD_SET_TEST_CONFIGURATION = 0xA043, ///< DD set test configuration + MSG_ID_DD_GET_TEST_CONFIGURATION = 0xA044, ///< DD get test configuration + MSG_ID_DD_RESET_ALL_TEST_CONFIGURATIONS = 0xA045, ///< DD reset all the configurations + MSG_ID_AVAILABLE_1 = 0xA046, ///< Msg ID not used - available for use. + MSG_ID_DD_BLOOD_LEAK_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA047, ///< DD blood leak data publish interval override request + MSG_ID_DD_BLOOD_LEAK_STATUS_OVERRIDE_REQUEST = 0xA048, ///< DD blood leak status override request + MSG_ID_DD_BLOOD_LEAK_SET_TO_EMBEDDED_MODE_REQUEST = 0xA049, ///< DD blood leak set to embedded mode request + MSG_ID_DD_BLOOD_LEAK_SET_EMBEDDED_MODE_CMD_REQUEST = 0xA04A, ///< DD blood leak set embedded more command request + MSG_ID_DD_BLOOD_LEAK_EMBEDDED_MODE_INFO_OVERRIDE_REQUEST = 0xA04B, ///< DD blood leak embedded mode information override request + 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_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053, ///< DD Rinse pump broadcast data overrride 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 @@ -277,8 +312,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. @@ -310,6 +345,14 @@ MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A, ///< FP Permeate Tank data publish interval override request MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B, ///< FP Alarm State override request MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C, ///< FP alarm clear request + MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D, ///< FP set test configuration + MSG_ID_FP_GET_TEST_CONFIGURATION = 0xB02E, ///< FP get test configuration + 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_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033, ///< FP set start stop signal for generate permeate 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