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(); }