Index: MsgDefs.h =================================================================== diff -u -r994abd49d5b5096602e0a6e53a0442a87e0e73e3 -re40841dc5e89269844f15e7dad3e828f0359b1bb --- MsgDefs.h (.../MsgDefs.h) (revision 994abd49d5b5096602e0a6e53a0442a87e0e73e3) +++ MsgDefs.h (.../MsgDefs.h) (revision e40841dc5e89269844f15e7dad3e828f0359b1bb) @@ -65,7 +65,7 @@ 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_TD_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 @@ -75,7 +75,22 @@ MSG_ID_TD_VALVES_DATA = 0x2B, ///< TD broadcast valves data MSG_ID_RO_EVENT = 0x2C, ///< RO general event MSG_ID_RO_ALARM_INFO_DATA= 0x2D, ///< RO alarm info data - + MSG_ID_DD_BAL_CHAMBER_DATA = 0x2E, ///< DD balancing chamber data + MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F, ///< DD Generate dialysate mode data + MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30, ///< DD Generate dialysate request data coming from TD with additional parameters + MSG_ID_RO_VALVES_STATES_DATA = 0x31, ///< RO valves data + MSG_ID_RO_PUMP_DATA = 0x32, ///< RO pumps data + MSG_ID_RO_OP_MODE_DATA = 0x33, ///< RO broadcast operation mode data + MSG_ID_RO_PRESSURES_DATA = 0x34, ///< RO broadcast pressures data + MSG_ID_RO_LEVEL_DATA = 0x35, ///< RO broadcast level data + MSG_ID_RO_FLOW_DATA = 0x36, ///< RO broadcast flow data + MSG_ID_RO_CONDUCTIVITY_DATA = 0x37, ///< RO broadcast conductivity data + MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38, ///< DD requests RO to start/stop delivering the purified water. + MSG_ID_RO_TEMPERATURE_DATA = 0x39, ///< RO temperatures data broadcast + MSG_ID_RO_HEATER_DATA = 0x3A, ///< RO heater data broadcast +#ifdef __PUMPTEST__ + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0x3B, ///< 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 @@ -163,9 +178,62 @@ 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 + 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_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 + MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST = 0xA02E, ///< DD Heaters start override request + MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F, ///< DD Valves open/close state override request + MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030, ///< DD RO CAN Communication status override request + MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA031, ///< DD balance chamber data publish interval override request + MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST = 0xA032, ///< DD balance chamber switching frequency override request + MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST = 0xA033, ///< DD dialysate delivery in progress override request + MSG_ID_DD_DIAL_DELIVERY_GOOD_TO_DELIVER_OVERRIDE_REQUEST = 0xA034, ///< DD dialysate delivery good to deliver override request + MSG_ID_DD_HEATERS_TARGET_TEMPERATURE_OVERRIDE_REQUEST = 0xA035, ///< DD heaters target temperature override request + MSG_ID_DD_BC_VALVE_STATES_OVERRIDE_REQUEST = 0xA036, ///< DD balancing chamber valve states override request + MSG_ID_DD_BC_SWITCH_ONLY_START_STOP_OVERRIDE_REQUEST = 0xA037, ///< DD balancing chamber switch only start/stop override request + MSG_ID_DD_HYD_CHAMBER_TARGET_TEMP_OVERRIDE_REQUEST = 0xA038, ///< DD Hydraulic chamber target temperature 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 +#endif + MSG_ID_FIRST_RO_TESTER_MESSAGE = 0xB000, ///< First RO test message ID + MSG_ID_RO_TESTER_LOGIN_REQUEST = MSG_ID_FIRST_RO_TESTER_MESSAGE, ///< RO tester log-in + MSG_ID_RO_SOFTWARE_RESET_REQUEST = 0xB001, ///< RO reset request + MSG_ID_RO_SEND_TEST_CONFIGURATION = 0xB002, ///< RO send test configuration to Dialin + MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003, ///< RO valve data publish interval override request + MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004, ///< RO valve commanded state override request + MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005, ///< RO valve sensed state override request + MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST = 0xB006, ///< RO set boost pump PWM request + MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007, ///< RO override request for boost pump read PWM + MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008, ///< RO override request for boost pump speed (RPM) + MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009, ///< RO boost pumps data publish interval override request + MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST = 0xB00A, ///< RO override request for pressure (mmHg) + MSG_ID_RO_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B, ///< RO override request for pressure sensor temperature (deg C) + MSG_ID_RO_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C, ///< RO override request for pressure sensor read count + MSG_ID_RO_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D, ///< RO override request for pressure sensor error count + MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E, ///< RO pressures data publish interval override request + MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F, ///< RO level data publish interval override request + MSG_ID_RO_LEVEL_OVERRIDE_REQUEST = 0xB010, ///< RO override request for level sensor. + MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011, ///< RO flows data publish interval override request + MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST = 0xB012, ///< RO override request for flow rate (mL/min) + MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013, ///< RO override request for flow temperature (deg C) + MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014, ///< RO conductivity data publish interval override request + MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015, ///< RO conductivity override request + MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016, ///< RO conductivity sensor temperature override request + MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017, ///< RO conductivity sensor read count override request + MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018, ///< RO conductivity sensor error count override request + MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST = 0xB019, ///< RO temperature override request + MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A, ///< RO override request for filtered flow rate (mL/min) + MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B, ///< RO override request for filtered flow temperature (deg C) + 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 + MSG_ID_RO_DEBUG_EVENT = 0xFFF3, ///< RO debug event text to be logged in event log MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF, ///< Acknowledgment of message that requires acknowledgment