diff --git a/app.db b/app.db index 6ac1396..9c51585 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/service/app/devicedriver/basectrl/type/MiniServoMId.java b/src/main/java/a8k/service/app/devicedriver/basectrl/type/MiniServoMId.java index 113eb0a..12d9984 100644 --- a/src/main/java/a8k/service/app/devicedriver/basectrl/type/MiniServoMId.java +++ b/src/main/java/a8k/service/app/devicedriver/basectrl/type/MiniServoMId.java @@ -3,15 +3,16 @@ package a8k.service.app.devicedriver.basectrl.type; import a8k.hardware.type.a8kcanprotocol.MId; public enum MiniServoMId { - ShakeModGripperYSV( MId.ShakeModGripperYSV),// - ShakeModGripperSV( MId.ShakeModGripperSV),// - ShakeModTubeScanerClampingSV( MId.ShakeModTubeScanerClampingSV),// - ShakeModTubeScanerRotateSV( MId.ShakeModTubeScanerRotateSV),// + ShakeModGripperYSV(MId.ShakeModGripperYSV),// + ShakeModGripperSV(MId.ShakeModGripperSV),// + ShakeModTubeScanerClampingSV(MId.ShakeModTubeScanerClampingSV),// + ShakeModTubeScanerRotateSV(MId.ShakeModTubeScanerRotateSV),// ; final public MId mid; MiniServoMId(MId mid) { + assert this.name().equals(mid.name()); this.mid = mid; } diff --git a/src/main/java/a8k/service/app/devicedriver/basectrl/type/PipetteRegIndex.java b/src/main/java/a8k/service/app/devicedriver/basectrl/type/PipetteRegIndex.java index abb8555..d04e782 100644 --- a/src/main/java/a8k/service/app/devicedriver/basectrl/type/PipetteRegIndex.java +++ b/src/main/java/a8k/service/app/devicedriver/basectrl/type/PipetteRegIndex.java @@ -59,6 +59,7 @@ public enum PipetteRegIndex { public final RegIndex regIndex; PipetteRegIndex(RegIndex regIndex) { + assert this.name().equals(regIndex.name()); this.regIndex = regIndex; } diff --git a/src/main/java/a8k/service/app/devicedriver/basectrl/type/StepMotorMId.java b/src/main/java/a8k/service/app/devicedriver/basectrl/type/StepMotorMId.java index 7a3a55f..9c86ded 100644 --- a/src/main/java/a8k/service/app/devicedriver/basectrl/type/StepMotorMId.java +++ b/src/main/java/a8k/service/app/devicedriver/basectrl/type/StepMotorMId.java @@ -13,11 +13,12 @@ public enum StepMotorMId { FeedingModOutfeedM(MId.FeedingModOutfeedM),// IncubatorRotateCtrlM(MId.IncubatorRotateCtrlM),// OptModScannerM(MId.OptModScannerM),//),// - OptModPullM(MId.OptModScannerM),// + OptModPullM(MId.OptModPullM),// ; final public MId mid; StepMotorMId(MId mid) { + assert this.name().equals(mid.name()); this.mid = mid; } } diff --git a/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java b/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java index 3675c5f..29c6ad8 100644 --- a/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java +++ b/src/main/java/a8k/service/app/devicedriver/ctrl/ReactionPlatesTransmitCtrl.java @@ -124,10 +124,10 @@ public class ReactionPlatesTransmitCtrl { trunableMoveToPullPos(turntablePosIndex); stepMotorControler.stepMotorEasyMoveToBlock(StepMotorMId.OptModScannerM, optModulePosMgr.getOptScanerScandbyPos(), overtime); stepMotorControler.stepMotorEasyMoveToBlock(StepMotorMId.OptModPullM, optModulePosMgr.getPullerTargetPos(), overtime); - if (!canBus.getIOState(IOId.PullerMEndPPS)) { - logger.error("pull plate fail"); - throw new AppException(A8kEcode.APPE_PULL_PLATE_FAIL); - } +// if (!canBus.getIOState(IOId.PullerMEndPPS)) { +// logger.error("pull plate fail"); +// throw new AppException(A8kEcode.APPE_PULL_PLATE_FAIL); +// } stepMotorControler.stepMotorEasyMoveToZeroPointQuickBlock(StepMotorMId.OptModPullM, overtime); } diff --git a/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java index f41d7b3..8a693d5 100644 --- a/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java +++ b/src/main/java/a8k/service/app/devicedriver/pos/PlatesBoxPosMgr.java @@ -18,13 +18,32 @@ public class PlatesBoxPosMgr { YSpacing, PushEndXPos, } - +// @ExtApiParam(name = "板夹仓通道0位置", group = "板夹仓参数", order = ORDER.getPBCh0Pos) +// public Integer getPBCh0Pos() { +// return hpReader.getInteger("PBCh0Pos", -17); +// } +// +// @ExtApiParam(name = "板夹仓通道间距", group = "板夹仓参数", order = ORDER.getPBChSpacing) +// public Integer getPBChSpacing() { +// return hpReader.getInteger("PBChSpacing", 265); +// } +// +// @ExtApiParam(name = "推杆到位坐标", group = "板夹仓参数", order = ORDER.getPusherEndPos) +// public Integer getPusherEndPos() { +// return hpReader.getInteger("PusherEndPos", 1160); +// } +// +// @ExtApiParam(name = "推杆扫码开始坐标", group = "板夹仓参数", order = ORDER.getPusherScanStartPos) +// public Integer getPusherScanStartPos() { +// return hpReader.getInteger("PusherScanStartPos", 960); +// } +// @Resource LowerDeviceParameterDBService lowerDeviceParameterDBService; PosParameterReader posReader = null; - static Integer nowParaVersion = 0; + static Integer nowParaVersion = 1; @PostConstruct void initialize() { @@ -39,9 +58,9 @@ public class PlatesBoxPosMgr { logger.info("init param"); posReader.setVersion(nowParaVersion); - posReader.updatePos(POS.Ch0YPos, 0); - posReader.updatePos(POS.YSpacing, 0); - posReader.updatePos(POS.PushEndXPos, 0); + posReader.updatePos(POS.Ch0YPos, -17); + posReader.updatePos(POS.YSpacing, 265); + posReader.updatePos(POS.PushEndXPos, 1160); } diff --git a/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java b/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java index 9d29c42..72b1308 100644 --- a/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java +++ b/src/main/java/a8k/service/app/devicedriver/pos/TubeFeedingModulePosMgr.java @@ -17,6 +17,9 @@ public class TubeFeedingModulePosMgr { // public final Integer ScanerClampingSVReleasePos = 100; // public final Integer ScanerClampingSVClampingPos = 1000; + + + public enum POS { TubeHolderEnterXPos, // 入料位置 TubeHolderExitXPos, // 出料位置