Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r95af7422ee77c978beddb9fce98d7ba0f16e12f5 -r82673b44f61604336cf70c0e72db0e332325c8af --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 95af7422ee77c978beddb9fce98d7ba0f16e12f5) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 82673b44f61604336cf70c0e72db0e332325c8af) @@ -34,8 +34,8 @@ MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD_REQUEST = 0xB MSG_ID_TD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0xC MSG_ID_FW_VERSIONS_REQUEST = 0xD - MSG_ID_TD_VERSION_REPONSE = 0xE - MSG_ID_DD_VERSION_REPONSE = 0xF + MSG_ID_TD_VERSION_RESPONSE = 0xE + MSG_ID_DD_VERSION_RESPONSE = 0xF MSG_ID_UI_CHECK_IN = 0x10 MSG_ID_TD_BLOOD_PUMP_DATA = 0x11 MSG_ID_TD_OP_MODE_DATA = 0x12 @@ -64,21 +64,21 @@ MSG_ID_DD_LEVEL_DATA = 0x29 MSG_ID_TD_AIR_TRAP_DATA = 0x2A MSG_ID_TD_VALVES_DATA = 0x2B - MSG_ID_RO_EVENT = 0x2C - MSG_ID_RO_ALARM_INFO_DATA= 0x2D + MSG_ID_FP_EVENT = 0x2C + MSG_ID_FP_ALARM_INFO_DATA= 0x2D MSG_ID_DD_BAL_CHAMBER_DATA = 0x2E MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30 - MSG_ID_RO_VALVES_STATES_DATA = 0x31 - MSG_ID_RO_PUMP_DATA = 0x32 - MSG_ID_RO_OP_MODE_DATA = 0x33 - MSG_ID_RO_PRESSURES_DATA = 0x34 - MSG_ID_RO_LEVEL_DATA = 0x35 - MSG_ID_RO_FLOW_DATA = 0x36 - MSG_ID_RO_CONDUCTIVITY_DATA = 0x37 - MSG_ID_DD_RO_START_STOP_CMD_REQUEST = 0x38 - MSG_ID_RO_TEMPERATURE_DATA = 0x39 - MSG_ID_RO_HEATER_DATA = 0x3A + MSG_ID_FP_VALVES_STATES_DATA = 0x31 + MSG_ID_FP_RO_PUMP_DATA = 0x32 + MSG_ID_FP_OP_MODE_DATA = 0x33 + MSG_ID_FP_PRESSURES_DATA = 0x34 + MSG_ID_FP_LEVEL_DATA = 0x35 + MSG_ID_FP_FLOW_DATA = 0x36 + MSG_ID_FP_CONDUCTIVITY_DATA = 0x37 + MSG_ID_DD_FP_START_STOP_CMD_REQUEST = 0x38 + MSG_ID_FP_TEMPERATURE_DATA = 0x39 + MSG_ID_FP_HEATER_DATA = 0x3A MSG_ID_TD_TREATMENT_TIME_DATA = 0x3B MSG_ID_TD_TREATMENT_STATE_DATA = 0x3C MSG_ID_TD_SALINE_BOLUS_DATA = 0x3D @@ -93,18 +93,26 @@ MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW = 0x46 MSG_ID_UI_UF_PAUSE_RESUME_REQUEST = 0x47 MSG_ID_TD_UF_PAUSE_RESUME_RESPONSE = 0x48 - MSG_ID_RO_GEN_PERMEATE_MODE_DATA = 0x49 + MSG_ID_FP_GEN_PERMEATE_MODE_DATA = 0x49 MSG_ID_DD_PRE_GEN_DIALYSATE_STATE_DATA = 0x4A MSG_ID_DD_POST_GEN_DIALYSATE_STATE_DATA = 0x4B MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA = 0x4C - MSG_ID_RO_PRE_GEN_WATER_MODE_DATA = 0x4D + MSG_ID_FP_PRE_GEN_WATER_MODE_DATA = 0x4D MSG_ID_TD_EJECTOR_DATA = 0x4E MSG_ID_TD_TREATMENT_SET_POINTS = 0x4F - MSG_ID_RO_BOOST_PUMP_DATA = 0x50 + MSG_ID_FP_BOOST_PUMP_DATA = 0x50 MSG_ID_TD_SERIAL_RESPONSE = 0x51 MSG_ID_DD_SERIAL_RESPONSE = 0x52 MSG_ID_TD_TEMPERATURE_DATA = 0x53 MSG_ID_TD_BATTERY_DATA = 0x54 + MSG_ID_DD_UF_DATA = 0x55 + MSG_ID_FP_PERMEATE_FLUSH_DATA = 0x56 + MSG_ID_FP_CONCENTRATE_FLUSH_DATA = 0x57 + MSG_ID_FP_GENP_DEF_DATA = 0x58 + MSG_ID_FP_PRE_GEN_DEF_DATA = 0x59 + MSG_ID_FP_VERSION_RESPONSE = 0x5A + MSG_ID_TD_TREATMENT_PAUSED_TIMER_DATA = 0x5B + MSG_ID_FP_PERMEATE_TANK_DATA = 0x5C MSG_ID_DD_BLOOD_LEAK_DATA = 0x60 MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 @@ -165,6 +173,9 @@ MSG_ID_TD_EJECTOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8034 MSG_ID_TD_SET_AIR_TRAP_CONTROL = 0x8035 MSG_ID_TD_HOME_BLOOD_PUMP_REQUEST = 0x8036 + MSG_ID_TD_BLOOD_FLOW_ALPHA_Y_INTERCEPT_OVERRIDE_REQUEST = 0x8037 + MSG_ID_TD_BLOOD_FLOW_WEAR_A_TERM_OVERRIDE_REQUEST = 0x8038 + MSG_ID_TD_BLOOD_FLOW_WEAR_B_TERM_OVERRIDE_REQUEST = 0x8039 MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DD_SOFTWARE_RESET_REQUEST = 0xA001 @@ -208,13 +219,13 @@ MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA027 MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST = 0xA028 MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST = 0xA029 - MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA02A + MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02A MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02B MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA02C MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST = 0xA02D MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST = 0xA02E MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST = 0xA02F - MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030 + MSD_ID_DD_FP_COMMUNICATION_STATUS_OVERRIDE_REQUEST = 0xA030 MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST = 0xA031 MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST = 0xA032 MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST = 0xA033 @@ -232,47 +243,62 @@ MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA03F MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA040 MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xA041 + MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xA042 + MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xA043 MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST = 0xAF00 MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST = 0xAF01 MSG_ID_DD_PISTON_PUMP_FILL_AFTER_DISPENSE_OVERRIDE_REQUEST = 0xAF02 - MSG_ID_RO_TESTER_LOGIN_REQUEST = 0xB000 - MSG_ID_RO_SOFTWARE_RESET_REQUEST = 0xB001 - MSG_ID_RO_SEND_TEST_CONFIGURATION = 0xB002 - MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003 - MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004 - MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005 - MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST = 0xB006 - MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007 - MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008 - MSG_ID_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009 - MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST = 0xB00A - MSG_ID_RO_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B - MSG_ID_RO_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C - MSG_ID_RO_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D - MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E - MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F - MSG_ID_RO_LEVEL_OVERRIDE_REQUEST = 0xB010 - MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011 - MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST = 0xB012 - MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013 - MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014 - MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015 - MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016 - MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017 - MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018 - MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST = 0xB019 - MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A - MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B - MSG_ID_RO_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01C - MSG_ID_RO_SET_OP_MODE_REQUEST = 0xB01D - MSG_ID_RO_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E - MSG_ID_RO_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F + MSG_ID_FP_TESTER_LOGIN_REQUEST = 0xB000 + MSG_ID_FP_SOFTWARE_RESET_REQUEST = 0xB001 + MSG_ID_FP_SEND_TEST_CONFIGURATION = 0xB002 + MSG_ID_FP_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB003 + MSG_ID_FP_VALVE_CMD_STATE_OVERRIDE_REQUEST = 0xB004 + MSG_ID_FP_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xB005 + MSG_ID_FP_FLUID_PUMP_SET_PWM_REQUEST = 0xB006 + MSG_ID_FP_FLUID_PUMP_READ_PWM_OVERRIDE_REQUEST = 0xB007 + MSG_ID_FP_FLUID_PUMP_SPEED_OVERRIDE_REQUEST = 0xB008 + MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB009 + MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST = 0xB00A + MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST = 0xB00B + MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST = 0xB00C + MSG_ID_FP_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST = 0xB00D + MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E + MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F + MSG_ID_FP_LEVEL_OVERRIDE_REQUEST = 0xB010 + MSG_ID_FP_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011 + MSG_ID_FP_FLOW_RATE_OVERRIDE_REQUEST = 0xB012 + MSG_ID_FP_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013 + MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014 + MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015 + MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016 + MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017 + MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018 + MSG_ID_FP_TEMPERATURE_OVERRIDE_REQUEST = 0xB019 + MSG_ID_FP_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A + MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B + MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01C + MSG_ID_FP_SET_OP_MODE_REQUEST = 0xB01D + MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01E + MSG_ID_FP_TEMPERATURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB01F + MSG_ID_FP_RO_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB020 + MSG_ID_FP_RO_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB021 + MSG_ID_FP_RO_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB022 + MSG_ID_FP_BOOST_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB023 + MSG_ID_FP_BOOST_PUMP_TARGET_PRESSURE_OVERRIDE_REQUEST = 0xB024 + MSG_ID_FP_BOOST_PUMP_TARGET_FLOW_OVERRIDE_REQUEST = 0xB025 + MSG_ID_FP_BOOST_PUMP_TARGET_PWM_OVERRIDE_REQUEST = 0xB026 + MSG_ID_FP_BOOST_PUMP_STOP_REQUEST = 0xB027 + MSG_ID_FP_RO_PUMP_STOP_REQUEST = 0xB028 + MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST = 0xB029 + MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB02A + MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST = 0xB02B + MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST = 0xB02C MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 - MSG_ID_RO_DEBUG_EVENT = 0xFFF3 + MSG_ID_FP_DEBUG_EVENT = 0xFFF3 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0xFFFF \ No newline at end of file