Index: MsgDefs.h =================================================================== diff -u -r3cd42ed128e5ab7973725b22f75cb176c1a46b0e -r80795d4b9cca413fa4fb4d3d2971e3e682d662cd --- MsgDefs.h (.../MsgDefs.h) (revision 3cd42ed128e5ab7973725b22f75cb176c1a46b0e) +++ MsgDefs.h (.../MsgDefs.h) (revision 80795d4b9cca413fa4fb4d3d2971e3e682d662cd) @@ -114,6 +114,15 @@ MSG_ID_DD_SERIAL_RESPONSE = 0x52, ///< DD response to UI serial request MSG_ID_TD_TEMPERATURE_DATA = 0x53, ///< TD Temperature broadcast data MSG_ID_TD_BATTERY_DATA = 0x54, ///< TD Battery broadcast data + MSG_ID_FP_FILTER_FLUSH_DATA = 0x55, ///< FP Filter Flush broadcast data + MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56, ///< FP Permeate Flush broadcast data + MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57, ///< FP Concentrate Flush broadcast data + MSG_ID_FP_GENP_DEF_DATA = 0x58, ///< FP Generate Permeate Defeatured broadcast data + MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59, ///< FP Pre Generate Permeate Defeatured broadcast data + MSG_ID_FP_VERSION_RESPONSE = 0x5A, ///< FP FW Version response + 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 #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data @@ -172,6 +181,12 @@ MSG_ID_TD_OP_MODE_OVERRIDE_REQUEST = 0x8031, ///< TD set operation mode request MSG_ID_TD_EJECTOR_MOTOR_SET_SPEED_REQUEST = 0x8032, ///< TD set ejector motor speed request MSG_ID_TD_EJECTOR_COMMAND = 0x8033, ///< TD ejector command + MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8034, ///< TD override request for ejector data publish interval + MSG_ID_TD_SET_AIR_TRAP_CONTROL = 0x8035, ///< TD set air trap control to start or stop + MSG_ID_TD_HOME_BLOOD_PUMP = 0x8036, ///< TD home blood pump request + 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_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 @@ -216,7 +231,7 @@ MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027, ///< DD TD CAN Communication status override request MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028, ///< DD operation mode status override request MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029, ///< DD set new operation mode override request - MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA02A, ///< DD start gen dialysate mode override request + MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA03E, ///< DD ultrafiltration data publish interval override request MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B, ///< DD dialysate pumps start/stop override request MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C, ///< DD generate dialysate mode data publish interval override request MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D, ///< DD Concentrate pumps start/stop override request @@ -237,9 +252,9 @@ 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_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F, ///< DD start pre-gen dialysate mode override request - MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040, ///< DD stop pre-gen dialysate mode override request - MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041, ///< DD stop gen dialysate mode 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_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 @@ -254,10 +269,10 @@ MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003, ///< FP valve data publish interval override request MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004, ///< FP valve commanded state override request MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005, ///< FP valve sensed state override request - MSG_ID_FP_BOOST_PUMP_SET_PWM_REQUEST = 0xB006, ///< FP set boost pump PWM request - MSG_ID_FP_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007, ///< FP override request for boost pump read PWM - MSG_ID_FP_BOOST_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008, ///< FP override request for boost pump speed (RPM) - MSG_ID_FP_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009, ///< FP boost pumps data publish interval override request + MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST = 0xB006, ///< FP set boost pump PWM request + MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007, ///< FP override request for boost pump read PWM + MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008, ///< FP override request for boost pump speed (RPM) + 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 @@ -280,6 +295,19 @@ MSG_ID_FP_SET_OPERATION_MODE_REQUEST = 0xB01D, ///< FP set operation mode request MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E, ///< FP operation mode publish interval override MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F, ///< FP temperature sensor publish interval override + MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB020, ///< FP RO Pump Target Pressure override request + MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021, ///< FP RO Pump Target Flow override request + MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022, ///< FP RO Pump Target PWM override request + MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023, ///< FP Boost Pump Target data publish interval override request + MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024, ///< FP Boost Pump Target Pressure override request + MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025, ///< FP Boost Pump Target Flow override request + MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026, ///< FP RO Pump Target PWM override request + MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027, ///< FP Boost Pump Stop request + MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028, ///< FP RO Pump Stop request + MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xB029, ///< FP Safety Shutdown override request + 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_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