mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-05 05:45:10 +00:00
修复静态方法识别get status，注册表支持python类型
This commit is contained in:
Xuwznln
@@ -22,32 +22,6 @@ hplc.agilent:
|
|||||||
title: check_status 命令参数
|
title: check_status 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-execute_command_from_outer:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default:
|
|
||||||
command: null
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand execute_command_from_outer 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand execute_command_from_outer 的参数schema
|
|
||||||
properties:
|
|
||||||
command:
|
|
||||||
description: '参数: command'
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- command
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: execute_command_from_outer 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-extract_data_from_txt:
|
auto-extract_data_from_txt:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -74,35 +48,6 @@ hplc.agilent:
|
|||||||
title: extract_data_from_txt 命令参数
|
title: extract_data_from_txt 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_data_file:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default:
|
|
||||||
after_time: null
|
|
||||||
mat_index: null
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_data_file 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_data_file 的参数schema
|
|
||||||
properties:
|
|
||||||
after_time:
|
|
||||||
description: '参数: after_time'
|
|
||||||
type: string
|
|
||||||
mat_index:
|
|
||||||
description: '参数: mat_index'
|
|
||||||
type: string
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_data_file 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-start_sequence:
|
auto-start_sequence:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -237,10 +182,10 @@ hplc.agilent:
|
|||||||
module: unilabos.devices.hplc.AgilentHPLC:HPLCDriver
|
module: unilabos.devices.hplc.AgilentHPLC:HPLCDriver
|
||||||
status_types:
|
status_types:
|
||||||
could_run: bool
|
could_run: bool
|
||||||
|
data_file: tuple
|
||||||
device_status: str
|
device_status: str
|
||||||
driver_init_ok: bool
|
driver_init_ok: bool
|
||||||
finish_status: str
|
finish_status: str
|
||||||
get_data_file: tuple
|
|
||||||
is_running: bool
|
is_running: bool
|
||||||
status_text: str
|
status_text: str
|
||||||
success: bool
|
success: bool
|
||||||
@@ -467,8 +412,7 @@ raman_home_made:
|
|||||||
type: object
|
type: object
|
||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.raman_uv.home_made_raman:RamanObj
|
module: unilabos.devices.raman_uv.home_made_raman:RamanObj
|
||||||
status_types:
|
status_types: {}
|
||||||
status: String
|
|
||||||
type: python
|
type: python
|
||||||
description: Raman spectroscopy device
|
description: Raman spectroscopy device
|
||||||
handles: []
|
handles: []
|
||||||
|
|||||||
@@ -1,30 +1,9 @@
|
|||||||
hotel.thermo_orbitor_rs2_hotel:
|
hotel.thermo_orbitor_rs2_hotel:
|
||||||
class:
|
class:
|
||||||
action_value_mappings:
|
action_value_mappings: {}
|
||||||
auto-get_rotation:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_rotation 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_rotation 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_rotation 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
module: unilabos.devices.resource_container.container:HotelContainer
|
module: unilabos.devices.resource_container.container:HotelContainer
|
||||||
status_types:
|
status_types:
|
||||||
get_rotation: String
|
rotation: String
|
||||||
type: python
|
type: python
|
||||||
description: Thermo Orbitor RS2 Hotel
|
description: Thermo Orbitor RS2 Hotel
|
||||||
handles: []
|
handles: []
|
||||||
|
|||||||
@@ -4831,8 +4831,7 @@ liquid_handler:
|
|||||||
type: object
|
type: object
|
||||||
type: LiquidHandlerTransfer
|
type: LiquidHandlerTransfer
|
||||||
module: unilabos.devices.liquid_handling.liquid_handler_abstract:LiquidHandlerAbstract
|
module: unilabos.devices.liquid_handling.liquid_handler_abstract:LiquidHandlerAbstract
|
||||||
status_types:
|
status_types: {}
|
||||||
name: String
|
|
||||||
type: python
|
type: python
|
||||||
description: Liquid handler device controlled by pylabrobot
|
description: Liquid handler device controlled by pylabrobot
|
||||||
handles:
|
handles:
|
||||||
|
|||||||
@@ -22,27 +22,6 @@ mock_chiller:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-heat_chill_start:
|
auto-heat_chill_start:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -250,11 +229,11 @@ mock_chiller:
|
|||||||
module: unilabos.devices.mock.mock_chiller:MockChiller
|
module: unilabos.devices.mock.mock_chiller:MockChiller
|
||||||
status_types:
|
status_types:
|
||||||
current_temperature: float
|
current_temperature: float
|
||||||
get_status_info: dict
|
|
||||||
is_cooling: bool
|
is_cooling: bool
|
||||||
is_heating: bool
|
is_heating: bool
|
||||||
purpose: str
|
purpose: str
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
target_temperature: float
|
target_temperature: float
|
||||||
vessel: str
|
vessel: str
|
||||||
type: python
|
type: python
|
||||||
@@ -359,27 +338,6 @@ mock_filter:
|
|||||||
title: filter 命令参数
|
title: filter 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-replace_filter:
|
auto-replace_filter:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -595,11 +553,11 @@ mock_filter:
|
|||||||
filtered_volume: float
|
filtered_volume: float
|
||||||
filtrate_vessel: str
|
filtrate_vessel: str
|
||||||
flow_rate: float
|
flow_rate: float
|
||||||
get_status_info: dict
|
|
||||||
is_filtering: bool
|
is_filtering: bool
|
||||||
pressure_drop: float
|
pressure_drop: float
|
||||||
progress: float
|
progress: float
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
stir: bool
|
stir: bool
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
target_volume: float
|
target_volume: float
|
||||||
@@ -651,27 +609,6 @@ mock_heater:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-heat_chill:
|
auto-heat_chill:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -1055,12 +992,12 @@ mock_heater:
|
|||||||
module: unilabos.devices.mock.mock_heater:MockHeater
|
module: unilabos.devices.mock.mock_heater:MockHeater
|
||||||
status_types:
|
status_types:
|
||||||
current_temperature: float
|
current_temperature: float
|
||||||
get_status_info: dict
|
|
||||||
heating_power: float
|
heating_power: float
|
||||||
is_heating: bool
|
is_heating: bool
|
||||||
max_temperature: float
|
max_temperature: float
|
||||||
purpose: str
|
purpose: str
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
stir: bool
|
stir: bool
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
target_temperature: float
|
target_temperature: float
|
||||||
@@ -1111,27 +1048,6 @@ mock_pump:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-pause_pump:
|
auto-pause_pump:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -1513,7 +1429,6 @@ mock_pump:
|
|||||||
current_device: str
|
current_device: str
|
||||||
flow_rate: float
|
flow_rate: float
|
||||||
from_vessel: str
|
from_vessel: str
|
||||||
get_status_info: dict
|
|
||||||
is_solid: bool
|
is_solid: bool
|
||||||
is_viscous: bool
|
is_viscous: bool
|
||||||
max_flow_rate: float
|
max_flow_rate: float
|
||||||
@@ -1524,6 +1439,7 @@ mock_pump:
|
|||||||
rinsing_solvent: str
|
rinsing_solvent: str
|
||||||
rinsing_volume: float
|
rinsing_volume: float
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
target_flow_rate: float
|
target_flow_rate: float
|
||||||
time_remaining: float
|
time_remaining: float
|
||||||
time_spent: float
|
time_spent: float
|
||||||
@@ -1577,27 +1493,6 @@ mock_rotavap:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-set_pump_time:
|
auto-set_pump_time:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -2085,14 +1980,13 @@ mock_rotavap:
|
|||||||
type: EmptyIn
|
type: EmptyIn
|
||||||
module: unilabos.devices.mock.mock_rotavap:MockRotavap
|
module: unilabos.devices.mock.mock_rotavap:MockRotavap
|
||||||
status_types:
|
status_types:
|
||||||
get_status_info: dict
|
|
||||||
pump_state: str
|
pump_state: str
|
||||||
pump_time: float
|
pump_time: float
|
||||||
rotate_speed: float
|
rotate_speed: float
|
||||||
rotate_state: str
|
rotate_state: str
|
||||||
rotate_time: float
|
rotate_time: float
|
||||||
status: str
|
status: str
|
||||||
success: String
|
status_info: dict
|
||||||
target_temperature: float
|
target_temperature: float
|
||||||
temperature: float
|
temperature: float
|
||||||
vacuum_level: float
|
vacuum_level: float
|
||||||
@@ -2121,27 +2015,6 @@ mock_rotavap:
|
|||||||
mock_separator:
|
mock_separator:
|
||||||
class:
|
class:
|
||||||
action_value_mappings:
|
action_value_mappings:
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-separate:
|
auto-separate:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -2578,7 +2451,6 @@ mock_separator:
|
|||||||
status_types:
|
status_types:
|
||||||
current_device: str
|
current_device: str
|
||||||
from_vessel: str
|
from_vessel: str
|
||||||
get_status_info: dict
|
|
||||||
product_phase: str
|
product_phase: str
|
||||||
purpose: str
|
purpose: str
|
||||||
repeats: int
|
repeats: int
|
||||||
@@ -2589,6 +2461,7 @@ mock_separator:
|
|||||||
solvent: str
|
solvent: str
|
||||||
solvent_volume: float
|
solvent_volume: float
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
stir_time: float
|
stir_time: float
|
||||||
through: str
|
through: str
|
||||||
@@ -2643,27 +2516,6 @@ mock_solenoid_valve:
|
|||||||
title: close_valve 命令参数
|
title: close_valve 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_valve_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_closed:
|
auto-is_closed:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -2871,7 +2723,6 @@ mock_solenoid_valve:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.mock.mock_solenoid_valve:MockSolenoidValve
|
module: unilabos.devices.mock.mock_solenoid_valve:MockSolenoidValve
|
||||||
status_types:
|
status_types:
|
||||||
get_valve_status: str
|
|
||||||
status: str
|
status: str
|
||||||
valve_status: str
|
valve_status: str
|
||||||
type: python
|
type: python
|
||||||
@@ -2920,27 +2771,6 @@ mock_stirrer:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-heating_control:
|
auto-heating_control:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -3288,12 +3118,12 @@ mock_stirrer:
|
|||||||
type: EmptyIn
|
type: EmptyIn
|
||||||
module: unilabos.devices.mock.mock_stirrer:MockStirrer
|
module: unilabos.devices.mock.mock_stirrer:MockStirrer
|
||||||
status_types:
|
status_types:
|
||||||
get_status_info: dict
|
|
||||||
heating_power: float
|
heating_power: float
|
||||||
heating_state: str
|
heating_state: str
|
||||||
max_stir_speed: float
|
max_stir_speed: float
|
||||||
max_temperature: float
|
max_temperature: float
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
stir_state: str
|
stir_state: str
|
||||||
target_stir_speed: float
|
target_stir_speed: float
|
||||||
@@ -3324,27 +3154,6 @@ mock_stirrer:
|
|||||||
mock_stirrer_new:
|
mock_stirrer_new:
|
||||||
class:
|
class:
|
||||||
action_value_mappings:
|
action_value_mappings:
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-start_stir:
|
auto-start_stir:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -3629,12 +3438,12 @@ mock_stirrer_new:
|
|||||||
type: StopStir
|
type: StopStir
|
||||||
module: unilabos.devices.mock.mock_stirrer_new:MockStirrer_new
|
module: unilabos.devices.mock.mock_stirrer_new:MockStirrer_new
|
||||||
status_types:
|
status_types:
|
||||||
get_status_info: dict
|
|
||||||
max_stir_speed: float
|
max_stir_speed: float
|
||||||
progress: float
|
progress: float
|
||||||
purpose: str
|
purpose: str
|
||||||
settling_time: float
|
settling_time: float
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
stir_state: str
|
stir_state: str
|
||||||
stir_time: float
|
stir_time: float
|
||||||
@@ -3686,27 +3495,6 @@ mock_vacuum:
|
|||||||
title: emergency_stop 命令参数
|
title: emergency_stop 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-pause_vacuum:
|
auto-pause_vacuum:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -4134,13 +3922,13 @@ mock_vacuum:
|
|||||||
type: EmptyIn
|
type: EmptyIn
|
||||||
module: unilabos.devices.mock.mock_vacuum:MockVacuum
|
module: unilabos.devices.mock.mock_vacuum:MockVacuum
|
||||||
status_types:
|
status_types:
|
||||||
get_status_info: dict
|
|
||||||
max_pump_speed: float
|
max_pump_speed: float
|
||||||
power_state: str
|
power_state: str
|
||||||
pump_efficiency: float
|
pump_efficiency: float
|
||||||
pump_speed: float
|
pump_speed: float
|
||||||
pump_state: str
|
pump_state: str
|
||||||
status: str
|
status: str
|
||||||
|
status_info: dict
|
||||||
target_vacuum: float
|
target_vacuum: float
|
||||||
vacuum_level: float
|
vacuum_level: float
|
||||||
type: python
|
type: python
|
||||||
|
|||||||
@@ -174,9 +174,7 @@ rotavap.one:
|
|||||||
type: object
|
type: object
|
||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.rotavap.rotavap_one:RotavapOne
|
module: unilabos.devices.rotavap.rotavap_one:RotavapOne
|
||||||
status_types:
|
status_types: {}
|
||||||
pump_time: Float64
|
|
||||||
rotate_time: Float64
|
|
||||||
type: python
|
type: python
|
||||||
description: Rotavap device
|
description: Rotavap device
|
||||||
handles: []
|
handles: []
|
||||||
@@ -453,9 +451,7 @@ separator.homemade:
|
|||||||
type: object
|
type: object
|
||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.separator.homemade_grbl_conductivity:SeparatorController
|
module: unilabos.devices.separator.homemade_grbl_conductivity:SeparatorController
|
||||||
status_types:
|
status_types: {}
|
||||||
sensordata: Float64
|
|
||||||
status: String
|
|
||||||
type: python
|
type: python
|
||||||
description: Separator device with homemade grbl controller
|
description: Separator device with homemade grbl controller
|
||||||
handles: []
|
handles: []
|
||||||
|
|||||||
@@ -22,27 +22,6 @@ solenoid_valve:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_valve_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_closed:
|
auto-is_closed:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -224,7 +203,6 @@ solenoid_valve:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.pump_and_valve.solenoid_valve:SolenoidValve
|
module: unilabos.devices.pump_and_valve.solenoid_valve:SolenoidValve
|
||||||
status_types:
|
status_types:
|
||||||
get_valve_position: str
|
|
||||||
status: str
|
status: str
|
||||||
valve_position: str
|
valve_position: str
|
||||||
type: python
|
type: python
|
||||||
@@ -273,27 +251,6 @@ solenoid_valve.mock:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_valve_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_closed:
|
auto-is_closed:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -455,7 +412,6 @@ solenoid_valve.mock:
|
|||||||
type: EmptyIn
|
type: EmptyIn
|
||||||
module: unilabos.devices.pump_and_valve.solenoid_valve_mock:SolenoidValveMock
|
module: unilabos.devices.pump_and_valve.solenoid_valve_mock:SolenoidValveMock
|
||||||
status_types:
|
status_types:
|
||||||
get_valve_position: str
|
|
||||||
status: str
|
status: str
|
||||||
valve_position: str
|
valve_position: str
|
||||||
type: python
|
type: python
|
||||||
@@ -514,174 +470,6 @@ syringe_pump_with_valve.runze:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_max_velocity:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_max_velocity 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_max_velocity 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_max_velocity 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_plunger_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_plunger_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_plunger_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_plunger_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_valve_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_velocity_end:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_velocity_end 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_velocity_end 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_velocity_end 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_velocity_grade:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_velocity_grade 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_velocity_grade 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_velocity_grade 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_velocity_init:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_velocity_init 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_velocity_init 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_velocity_init 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-initialize:
|
auto-initialize:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -703,27 +491,6 @@ syringe_pump_with_valve.runze:
|
|||||||
title: initialize 命令参数
|
title: initialize 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-list:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand list 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand list 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: list 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-pull_plunger:
|
auto-pull_plunger:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -1089,19 +856,15 @@ syringe_pump_with_valve.runze:
|
|||||||
write: send_command
|
write: send_command
|
||||||
module: unilabos.devices.pump_and_valve.runze_backbone:RunzeSyringePump
|
module: unilabos.devices.pump_and_valve.runze_backbone:RunzeSyringePump
|
||||||
status_types:
|
status_types:
|
||||||
get_max_velocity: String
|
|
||||||
get_plunger_position: String
|
|
||||||
get_position: String
|
|
||||||
get_status: String
|
|
||||||
get_valve_position: str
|
|
||||||
get_velocity_end: String
|
|
||||||
get_velocity_grade: String
|
|
||||||
get_velocity_init: String
|
|
||||||
max_velocity: float
|
max_velocity: float
|
||||||
mode: int
|
mode: int
|
||||||
|
plunger_position: String
|
||||||
position: float
|
position: float
|
||||||
status: str
|
status: str
|
||||||
valve_position: str
|
valve_position: str
|
||||||
|
velocity_end: String
|
||||||
|
velocity_grade: String
|
||||||
|
velocity_init: String
|
||||||
type: python
|
type: python
|
||||||
description: Runze Syringe pump with valve
|
description: Runze Syringe pump with valve
|
||||||
handles: []
|
handles: []
|
||||||
|
|||||||
@@ -494,8 +494,6 @@ linear_motion.grbl:
|
|||||||
type: SingleJointPosition
|
type: SingleJointPosition
|
||||||
module: unilabos.devices.cnc.grbl_sync:GrblCNC
|
module: unilabos.devices.cnc.grbl_sync:GrblCNC
|
||||||
status_types:
|
status_types:
|
||||||
get_position: String
|
|
||||||
get_status: String
|
|
||||||
position: unilabos.messages:Point3D
|
position: unilabos.messages:Point3D
|
||||||
spindle_speed: float
|
spindle_speed: float
|
||||||
status: str
|
status: str
|
||||||
|
|||||||
@@ -245,48 +245,6 @@ heaterstirrer.dalong:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_temp:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_temp 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_temp 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_temp 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-heatchill:
|
auto-heatchill:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -614,8 +572,6 @@ heaterstirrer.dalong:
|
|||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.heaterstirrer.dalong:HeaterStirrer_DaLong
|
module: unilabos.devices.heaterstirrer.dalong:HeaterStirrer_DaLong
|
||||||
status_types:
|
status_types:
|
||||||
get_status: str
|
|
||||||
get_temp: String
|
|
||||||
status: str
|
status: str
|
||||||
stir_speed: float
|
stir_speed: float
|
||||||
temp: float
|
temp: float
|
||||||
@@ -849,7 +805,6 @@ tempsensor:
|
|||||||
module: unilabos.devices.temperature.sensor_node:TempSensorNode
|
module: unilabos.devices.temperature.sensor_node:TempSensorNode
|
||||||
status_types:
|
status_types:
|
||||||
value: float
|
value: float
|
||||||
warning: Float64
|
|
||||||
type: python
|
type: python
|
||||||
description: Temperature sensor
|
description: Temperature sensor
|
||||||
handles: []
|
handles: []
|
||||||
|
|||||||
@@ -22,27 +22,6 @@ gas_source.mock:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_closed:
|
auto-is_closed:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -247,7 +226,6 @@ gas_source.mock:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.pump_and_valve.vacuum_pump_mock:VacuumPumpMock
|
module: unilabos.devices.pump_and_valve.vacuum_pump_mock:VacuumPumpMock
|
||||||
status_types:
|
status_types:
|
||||||
get_status: str
|
|
||||||
status: str
|
status: str
|
||||||
type: python
|
type: python
|
||||||
description: Mock gas source
|
description: Mock gas source
|
||||||
@@ -301,27 +279,6 @@ vacuum_pump.mock:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_closed:
|
auto-is_closed:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -526,7 +483,6 @@ vacuum_pump.mock:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.pump_and_valve.vacuum_pump_mock:VacuumPumpMock
|
module: unilabos.devices.pump_and_valve.vacuum_pump_mock:VacuumPumpMock
|
||||||
status_types:
|
status_types:
|
||||||
get_status: str
|
|
||||||
status: str
|
status: str
|
||||||
type: python
|
type: python
|
||||||
description: Mock vacuum pump
|
description: Mock vacuum pump
|
||||||
|
|||||||
@@ -721,27 +721,6 @@ virtual_gas_source:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-initialize:
|
auto-initialize:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -967,7 +946,6 @@ virtual_gas_source:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.virtual.virtual_gas_source:VirtualGasSource
|
module: unilabos.devices.virtual.virtual_gas_source:VirtualGasSource
|
||||||
status_types:
|
status_types:
|
||||||
get_status: str
|
|
||||||
status: str
|
status: str
|
||||||
type: python
|
type: python
|
||||||
description: Virtual gas source
|
description: Virtual gas source
|
||||||
@@ -1409,153 +1387,6 @@ virtual_multiway_valve:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_available_ports:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_available_ports 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_available_ports 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_available_ports 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_available_positions:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_available_positions 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_available_positions 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_available_positions 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_current_port:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_current_port 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_current_port 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_current_port 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_current_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_current_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_current_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_current_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_flow_path:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_flow_path 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_flow_path 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_flow_path 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_valve_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-is_at_port:
|
auto-is_at_port:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -1892,17 +1723,15 @@ virtual_multiway_valve:
|
|||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.virtual.virtual_multiway_valve:VirtualMultiwayValve
|
module: unilabos.devices.virtual.virtual_multiway_valve:VirtualMultiwayValve
|
||||||
status_types:
|
status_types:
|
||||||
|
available_ports: dict
|
||||||
|
available_positions: list
|
||||||
|
current_port: str
|
||||||
current_position: int
|
current_position: int
|
||||||
get_available_ports: dict
|
flow_path: str
|
||||||
get_available_positions: list
|
info: dict
|
||||||
get_current_port: str
|
|
||||||
get_current_position: int
|
|
||||||
get_flow_path: str
|
|
||||||
get_info: dict
|
|
||||||
get_valve_position: int
|
|
||||||
max_positions: Int32
|
|
||||||
status: str
|
status: str
|
||||||
target_position: int
|
target_position: int
|
||||||
|
valve_position: int
|
||||||
valve_state: str
|
valve_state: str
|
||||||
type: python
|
type: python
|
||||||
description: Virtual 8-Way Valve for flow direction control
|
description: Virtual 8-Way Valve for flow direction control
|
||||||
@@ -2345,7 +2174,6 @@ virtual_pump:
|
|||||||
current_volume: float
|
current_volume: float
|
||||||
from_vessel: str
|
from_vessel: str
|
||||||
max_volume: float
|
max_volume: float
|
||||||
position: Float64
|
|
||||||
progress: float
|
progress: float
|
||||||
status: str
|
status: str
|
||||||
to_vessel: str
|
to_vessel: str
|
||||||
@@ -3044,48 +2872,6 @@ virtual_solenoid_valve:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommandAsync
|
type: UniLabJsonCommandAsync
|
||||||
auto-get_state:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_state 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_state 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_state 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_valve_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_valve_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_valve_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-initialize:
|
auto-initialize:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -3432,10 +3218,10 @@ virtual_solenoid_valve:
|
|||||||
type: SendCmd
|
type: SendCmd
|
||||||
module: unilabos.devices.virtual.virtual_solenoid_valve:VirtualSolenoidValve
|
module: unilabos.devices.virtual.virtual_solenoid_valve:VirtualSolenoidValve
|
||||||
status_types:
|
status_types:
|
||||||
get_state: dict
|
|
||||||
get_valve_position: str
|
|
||||||
is_open: bool
|
is_open: bool
|
||||||
|
state: dict
|
||||||
status: str
|
status: str
|
||||||
|
valve_position: str
|
||||||
valve_state: str
|
valve_state: str
|
||||||
type: python
|
type: python
|
||||||
description: Virtual Solenoid Valve for simple on/off flow control
|
description: Virtual Solenoid Valve for simple on/off flow control
|
||||||
@@ -3981,111 +3767,6 @@ virtual_transfer_pump:
|
|||||||
title: fill_syringe 命令参数
|
title: fill_syringe 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommandAsync
|
type: UniLabJsonCommandAsync
|
||||||
auto-get_current_volume:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_current_volume 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_current_volume 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_current_volume 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_position:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_position 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_position 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_position 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_pump_info:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_pump_info 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_pump_info 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_pump_info 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_remaining_capacity:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_remaining_capacity 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_remaining_capacity 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_remaining_capacity 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-initialize:
|
auto-initialize:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -4495,14 +4176,10 @@ virtual_transfer_pump:
|
|||||||
module: unilabos.devices.virtual.virtual_transferpump:VirtualTransferPump
|
module: unilabos.devices.virtual.virtual_transferpump:VirtualTransferPump
|
||||||
status_types:
|
status_types:
|
||||||
current_volume: float
|
current_volume: float
|
||||||
get_current_volume: float
|
|
||||||
get_position: float
|
|
||||||
get_pump_info: dict
|
|
||||||
get_remaining_capacity: float
|
|
||||||
get_status: str
|
|
||||||
max_velocity: float
|
max_velocity: float
|
||||||
max_volume: Float64
|
|
||||||
position: float
|
position: float
|
||||||
|
pump_info: dict
|
||||||
|
remaining_capacity: float
|
||||||
status: str
|
status: str
|
||||||
transfer_rate: float
|
transfer_rate: float
|
||||||
type: python
|
type: python
|
||||||
@@ -4586,27 +4263,6 @@ virtual_vacuum_pump:
|
|||||||
title: close 命令参数
|
title: close 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_status:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_status 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_status 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-initialize:
|
auto-initialize:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -4832,7 +4488,6 @@ virtual_vacuum_pump:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.virtual.virtual_vacuum_pump:VirtualVacuumPump
|
module: unilabos.devices.virtual.virtual_vacuum_pump:VirtualVacuumPump
|
||||||
status_types:
|
status_types:
|
||||||
get_status: str
|
|
||||||
status: str
|
status: str
|
||||||
type: python
|
type: python
|
||||||
description: Virtual vacuum pump
|
description: Virtual vacuum pump
|
||||||
|
|||||||
@@ -99,27 +99,6 @@ zhida_hplc:
|
|||||||
title: connect 命令参数
|
title: connect 命令参数
|
||||||
type: object
|
type: object
|
||||||
type: UniLabJsonCommand
|
type: UniLabJsonCommand
|
||||||
auto-get_methods:
|
|
||||||
feedback: {}
|
|
||||||
goal: {}
|
|
||||||
goal_default: {}
|
|
||||||
handles: []
|
|
||||||
result: {}
|
|
||||||
schema:
|
|
||||||
description: UniLabJsonCommand get_methods 的参数schema
|
|
||||||
properties:
|
|
||||||
feedback: {}
|
|
||||||
goal:
|
|
||||||
description: UniLabJsonCommand get_methods 的参数schema
|
|
||||||
properties: {}
|
|
||||||
required: []
|
|
||||||
type: object
|
|
||||||
result: {}
|
|
||||||
required:
|
|
||||||
- goal
|
|
||||||
title: get_methods 命令参数
|
|
||||||
type: object
|
|
||||||
type: UniLabJsonCommand
|
|
||||||
auto-start:
|
auto-start:
|
||||||
feedback: {}
|
feedback: {}
|
||||||
goal: {}
|
goal: {}
|
||||||
@@ -226,7 +205,7 @@ zhida_hplc:
|
|||||||
type: StrSingleInput
|
type: StrSingleInput
|
||||||
module: unilabos.devices.zhida_hplc.zhida:ZhidaClient
|
module: unilabos.devices.zhida_hplc.zhida:ZhidaClient
|
||||||
status_types:
|
status_types:
|
||||||
get_methods: dict
|
methods: dict
|
||||||
status: dict
|
status: dict
|
||||||
type: python
|
type: python
|
||||||
description: Zhida HPLC
|
description: Zhida HPLC
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ from typing import Any, Dict, List
|
|||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
|
|
||||||
from unilabos.ros.msgs.message_converter import msg_converter_manager, ros_action_to_json_schema
|
from unilabos.ros.msgs.message_converter import msg_converter_manager, ros_action_to_json_schema, String
|
||||||
from unilabos.utils import logger
|
from unilabos.utils import logger
|
||||||
from unilabos.utils.decorator import singleton
|
from unilabos.utils.decorator import singleton
|
||||||
from unilabos.utils.import_manager import get_enhanced_class_info
|
from unilabos.utils.import_manager import get_enhanced_class_info
|
||||||
@@ -180,6 +180,13 @@ class Registry:
|
|||||||
if not type_name or type_name == "":
|
if not type_name or type_name == "":
|
||||||
logger.warning(f"[UniLab Registry] 设备 {device_id} 的 {field_name} 类型为空，跳过替换")
|
logger.warning(f"[UniLab Registry] 设备 {device_id} 的 {field_name} 类型为空，跳过替换")
|
||||||
return type_name
|
return type_name
|
||||||
|
convert_manager = { # 将python基本对象转为ros2基本对象
|
||||||
|
"str": "String",
|
||||||
|
"bool": "Bool",
|
||||||
|
"int": "Int64",
|
||||||
|
"float": "Float64",
|
||||||
|
}
|
||||||
|
type_name = convert_manager.get(type_name, type_name) # 替换为ROS2类型
|
||||||
if ":" in type_name:
|
if ":" in type_name:
|
||||||
type_class = msg_converter_manager.get_class(type_name)
|
type_class = msg_converter_manager.get_class(type_name)
|
||||||
else:
|
else:
|
||||||
@@ -297,6 +304,7 @@ class Registry:
|
|||||||
device_config["class"]["action_value_mappings"] = {}
|
device_config["class"]["action_value_mappings"] = {}
|
||||||
enhanced_info = {}
|
enhanced_info = {}
|
||||||
if complete_registry:
|
if complete_registry:
|
||||||
|
device_config["class"]["status_types"].clear()
|
||||||
enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True)
|
enhanced_info = get_enhanced_class_info(device_config["class"]["module"], use_dynamic=True)
|
||||||
device_config["class"]["status_types"].update(
|
device_config["class"]["status_types"].update(
|
||||||
{k: v["return_type"] for k, v in enhanced_info["status_methods"].items()}
|
{k: v["return_type"] for k, v in enhanced_info["status_methods"].items()}
|
||||||
@@ -306,11 +314,14 @@ class Registry:
|
|||||||
status_type = "String" # 替换成ROS的String，便于显示
|
status_type = "String" # 替换成ROS的String，便于显示
|
||||||
device_config["class"]["status_types"][status_name] = status_type
|
device_config["class"]["status_types"][status_name] = status_type
|
||||||
target_type = self._replace_type_with_class(status_type, device_id, f"状态 {status_name}")
|
target_type = self._replace_type_with_class(status_type, device_id, f"状态 {status_name}")
|
||||||
|
if target_type in [dict]: # 对于字典和对象的返回类型，要处理成字符串，直接进行转换
|
||||||
|
target_type = String
|
||||||
status_str_type_mapping[status_type] = target_type
|
status_str_type_mapping[status_type] = target_type
|
||||||
device_config["class"]["status_types"] = dict(
|
device_config["class"]["status_types"] = dict(
|
||||||
sorted(device_config["class"]["status_types"].items())
|
sorted(device_config["class"]["status_types"].items())
|
||||||
)
|
)
|
||||||
if complete_registry:
|
if complete_registry:
|
||||||
|
device_config["class"]["action_value_mappings"] = {k:v for k, v in device_config["class"]["action_value_mappings"].items() if not k.startswith("auto-")}
|
||||||
# 处理动作值映射
|
# 处理动作值映射
|
||||||
device_config["class"]["action_value_mappings"].update(
|
device_config["class"]["action_value_mappings"].update(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -168,7 +168,10 @@ class PropertyPublisher:
|
|||||||
self.print_publish = print_publish
|
self.print_publish = print_publish
|
||||||
|
|
||||||
self._value = None
|
self._value = None
|
||||||
self.publisher_ = node.create_publisher(msg_type, f"{name}", 10)
|
try:
|
||||||
|
self.publisher_ = node.create_publisher(msg_type, f"{name}", 10)
|
||||||
|
except AttributeError as ex:
|
||||||
|
logger.error(f"创建发布者失败，可能由于注册表有误，类型: {msg_type}，错误: {ex}\n{traceback.format_exc()}")
|
||||||
self.timer = node.create_timer(self.timer_period, self.publish_property)
|
self.timer = node.create_timer(self.timer_period, self.publish_property)
|
||||||
self.__loop = get_event_loop()
|
self.__loop = get_event_loop()
|
||||||
str_msg_type = str(msg_type)[8:-2]
|
str_msg_type = str(msg_type)[8:-2]
|
||||||
|
|||||||
@@ -293,9 +293,12 @@ class ImportManager:
|
|||||||
|
|
||||||
elif inspect.ismethod(method) or inspect.isfunction(method):
|
elif inspect.ismethod(method) or inspect.isfunction(method):
|
||||||
if name.startswith("get_"):
|
if name.startswith("get_"):
|
||||||
|
actual_name = name[4:] # 去掉get_前缀
|
||||||
|
if actual_name in result["status_methods"]:
|
||||||
|
continue
|
||||||
# get_ 开头的方法归类为status
|
# get_ 开头的方法归类为status
|
||||||
method_info = self._analyze_method_signature(method)
|
method_info = self._analyze_method_signature(method)
|
||||||
result["status_methods"][name] = method_info
|
result["status_methods"][actual_name] = method_info
|
||||||
elif not name.startswith("_"):
|
elif not name.startswith("_"):
|
||||||
# 其他非_开头的方法归类为action
|
# 其他非_开头的方法归类为action
|
||||||
method_info = self._analyze_method_signature(method)
|
method_info = self._analyze_method_signature(method)
|
||||||
@@ -346,8 +349,13 @@ class ImportManager:
|
|||||||
elif self._is_property_method(node):
|
elif self._is_property_method(node):
|
||||||
# @property 装饰的方法
|
# @property 装饰的方法
|
||||||
result["status_methods"][method_name] = method_info
|
result["status_methods"][method_name] = method_info
|
||||||
|
elif method_name.startswith("get_"):
|
||||||
|
# get_ 开头的方法归类为status
|
||||||
|
actual_name = method_name[4:] # 去掉get_前缀
|
||||||
|
if actual_name not in result["status_methods"]:
|
||||||
|
result["status_methods"][actual_name] = method_info
|
||||||
else:
|
else:
|
||||||
# set_ 开头或其他非_开头的方法
|
# 其他非_开头的方法归类为action
|
||||||
result["action_methods"][method_name] = method_info
|
result["action_methods"][method_name] = method_info
|
||||||
return result
|
return result
|
||||||
|
|
||||||
@@ -417,7 +425,9 @@ class ImportManager:
|
|||||||
if "typing." in annotation_str:
|
if "typing." in annotation_str:
|
||||||
# 简化typing类型显示
|
# 简化typing类型显示
|
||||||
return (
|
return (
|
||||||
annotation_str.replace("typing.", "") if getattr(annotation, "_name", None) is None else annotation._name.lower()
|
annotation_str.replace("typing.", "")
|
||||||
|
if getattr(annotation, "_name", None) is None
|
||||||
|
else annotation._name.lower()
|
||||||
)
|
)
|
||||||
# 如果是类型对象
|
# 如果是类型对象
|
||||||
if hasattr(annotation, "__name__"):
|
if hasattr(annotation, "__name__"):
|
||||||
|
|||||||
Reference in New Issue
Block a user