mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2026-02-05 14:05:12 +00:00
Merge remote-tracking branch 'origin/main' into dev
# Conflicts: # test/experiments/comprehensive_protocol/comprehensive_station.json # unilabos-win64.yaml # unilabos/app/controler.py # unilabos/app/register.py # unilabos/compile/evacuateandrefill_protocol.py # unilabos/registry/device_comms/serial.yaml # unilabos/registry/devices/camera.yaml # unilabos/registry/devices/characterization_optic.yaml # unilabos/registry/devices/hotel.yaml # unilabos/registry/devices/laiyu_add_solid.yaml # unilabos/registry/devices/liquid_handler.yaml # unilabos/registry/devices/mock_devices.yaml # unilabos/registry/devices/moveit_config.yaml # unilabos/registry/devices/organic_miscellaneous.yaml # unilabos/registry/devices/pump_and_valve.yaml # unilabos/registry/devices/robot_agv.yaml # unilabos/registry/devices/robot_arm.yaml # unilabos/registry/devices/robot_gripper.yaml # unilabos/registry/devices/robot_linear_motion.yaml # unilabos/registry/devices/sim_nodes.yaml # unilabos/registry/devices/temperature.yaml # unilabos/registry/devices/vacuum_and_purge.yaml # unilabos/registry/devices/virtual_device.yaml # unilabos/registry/devices/work_station.yaml # unilabos/registry/devices/zhida_hplc.yaml # unilabos/registry/registry.py # unilabos/ros/msgs/message_converter.py # unilabos/ros/nodes/base_device_node.py # unilabos/ros/nodes/presets/host_node.py # unilabos/ros/nodes/presets/protocol_node.py # unilabos/utils/import_manager.py # unilabos/utils/type_check.py
This commit is contained in:
Xuwznln