From aa4d28441b390704228e0fad983373eecdd84b7e Mon Sep 17 00:00:00 2001 From: sige Date: Wed, 10 Jan 2024 15:29:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E7=AE=A1=E5=B8=BD=E5=A4=B9=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E8=AE=B0=E4=BD=8F=E7=8A=B6=E6=80=81=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=A4=B9=E4=BD=8F=E8=AF=95=E7=AE=A1=E6=88=96?= =?UTF-8?q?=E8=80=85=E8=AF=95=E7=AE=A1=E5=B8=BD=EF=BC=8C=E4=BB=A5=E4=BE=BF?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=9A=84=E6=97=B6=E5=80=99=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E7=9B=B8=E5=BA=94=E7=9A=84=E5=A4=84=E7=90=86=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dreamworks/boditech/driver/task/step/StepCapTube.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/dreamworks/boditech/driver/task/step/StepCapTube.java b/src/main/java/com/dreamworks/boditech/driver/task/step/StepCapTube.java index 3daeefb..8f7a6d7 100644 --- a/src/main/java/com/dreamworks/boditech/driver/task/step/StepCapTube.java +++ b/src/main/java/com/dreamworks/boditech/driver/task/step/StepCapTube.java @@ -1,6 +1,7 @@ package com.dreamworks.boditech.driver.task.step; import com.dreamworks.boditech.driver.Device; import com.dreamworks.boditech.driver.actuator.ActMotor; +import com.dreamworks.boditech.driver.actuator.ActTestTubeCapClipMotor; import com.dreamworks.boditech.driver.actuator.ActuatorModule; import com.dreamworks.boditech.driver.consumable.CsmSampleTube; import com.dreamworks.boditech.driver.task.Executor; @@ -8,7 +9,7 @@ import com.dreamworks.boditech.driver.task.Task; import com.dreamworks.boditech.driver.task.TaskTest; public class StepCapTube extends StepBase { private ActMotor testTubeMoveMotor; - private ActMotor testTubeCapClipMotor; + private ActTestTubeCapClipMotor testTubeCapClipMotor; private ActMotor testTubeClipMotor; @Override @@ -20,7 +21,7 @@ public class StepCapTube extends StepBase { Device device = executor.getDevice(); this.testTubeMoveMotor = (ActMotor)device.getActuator(ActuatorModule.TEST_TUBE_SHAKING_MOVE_MOTOR); - this.testTubeCapClipMotor = (ActMotor)device.getActuator(ActuatorModule.TEST_TUBE_SHAKING_CAP_CLIP_MOTOR); + this.testTubeCapClipMotor = (ActTestTubeCapClipMotor)device.getActuator(ActuatorModule.TEST_TUBE_SHAKING_CAP_CLIP_MOTOR); this.testTubeClipMotor = (ActMotor)device.getActuator(ActuatorModule.TEST_TUBE_SHAKING_CLIP_MOTOR); String tubeType = taskTest.getSampleTube().type; @@ -42,9 +43,9 @@ public class StepCapTube extends StepBase { // cap for blood tube 5ml private void capForBloodTube5ml() { this.testTubeMoveMotor.moveTo("shakeTestTubeMoveCapClip"); - this.testTubeCapClipMotor.moveTo("shakeTestTubeCapClipOpen"); + this.testTubeCapClipMotor.open(); this.testTubeMoveMotor.moveTo("shakeTestTubeMoveStandby"); - this.testTubeCapClipMotor.moveTo("shakeTestTubeCapClipClose"); + this.testTubeCapClipMotor.close(); this.testTubeClipMotor.rotate(ActMotor.ROTATE_DIRECTION_COUNTER_CLOCKWISE); this.testTubeClipMotor.stop(); }