mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 13:01:12 +00:00
Merge branch 'workstation_dev' into dev
# Conflicts: # .conda/recipe.yaml # recipes/msgs/recipe.yaml # recipes/unilabos/recipe.yaml # setup.py # unilabos/registry/devices/work_station.yaml # unilabos/ros/nodes/base_device_node.py # unilabos/ros/nodes/presets/protocol_node.py # unilabos_msgs/package.xml
This commit is contained in:
@@ -98,6 +98,19 @@ set(action_files
|
||||
|
||||
"action/WorkStationRun.action"
|
||||
"action/AGVTransfer.action"
|
||||
|
||||
"action/DispenStationSolnPrep.action"
|
||||
"action/DispenStationVialFeed.action"
|
||||
|
||||
"action/PostProcessGrab.action"
|
||||
"action/PostProcessTriggerClean.action"
|
||||
"action/PostProcessTriggerPostPro.action"
|
||||
|
||||
"action/ReactionStationDripBack.action"
|
||||
"action/ReactionStationLiquidFeed.action"
|
||||
"action/ReactionStationProExecu.action"
|
||||
"action/ReactionStationReaTackIn.action"
|
||||
"action/ReactionStationSolidFeedVial.action"
|
||||
)
|
||||
|
||||
set(srv_files
|
||||
|
||||
Reference in New Issue
Block a user