mirror of
https://github.com/dptech-corp/Uni-Lab-OS.git
synced 2025-12-17 13:01:12 +00:00
Merge branch '24-high-level-liquidhandler' into dev
# Conflicts: # unilabos/app/main.py # unilabos/registry/devices/liquid_handler.yaml # unilabos_msgs/CMakeLists.txt
This commit is contained in:
@@ -43,14 +43,10 @@ set(action_files
|
||||
"action/LiquidHandlerStamp.action"
|
||||
"action/LiquidHandlerTransfer.action"
|
||||
|
||||
"action/DPLiquidHandlerAddLiquid.action"
|
||||
"action/DPLiquidHandlerCustomDelay.action"
|
||||
"action/DPLiquidHandlerMix.action"
|
||||
"action/DPLiquidHandlerMoveTo.action"
|
||||
"action/DPLiquidHandlerRemoveLiquid.action"
|
||||
"action/DPLiquidHandlerSetTiprack.action"
|
||||
"action/DPLiquidHandlerTouchTip.action"
|
||||
"action/DPLiquidHandlerTransferLiquid.action"
|
||||
"action/LiquidHandlerAdd.action"
|
||||
"action/LiquidHandlerMix.action"
|
||||
"action/LiquidHandlerMoveTo.action"
|
||||
"action/LiquidHandlerRemove.action"
|
||||
|
||||
"action/EmptyIn.action"
|
||||
"action/FloatSingleInput.action"
|
||||
@@ -59,10 +55,9 @@ set(action_files
|
||||
"action/Point3DSeparateInput.action"
|
||||
|
||||
"action/ResourceCreateFromOuter.action"
|
||||
"action/ResourceCreateFromOuterEasy.action"
|
||||
|
||||
"action/SolidDispenseAddPowderTube.action"
|
||||
|
||||
|
||||
"action/PumpTransfer.action"
|
||||
"action/Clean.action"
|
||||
"action/Separate.action"
|
||||
|
||||
Reference in New Issue
Block a user