From cfa767381d5273c93f5061a3558f9125e2db985c Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 14 Jul 2024 14:40:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20scanClampModuleCompress=20?= =?UTF-8?q?=E5=92=8C=20scanClampModuleReset=20=20=E4=B8=A4=E4=B8=AA?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hardware/MotorTubeRackMoveCtrlService.java | 19 +++++++++++++++++-- .../hardware/SamplesPreProcessModuleCtrlService.java | 11 ++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java index 5a6e07e..6ba7561 100644 --- a/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java +++ b/src/main/java/a8k/service/hardware/MotorTubeRackMoveCtrlService.java @@ -141,11 +141,11 @@ public class MotorTubeRackMoveCtrlService { public void moveTubeToExistJudgmentPos(String tubeType, Integer tubeIndex) { } - public boolean isTubeRackExitInEnterPos() { + public boolean isTubeRackInEnterPos() { return false; } - public boolean isTubeRackExitInExitPos() { + public boolean isTubeRackInExitPos() { return false; } @@ -163,4 +163,19 @@ public class MotorTubeRackMoveCtrlService { // + /** + * 扫描夹紧机构夹紧 + */ + public void scanClampModuleCompress() { + + } + + /** + * 扫描夹紧机构复位 + */ + public void scanClampModuleReset() { + + } + + } diff --git a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java index 32065e5..b45c27f 100644 --- a/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java +++ b/src/main/java/a8k/service/hardware/SamplesPreProcessModuleCtrlService.java @@ -4,13 +4,6 @@ import a8k.appbean.SampleTubeState; public class SamplesPreProcessModuleCtrlService { - - - - - - - /** * 样品预处理模块 * 主要负责样品预处理的相关操作 @@ -22,7 +15,7 @@ public class SamplesPreProcessModuleCtrlService { * 4.平移电机取试管位置 * 5.平移电机试管处理位置 * - * + * */ public void takeTube(String tubeType) { @@ -34,7 +27,7 @@ public class SamplesPreProcessModuleCtrlService { /** * 摇匀试管 - * @param tubeState + * @param tubeType * @param times * @param shakeDegree */