diff --git a/app.db b/app.db index 6110e76..47e2caf 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/service/app/devicedriver/calibration/TubePreProcesPosCalibration.java b/src/main/java/a8k/service/app/devicedriver/calibration/TubePreProcesPosCalibration.java index 803c027..3b8c2b4 100644 --- a/src/main/java/a8k/service/app/devicedriver/calibration/TubePreProcesPosCalibration.java +++ b/src/main/java/a8k/service/app/devicedriver/calibration/TubePreProcesPosCalibration.java @@ -166,7 +166,7 @@ public class TubePreProcesPosCalibration { } @ExtApiFn(name = "<校验>移动到待机位", group = "校验.YSV", order = 37) - public void YAxixServoMoveToStandyPos(Integer pos) throws AppException { + public void YAxixServoMoveToStandyPos() throws AppException { miniServoControler.miniServoEnable(MiniServoMId.ShakeModGripperYSV, 1); controler.YSVMoveToStandyPos(); } @@ -208,6 +208,20 @@ public class TubePreProcesPosCalibration { controler.putTubeToTubeholder(); } + @ExtApiFn(name = "<校验>Z轴移动到取高试管位置", group = "校验.ZM", order = 47) + public void zMotorMoveToTakeHTubePos() throws AppException { + enableModule(); + stepMotorControler.stepMotorEasyMoveToZeroBlock(StepMotorMId.ShakeModGripperZM, overtime); + controler.zMotorMoveToTakeHTubePos(); + } + + @ExtApiFn(name = "<校验>Z轴移动到摇匀位置", group = "校验.ZM", order = 48) + public void zMotorMoveToShakeTubePos() throws AppException { + enableModule(); + stepMotorControler.stepMotorEasyMoveToZeroBlock(StepMotorMId.ShakeModGripperZM, overtime); + controler.zMotorMoveToShakeTubePos(); + } + //ShakeClamp : 标定,校验 @ExtApiFn(name = "<标定>设置当前点为<夹紧位置>", group = "标定.夹紧", order = 51, newline = true)