diff --git a/src/main/java/a8k/appbean/TipPickUpPosInfo.java b/src/main/java/a8k/appbean/TipPickUpPosInfo.java deleted file mode 100644 index 9e97cd5..0000000 --- a/src/main/java/a8k/appbean/TipPickUpPosInfo.java +++ /dev/null @@ -1,25 +0,0 @@ -package a8k.appbean; - -public class TipPickUpPosInfo { - - /* - * { - * "topLelf":[ - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y} - * ], - * "xinterval":, - * "yinterval":, - * - * "horizontalPointsNum":30, - * "verticalPointsNum":20, - * "pickUpZPos":100, //拾取高度 - * - * - * } - */ - - - -} diff --git a/src/main/java/a8k/appbean/cfg/KeyValType.java b/src/main/java/a8k/appbean/cfg/KeyValType.java index 046f097..2ad8994 100644 --- a/src/main/java/a8k/appbean/cfg/KeyValType.java +++ b/src/main/java/a8k/appbean/cfg/KeyValType.java @@ -11,8 +11,10 @@ public enum KeyValType { SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// TipPickUpPosInfo("TipPickUpPosInfo"),// TubeSamplePos("TubeSamplePos"),// + PipetteCfg("PipetteCfg"),// Float("Float"); + final public String name; KeyValType(String name) { diff --git a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java index f925f39..1bca436 100644 --- a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java +++ b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java @@ -12,4 +12,5 @@ public class LargeBottleBufferPos { public Integer scancodeRelaPos; //扫码相对每个大屏缓冲液的位置,第一排 -dy,第二排dy public Integer sampleZPos; //取样开始位置 public Integer sampleZDepth; //取样深度 + } diff --git a/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java b/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java new file mode 100644 index 0000000..14e4ed7 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/TipPickUpPosInfo.java @@ -0,0 +1,14 @@ +package a8k.appbean.cfg; + +public class TipPickUpPosInfo { + + public Pos2d g0tl; + public Pos2d g1tl; + public Pos2d g2tl; + + public Integer xInterval; //x间隔 + public Integer yInterval; //y间隔 + + public Integer pickUpZPos; //拾取高度 + +} diff --git a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java index 3a712ac..af3ddbf 100644 --- a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java +++ b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java @@ -1,10 +1,6 @@ package a8k.service.db.dao; -import a8k.appbean.*; -import a8k.appbean.cfg.LargeBottleBufferPos; -import a8k.appbean.cfg.Plates2dCodeScanPos; -import a8k.appbean.cfg.Pos3d; -import a8k.appbean.cfg.SmallBottleBufferPos; +import a8k.appbean.cfg.*; /** * XY机械臂控制相关参数访问