Index: MsgDefs.h =================================================================== diff -u -r5b475628f285670d8ccf437cab2ce4ebbbacb0f4 -r77da30d87d55f36c0567e1e43cae8e4d21bc63fb --- MsgDefs.h (.../MsgDefs.h) (revision 5b475628f285670d8ccf437cab2ce4ebbbacb0f4) +++ MsgDefs.h (.../MsgDefs.h) (revision 77da30d87d55f36c0567e1e43cae8e4d21bc63fb) @@ -73,21 +73,21 @@ MSG_ID_DD_LEVEL_DATA = 0x29, ///< DD level data MSG_ID_TD_AIR_TRAP_DATA = 0x2A, ///< TD broadcast air trap data 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_FP_EVENT = 0x2C, ///< FP general event + MSG_ID_FP_ALARM_INFO_DATA= 0x2D, ///< FP 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 + MSG_ID_FP_VALVES_STATES_DATA = 0x31, ///< FP valves data + MSG_ID_FP_RO_PUMP_DATA = 0x32, ///< FP broadcast P12 pump data + MSG_ID_FP_OP_MODE_DATA = 0x33, ///< FP broadcast operation mode data + MSG_ID_FP_PRESSURES_DATA = 0x34, ///< FP broadcast pressures data + 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_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 MSG_ID_TD_TREATMENT_STATE_DATA = 0x3C, ///< TD treatment state data broadcast MSG_ID_TD_SALINE_BOLUS_DATA = 0x3D, ///< TD saline bolus status data broadcast @@ -102,13 +102,18 @@ MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW = 0x46, ///< TD response to initiate/cancel treatment workflow request MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47, ///< UI ultrafiltration pause/resume request MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48, ///< TD response to ultrafiltration pause/resume request - MSG_ID_RO_GEN_WATER_MODE_DATA = 0x49, ///< RO Gen Permeate data broadcast + MSG_ID_FP_GEN_WATER_MODE_DATA = 0x49, ///< FP Gen Permeate data broadcast MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A, ///< DD Pre-gen dialysate mode data MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B, ///< DD Post-gen dialysate mode data MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C, ///< DD Pre Generate dialysate request data coming from TD. - MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D, ///< RO Pre Generate water mode data. + MSG_ID_FP_PRE_GEN_WATER_MODE_DATA = 0x4D, ///< FP Pre Generate water mode data. MSG_ID_TD_EJECTOR_DATA = 0x4E, ///< TD ejector data broadcast MSG_ID_TD_TREATMENT_SET_POINTS = 0x4F, ///< TD treatment user set points. + MSG_ID_FP_BOOST_PUMP_DATA = 0x50, ///< FP broadcast P40 pump data + MSG_ID_TD_SERIAL_RESPONSE = 0x51, ///< TD response to UI serial request + 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 #ifdef __PUMPTEST__ MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0, ///< DD piston pump data @@ -217,13 +222,13 @@ 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_AVAILABLE_TO_USE_1 = 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 + MSD_ID_DD_FP_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030, ///< DD FP 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 @@ -238,49 +243,53 @@ 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 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_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_RO_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01C, ///< RO pre generation data publish interval 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 + MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001, ///< FP reset request + MSG_ID_FP_SEND_TEST_CONFIGURATION = 0xB002, ///< FP send test configuration to Dialin + 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_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_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. + MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011, ///< FP flows data publish interval override request + MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST = 0xB012, ///< FP override request for flow rate (mL/min) + MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013, ///< FP override request for flow temperature (deg C) + MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014, ///< FP conductivity data publish interval override request + MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015, ///< FP conductivity override request + MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016, ///< FP conductivity sensor temperature override request + MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017, ///< FP conductivity sensor read count override request + MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018, ///< FP conductivity sensor error count override request + MSG_ID_FP_TEMPERATURE_OVERRIDE_REQUEST = 0xB019, ///< FP temperature override request + MSG_ID_FP_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A, ///< FP override request for filtered flow rate (mL/min) + MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B, ///< FP override request for filtered flow temperature (deg C) + MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01C, ///< FP pre generation data publish interval override request + 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_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_FP_DEBUG_EVENT = 0xFFF3, ///< FP debug event text to be logged in event log MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF, ///< Acknowledgment of message that requires acknowledgment