Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r099095611e541d69aee3afc90ec06a2046836079 -r5ee0dd4d1d95856defa2a8f20936d5080da62bd5 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 099095611e541d69aee3afc90ec06a2046836079) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 5ee0dd4d1d95856defa2a8f20936d5080da62bd5) @@ -20,54 +20,54 @@ # Branch: staging @unique class MsgIds(DialinEnum): - MSG_ID_UNUSED = 0x0 - MSG_ID_ALARM_STATUS_DATA = 0x1 - MSG_ID_ALARM_TRIGGERED = 0x2 - MSG_ID_ALARM_CLEARED = 0x3 - MSG_ID_ALARM_CONDITION_CLEARED = 0x4 - MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x5 - MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x6 - MSG_ID_TD_ALARM_INFORMATION_DATA = 0x7 - MSG_ID_DD_ALARM_INFO_DATA = 0x8 - MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x9 - MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0xA - 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_UNUSED = 0x0 + MSG_ID_ALARM_STATUS_DATA = 0x1 + MSG_ID_ALARM_TRIGGERED = 0x2 + MSG_ID_ALARM_CLEARED = 0x3 + MSG_ID_ALARM_CONDITION_CLEARED = 0x4 + MSG_ID_USER_ALARM_SILENCE_REQUEST = 0x5 + MSG_ID_UI_ALARM_USER_ACTION_REQUEST = 0x6 + MSG_ID_TD_ALARM_INFORMATION_DATA = 0x7 + MSG_ID_DD_ALARM_INFO_DATA = 0x8 + MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0x9 + MSG_ID_TD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0xA + 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_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 - MSG_ID_DD_OP_MODE_DATA = 0x13 - MSG_ID_DD_COMMAND_RESPONSE = 0x14 - MSG_ID_TD_UI_VERSION_INFO_REQUEST = 0x15 - MSG_ID_UI_VERSION_INFO_RESPONSE = 0x16 - MSG_ID_TD_EVENT = 0x17 - MSG_ID_DD_EVENT = 0x18 - MSG_ID_TD_DD_ALARMS_REQUEST = 0x19 - MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x1A - MSG_ID_DD_VALVES_STATES_DATA = 0x1B - MSG_ID_DD_PRESSURES_DATA = 0x1C - MSG_ID_TD_VOLTAGES_DATA = 0x1D - MSG_ID_TD_BUBBLES_DATA = 0x1E - MSG_ID_DD_CONDUCTIVITY_DATA = 0x1F - MSG_ID_TD_AIR_PUMP_DATA = 0x20 - MSG_ID_TD_SWITCHES_DATA = 0x21 - MSG_ID_POWER_OFF_WARNING = 0x22 - MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23 + MSG_ID_UI_CHECK_IN = 0x10 + MSG_ID_TD_BLOOD_PUMP_DATA = 0x11 + MSG_ID_TD_OP_MODE_DATA = 0x12 + MSG_ID_DD_OP_MODE_DATA = 0x13 + MSG_ID_DD_COMMAND_RESPONSE = 0x14 + MSG_ID_TD_UI_VERSION_INFO_REQUEST = 0x15 + MSG_ID_UI_VERSION_INFO_RESPONSE = 0x16 + MSG_ID_TD_EVENT = 0x17 + MSG_ID_DD_EVENT = 0x18 + MSG_ID_TD_DD_ALARMS_REQUEST = 0x19 + MSG_ID_UI_TD_RESET_IN_SERVICE_MODE_REQUEST = 0x1A + MSG_ID_DD_VALVES_STATES_DATA = 0x1B + MSG_ID_DD_PRESSURES_DATA = 0x1C + MSG_ID_TD_VOLTAGES_DATA = 0x1D + MSG_ID_TD_BUBBLES_DATA = 0x1E + MSG_ID_DD_CONDUCTIVITY_DATA = 0x1F + MSG_ID_TD_AIR_PUMP_DATA = 0x20 + MSG_ID_TD_SWITCHES_DATA = 0x21 + MSG_ID_POWER_OFF_WARNING = 0x22 + MSG_ID_OFF_BUTTON_PRESS_REQUEST = 0x23 MSG_ID_TD_PRESSURE_DATA = 0x24 - MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25 - MSG_ID_DD_TEMPERATURE_DATA = 0x26 - MSG_ID_DIALYSATE_PUMPS_DATA = 0x27 - MSG_ID_DD_HEATERS_DATA = 0x28 - MSG_ID_DD_LEVEL_DATA = 0x29 - MSG_ID_TD_AIR_TRAP_DATA = 0x2A - MSG_ID_TD_VALVES_DATA = 0x2B + MSG_ID_DD_CONCENTRATE_PUMP_DATA = 0x25 + MSG_ID_DD_TEMPERATURE_DATA = 0x26 + MSG_ID_DIALYSATE_PUMPS_DATA = 0x27 + MSG_ID_DD_HEATERS_DATA = 0x28 + MSG_ID_DD_LEVEL_DATA = 0x29 + MSG_ID_TD_AIR_TRAP_DATA = 0x2A + MSG_ID_TD_VALVES_DATA = 0x2B 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_BAL_CHAMBER_DATA = 0x2E + MSG_ID_DD_GEN_DIALYSATE_MODE_DATA = 0x2F MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA = 0x30 MSG_ID_FP_VALVES_STATES_DATA = 0x31 MSG_ID_FP_RO_PUMP_DATA = 0x32 @@ -170,6 +170,7 @@ MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE = 0x93 MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST = 0x94 MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0x95 + TBD_96 = 0x96 MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA = 0x97 MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST = 0x98 MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE = 0x99 @@ -193,13 +194,89 @@ MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD - MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE - MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF + MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE + MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF + MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0 MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1 MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2 - + MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3 + MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4 + MSG_ID_TD_UI_CONFIRMATION_REQUEST = 0xB5 + MSG_ID_UI_CONFIRMATION_RESULT_RESPONSE = 0xB6 + MSG_ID_TD_POWER_OFF_REQUEST = 0xB7 + MSG_ID_UI_VITALS_ADJUSTMENT_REQUEST = 0xB8 + MSG_ID_TD_VITALS_ADJUSTMENT_RESPONSE = 0xB9 + MSG_ID_UI_DD_NVM_GET_RECORD_REQUEST = 0xBA + MSG_ID_DD_NVM_SYSTEM_RECORD_RESPONSE = 0xBB + MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST = 0xBC + MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD + MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST = 0xBE + MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF + MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST = 0xC0 + MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1 + MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST = 0xC2 + MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3 + MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST = 0xC4 + MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5 + MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST = 0xC6 + MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7 + MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST = 0xC8 + MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9 + MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST = 0xCA + MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB + MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST = 0xCC + MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD + MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST = 0xCE + MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF + MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST = 0xD0 + MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1 + MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST = 0xD2 + MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3 + MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_REQUEST = 0xD4 + MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5 + MSG_ID_UI_SETUP_CONNECTION_CONFIRM_REQUEST = 0xD6 + MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE = 0xD7 + MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8 + MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9 + MSG_ID_TD_UI_CANCEL_REQUEST = 0xDA + MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC + MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD + MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE + MSG_ID_DD_NVM_GET_RECORD_RESPONSE = 0xDF + MSG_ID_DD_NVM_SET_SYSTEM_RECORD_RESPONSE = 0xE0 + MSG_ID_DD_NVM_SET_SERVICE_RECORD_RESPONSE = 0xE1 + MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD_RESPONSE = 0xE2 + MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD_RESPONSE = 0xE3 + MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR_RESPONSE = 0xE4 + MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR_RESPONSE = 0xE5 + MSG_ID_DD_NVM_SET_CAL_CONC_PUMP_RESPONSE = 0xE6 + MSG_ID_DD_NVM_SET_CAL_D12_PUMP_RESPONSE = 0xE7 + MSG_ID_DD_NVM_SET_CAL_D48_PUMP_RESPONSE = 0xE8 + MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE_RESPONSE = 0xE9 + MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE_RESPONSE = 0xEA + MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR_RESPONSE = 0xEB + MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xEC + TBD_ED = 0xED + TBD_EE = 0xEE + TBD_EF = 0xEF MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 + + + MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST = 0x100 + MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE = 0x101 + MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD = 0x102 + MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE = 0x103 + MSG_ID_UI_TD_NVM_SET_SERVICE_RECORD = 0x104 + MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0x105 + MSG_ID_UI_TD_NVM_SET_INSTITUTIONAL_RECORD = 0x106 + MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE = 0x107 + MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0x108 + MSG_ID_TD_NVM_CAL_RESPONSE = 0x109 + MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0x10A + MSG_ID_TD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0x10B + MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 MSG_ID_TD_SEND_TEST_CONFIGURATION = 0x8002 @@ -283,6 +360,8 @@ MSG_ID_TD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE_REQUEST = 0x8058 MSG_ID_TD_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE_REQUEST = 0x8059 MSG_ID_TD_SYRINGE_PUMP_FORCE_SENSOR_CALIBRATION_REQUEST = 0x8060 + MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061 + MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062 MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 @@ -377,10 +456,32 @@ MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST = 0xA059 MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST = 0xA05A MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST = 0xA05B + MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA05C + MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA05D + MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xA05E + MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xA05F + MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA060 + MSG_ID_DD_BICARB_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA061 + MSG_ID_DD_ACID_MIX_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST = 0xA062 + MSG_ID_DD_ACID_MIX_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST = 0xA063 + MSG_ID_DD_ACID_MIX_VOL_OVERRIDE_REQUEST = 0xA064 + MSG_ID_DD_BICARB_MIX_VOL_OVERRIDE_REQUEST = 0xA065 + MSG_ID_DD_BICARB_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA066 + MSG_ID_DD_BICARB_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA067 + MSG_ID_DD_DIALYSATE_TARGET_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA068 + MSG_ID_DD_DIALYSATE_DELTA_CONDUCTIVITY_OVERRIDE_REQUEST = 0xA069 + MSG_ID_DD_BICART_UPPER_PRESSURE_OVERRIDE_REQUEST = 0xA06A + MSG_ID_DD_BICART_LOWER_PRESSURE_OVERRIDE_REQUEST = 0xA06B + MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C + MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D + MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E + MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F + MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xA070 + MSG_ID_DD_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xA071 + MSG_ID_DD_MIXING_CONTROL_DATA = 0xA072 + MSG_ID_DD_MIXING_CONTROL_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA073 + MSG_ID_DD_BICART_DEPRESSURISE_REQUEST_OVERRIDE_REQUEST = 0xA074 - MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100 - MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101 - # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST = 0xAF04 @@ -455,13 +556,16 @@ MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB043 MSG_ID_FP_DEF_STATUS_REQUEST = 0xB044 MSG_ID_FP_DEF_STATUS_RESPONSE = 0xB045 - MSG_ID_FP_SET_OP_SUB_MODE_REQUEST = 0xB046 - + MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST = 0xB046 + MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB047 + MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST = 0xB048 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST = 0xB049 MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_RESPONSE = 0xB04A + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST = 0xB04B + MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_RESPONSE = 0xB04C + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_REQUEST = 0xB04D + MSG_ID_FP_CONDUCTIVITY_SENSOR_CAL_RESPONSE = 0xB04E - MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xB100 - MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 MSG_ID_FP_DEBUG_EVENT = 0xFFF3