Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -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 @@ -119,8 +119,8 @@ MSG_ID_TD_SOLUTION_INFUSION_RESPONSE = 0x60 MSG_ID_DD_BLOOD_LEAK_DATA = 0x61 MSG_ID_DD_FP_INLET_PRESSURE_CHECK_DATA = 0x62 - MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63 - MSG_ID_TD_BLOOD_PRESSURE_RESPONSE = 0x64 + MSG_ID_UI_BLOOD_PRESSURE_REQUEST = 0x63 + MSG_ID_TD_BLOOD_PRESSURE_RESPONSE = 0x64 MSG_ID_TD_BLOOD_PRESSURE_DATA = 0x65 MSG_ID_USER_CONFIRM_UF_SETTINGS_CHANGE_REQUEST = 0x66 MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x67 @@ -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 @@ -202,36 +203,36 @@ 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 + AVAILABLE_MSG_ID_B7 = 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 = 0xBC + MSG_ID_UI_DD_NVM_SET_SYSTEM_RECORD_REQUEST = 0xBC MSG_ID_DD_NVM_SERVICE_RECORD_RESPONSE = 0xBD - MSG_ID_DD_NVM_SET_SERVICE_RECORD = 0xBE + MSG_ID_UI_DD_NVM_SET_SERVICE_RECORD_REQUEST = 0xBE MSG_ID_DD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xBF - MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD = 0xC0 + MSG_ID_UI_DD_NVM_SET_INSTITUTIONAL_RECORD_REQUEST = 0xC0 MSG_ID_DD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xC1 - MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD = 0xC2 + MSG_ID_UI_DD_NVM_SET_USAGE_INFO_RECORD_REQUEST = 0xC2 MSG_ID_DD_NVM_CAL_PRESSURE_SENSOR_RESPONSE = 0xC3 - MSG_ID_DD_NVM_SET_CAL_PRESSURE_SENSOR = 0xC4 + MSG_ID_UI_DD_NVM_SET_CAL_PRESSURE_SENSOR_REQUEST = 0xC4 MSG_ID_DD_NVM_CAL_TEMP_SENSOR_RESPONSE = 0xC5 - MSG_ID_DD_NVM_SET_CAL_TEMP_SENSOR = 0xC6 + MSG_ID_UI_DD_NVM_SET_CAL_TEMP_SENSOR_REQUEST = 0xC6 MSG_ID_DD_NVM_CAL_CONC_PUMP_RESPONSE = 0xC7 - MSG_ID_DD_NVM_SET_CAL_CONC_PUMP = 0xC8 + MSG_ID_UI_DD_NVM_SET_CAL_CONC_PUMP_REQUEST = 0xC8 MSG_ID_DD_NVM_CAL_D12_PUMP_RESPONSE = 0xC9 - MSG_ID_DD_NVM_SET_CAL_D12_PUMP = 0xCA + MSG_ID_UI_DD_NVM_SET_CAL_D12_PUMP_REQUEST = 0xCA MSG_ID_DD_NVM_CAL_D48_PUMP_RESPONSE = 0xCB - MSG_ID_DD_NVM_SET_CAL_D48_PUMP = 0xCC + MSG_ID_UI_DD_NVM_SET_CAL_D48_PUMP_REQUEST = 0xCC MSG_ID_DD_NVM_CAL_ACID_CONCENTRATE_RESPONSE = 0xCD - MSG_ID_DD_NVM_SET_CAL_ACID_CONCENTRATE = 0xCE + MSG_ID_UI_DD_NVM_SET_CAL_ACID_CONCENTRATE_REQUEST = 0xCE MSG_ID_DD_NVM_CAL_BICARB_CONCENTRATE_RESPONSE = 0xCF - MSG_ID_DD_NVM_SET_CAL_BICARB_CONCENTRATE = 0xD0 + MSG_ID_UI_DD_NVM_SET_CAL_BICARB_CONCENTRATE_REQUEST = 0xD0 MSG_ID_DD_NVM_CAL_ACCEL_SENSOR_RESPONSE = 0xD1 - MSG_ID_DD_NVM_SET_CAL_ACCEL_SENSOR = 0xD2 + MSG_ID_UI_DD_NVM_SET_CAL_ACCEL_SENSOR_REQUEST = 0xD2 MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3 - MSG_ID_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4 + 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 @@ -240,21 +241,42 @@ MSG_ID_TD_UI_CANCEL_REQUEST = 0xDA MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC - MSG_ID_UI_TD_NVM_GET_RECORD_REQUEST = 0xDD - MSG_ID_TD_NVM_SYSTEM_RECORD_RESPONSE = 0xDE - MSG_ID_UI_TD_NVM_SET_SYSTEM_RECORD = 0xDF - MSG_ID_TD_NVM_SERVICE_RECORD_RESPONSE = 0xE0 - MSG_ID_UI_TD_NVM_SET_SERVICE_RECORD = 0xE1 - MSG_ID_TD_NVM_INSTITUTIONAL_RECORD_RESPONSE = 0xE2 - MSG_ID_UI_TD_NVM_SET_INSTITUTIONAL_RECORD = 0xE3 - MSG_ID_TD_NVM_USAGE_INFO_RECORD_RESPONSE = 0xE4 - MSG_ID_UI_TD_NVM_SET_USAGE_INFO_RECORD = 0xE5 - MSG_ID_TD_NVM_CAL_RESPONSE = 0xE6 - MSG_ID_UI_TD_NVM_SET_CAL_RECORD = 0xE7 - - + 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 @@ -338,11 +360,13 @@ 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 - TBD_8061 = 0x8061 - TBD_8061 = 0x8062 + MSG_ID_TD_GET_ALARM_PROPERTIES_REQUEST = 0x8061 + MSG_ID_TD_ALARM_PROPERTIES_RESPONSE = 0x8062 MSG_ID_BATTERY_REGISTERS_OVERRIDE_REQUEST = 0x8063 MSG_ID_TD_BATTERY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0x8064 + MSG_ID_TD_BATTERY_I2C_STATUS_OVERRIDE_REQUEST = 0x8068 + MSG_ID_TD_TRAINING_TEST_OVERRIDE_REQUEST = 0x8999 MSG_ID_DD_TESTER_LOGIN_REQUEST = 0xA000 @@ -353,7 +377,7 @@ MSG_ID_DD_VALVE_SENSED_STATE_OVERRIDE_REQUEST = 0xA005 MSG_ID_DD_PRESSURE_SENSOR_READINGS_OVERRIDE_REQUEST = 0xA006 MSG_ID_DD_PRESSURE_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xA007 - MSG_ID_DD_PRESSURE_SENSOR_READ_COUNTER_OVERRIDE_REQUEST = 0xA008 + MSG_ID_DD_TREATMENT_PARAMS_OVERRIDE_REQUEST = 0xA008 MSG_ID_DD_PRESSURE_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST = 0xA009 MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA00A MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST = 0xA00B @@ -454,10 +478,13 @@ 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_PUBLISH_INTERVAL_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 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 Index: leahi_dialin/common/td_defs.py =================================================================== diff -u -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/common/td_defs.py (.../td_defs.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) +++ leahi_dialin/common/td_defs.py (.../td_defs.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -1004,7 +1004,20 @@ 'NUM_OF_AIR_PUMP_ATTRIBUTES': [], } +class TDAirPumpStates(DialinEnum): + AIR_PUMP_STATE_INIT = 0 # Air Pump Initialize state + AIR_PUMP_STATE_OFF = 1 # Air Pump Off state + AIR_PUMP_STATE_ON = 2 # Air Pump On state + NUM_OF_AIR_PUMP_STATES = 3 # Number of air pump states +TDAirPumpStates._str_list = { + 'AIR_PUMP_STATE_INIT': ['init'], + 'AIR_PUMP_STATE_OFF': ['off'], + 'AIR_PUMP_STATE_ON': ['on'], + 'NUM_OF_AIR_PUMP_STATES ': [] +} + + @unique class TDAirTrapLevelSensorAttributes(DialinEnum): LEVEL = 0 # Level attribute for Air Trap Level Sensor @@ -1165,47 +1178,37 @@ @unique class TDValvePositions(DialinEnum): - VALVE_POSITION_NOT_IN_POSITION = 0 # Valve not in Position - VALVE_POSITION_A_INSERT_LOAD = 1 # Insert/Eject Valve Position - VALVE_POSITION_B_OPEN_BLOOD = 2 # Open Valve Position - VALVE_POSITION_C_CLOSE_SALINE = 3 # Closed Valve Position - VALVE_POSITION_C_PARTIAL_CLOSE = 4 # Partial Close Valve Position - NUM_OF_VALVE_POSITIONS = 5 # Partial Close Valve Position + NOT_IN_POSITION = 0 # Valve not in Position + A_INSERT_INSERT_EJECT = 1 # Insert/Eject Valve Position + B_OPEN_BLOOD = 2 # Open Valve Position + C_CLOSE = 3 # Closed Valve Position + NUM_OF_VALVE_POSITIONS = 4 # Number of valve positions TDValvePositions._str_list = { # Official Name : Accepted strings - 'VALVE_POSITION_NOT_IN_POSITION': ['not in position'], - 'VALVE_POSITION_A_INSERT_LOAD': ['a', 'insert/eject', 'insert', 'eject', 'load'], - 'VALVE_POSITION_B_OPEN_BLOOD': ['b', 'open', 'blood'], - 'VALVE_POSITION_C_CLOSE_SALINE': ['c', 'close', 'closed', 'saline'], - 'VALVE_POSITION_C_PARTIAL_CLOSE': [], + 'NOT_IN_POSITION': ['not in position'], + 'A_INSERT_INSERT_EJECT': ['a', 'insert/eject', 'insert', 'eject', 'load'], + 'B_OPEN_BLOOD': ['b', 'open', 'blood'], + 'C_CLOSE': ['c', 'close', 'closed', 'saline'], 'NUM_OF_VALVE_POSITIONS': [], } @unique class TDValveStates(DialinEnum): - VALVE_STATE_WAIT_FOR_POST = 0 # Waiting for POST Valve State - VALVE_STATE_RESET_VALVE = 1 # Valve state reset valve. - VALVE_STATE_RESET_ENCODER = 2 # Valve state reset encoder. - VALVE_STATE_ENABLE_VALVE = 3 # Valve state enable valve. - VALVE_STATE_HOMING_NOT_STARTED = 4 # Valve state homing not started. - VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE = 5 # Valve state homing find energized edge. - VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE = 6 # Valve state homing find. - VALVE_STATE_IDLE = 7 # Idle Valve State. - VALVE_STATE_IN_TRANSITION = 8 # Valve state in transition. + WAIT_FOR_POST = 0 # Waiting for POST Valve State + HOMING_NOT_HOMED = 1 # Valve state homing not homed. + IDLE = 2 # Idle Valve State. + IN_TRANSITION = 3 # Valve state in transition. + NUM_OF_VALVE_STATES = 4 # Number of valve states. TDValveStates._str_list = { # Official Name : Accepted strings - 'VALVE_STATE_WAIT_FOR_POST': ['wait', 'wait for post'], - 'VALVE_STATE_RESET_VALVE': ['reset valve'], - 'VALVE_STATE_RESET_ENCODER': ['reset encoder'], - 'VALVE_STATE_ENABLE_VALVE': ['enable', 'enable valve'], - 'VALVE_STATE_HOMING_NOT_STARTED': ['homing not started', 'not started'], - 'VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE': ['homing find energized edge'], - 'VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE': ['homing find deenergized edge'], - 'VALVE_STATE_IDLE': ['idle'], - 'VALVE_STATE_IN_TRANSITION': [], + 'WAIT_FOR_POST': ['wait', 'wait for post'], + 'HOMING_NOT_HOMED': ['homing not started', 'not started'], + 'IDLE': ['idle'], + 'IN_TRANSITION': [], + 'NUM_OF_VALVE_STATES': [], } Index: leahi_dialin/common/td_defs_proxy.py =================================================================== diff -u -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) +++ leahi_dialin/common/td_defs_proxy.py (.../td_defs_proxy.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -80,6 +80,7 @@ # Sensor Attributes TDAirPumpAttributes = td_defs.TDAirPumpAttributes + TDAirPumpStates = td_defs.TDAirPumpStates TDAirTrapLevelSensorAttributes = td_defs.TDAirTrapLevelSensorAttributes TDAirTrapState = td_defs.TDAirTrapState TDBloodFlowMotorAttributes = td_defs.TDBloodFlowMotorAttributes @@ -96,4 +97,21 @@ TDTreatmentModalityTypes = td_defs.TDTreatmentModalityTypes TDTreatmentHDFDilution = td_defs.TDTreatmentHDFDilution + # Alarms + AlarmProperties = generic_defs.AlarmProperties + + # Records + RecordTypes = generic_defs.RecordTypes + SystemRecordFields = generic_defs.SystemRecordFields + ServiceRecordFields = generic_defs.ServiceRecordFields + CalibrationRecordFields = generic_defs.get_calibration_record_fields() + InstitutionalRecordFields = generic_defs.InstitutionalRecordFields + UsageInformationRecordFields = generic_defs.UsageInformationRecordFields + + # Record support + CalibRecordAccelerometerFields = generic_defs.CalibRecordAccelerometerFields + CalibRecordBloodLeakFields = generic_defs.CalibRecordBloodLeakFields + CalibRecordConcentrateFields = generic_defs.CalibRecordConcentrateFields + CalibRecordSensorFields = generic_defs.CalibRecordSensorFields + td_enum_repository = TD_Defs() Index: leahi_dialin/td/modules/air_pump.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/air_pump.py (.../air_pump.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -32,8 +32,6 @@ class TDAirPump(AbstractSubSystem): """ - TDAirPump - Treatment Delivery (TD) Dialin API sub-class for air pump related commands. """ Index: leahi_dialin/td/modules/air_trap.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/air_trap.py (.../air_trap.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -31,8 +31,6 @@ class TDAirTrap(AbstractSubSystem): """ - TDAirTrap - Treatment Delivery (TD) Dialin API sub-class for air trap related commands. """ Index: leahi_dialin/td/modules/bubble_detector.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/bubble_detector.py (.../bubble_detector.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -32,8 +32,6 @@ class TDBubbleDetector(AbstractSubSystem): """ - TDBubbleDetector - Treatment Delivery (TD) Dialin API sub-class for air bubbles related commands. ADA: Air bubble Detector Arterial ADV: Air bubble Detector Venous Index: leahi_dialin/td/modules/ejector.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/ejector.py (.../ejector.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -32,8 +32,6 @@ class TDEjector(AbstractSubSystem): """ - TDEjector - Treatment Delivery (TD) Dialin API sub-class for ejector motor related commands. """ Index: leahi_dialin/td/modules/switches.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/switches.py (.../switches.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/switches.py (.../switches.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -32,7 +32,7 @@ class TDSwitches(AbstractSubSystem): """ - @brief Treatment Device (TD) Dialin API sub-class for TD switches related commands. + Treatment Device (TD) Dialin API sub-class for TD switches related commands. """ def __init__(self, can_interface: CanMessenger, logger: Logger): Index: leahi_dialin/td/modules/syringe_pump.py =================================================================== diff -u -r5c1132f5aadff6082afa56588ad1f4a64f828cd9 -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision 5c1132f5aadff6082afa56588ad1f4a64f828cd9) +++ leahi_dialin/td/modules/syringe_pump.py (.../syringe_pump.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -29,8 +29,6 @@ class TDSyringePump(AbstractSubSystem): """ - TDSyringePump - Treatment Delivery (TD) Dialin API sub-class for syringe pump related commands. """ Index: leahi_dialin/td/treatment_delivery.py =================================================================== diff -u -r12f6d9b3476d413d861dc9589635ec05bf8e6f9d -rdff2704b529bfbb67b2e8c822e69e3df7d955153 --- leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision 12f6d9b3476d413d861dc9589635ec05bf8e6f9d) +++ leahi_dialin/td/treatment_delivery.py (.../treatment_delivery.py) (revision dff2704b529bfbb67b2e8c822e69e3df7d955153) @@ -24,11 +24,13 @@ from .modules.alarms import TDAlarms from .modules.battery import TDBattery from .modules.blood_flow import TDBloodFlow +from .modules.blood_pressure import TDBloodPressure from .modules.bubble_detector import TDBubbleDetector from .modules.buttons import TDButtons from .modules.ejector import TDEjector from .modules.events import TDEvents from .modules.pressure_sensors import TDPressureSensors +from .modules.records import TDRecords from .modules.switches import TDSwitches from .modules.syringe_pump import TDSyringePump from .modules.temperature_sensors import TDTemperatureSensors @@ -41,7 +43,8 @@ from .proxies.ui_proxy import UIProxy from ..common.constants import NO_RESET -from ..common.msg_defs import MsgIds, MsgFieldPositions +from ..common.msg_defs import MsgFieldPositions +from ..common.msg_ids import MsgIds from ..common import td_enum_repository from ..common.generic_defs import DataTypes from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override @@ -131,11 +134,13 @@ self.alarms = TDAlarms(self.can_interface, self.logger) #: The Alarms module self.battery = TDBattery(self.can_interface, self.logger) #: The Battery module self.blood_flow = TDBloodFlow(self.can_interface, self.logger) #: The Blood Flow module + self.blood_pressure = TDBloodPressure(self.can_interface, self.logger) #: The Blood Pressure module self.bubbles = TDBubbleDetector(self.can_interface, self.logger) #: The Bubble Detector module self.buttons = TDButtons(self.can_interface, self.logger) #: The Buttons module self.ejector = TDEjector(self.can_interface, self.logger) #: The Ejector module self.events = TDEvents(self.can_interface, self.logger) #: The Events module self.pressure_sensors = TDPressureSensors(self.can_interface, self.logger) #: The Pressure Sensors module + self.records = TDRecords(self.can_interface, self.logger) #: The Records module self.switches = TDSwitches(self.can_interface, self.logger) #: The Switches module self.syringe_pump = TDSyringePump(self.can_interface, self.logger) #: The Syringe Pump module self.temperature_sensors = TDTemperatureSensors(self.can_interface, self.logger) #: The Temperature Sensors module