From ad5a06b590e76cb72c4208bab32ab5fd562dbf75 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 24 Jul 2024 13:51:37 +0800 Subject: [PATCH] update --- src/main/java/a8k/appbean/cfg/KeyValType.java | 22 +++++++++++ .../java/a8k/appbean/cfg/LargeBottleBufferPos.java | 15 +++++++ src/main/java/a8k/appbean/cfg/PipetteCfg.java | 10 +++++ .../java/a8k/appbean/cfg/Plates2dCodeScanPos.java | 11 ++++++ src/main/java/a8k/appbean/cfg/Pos2d.java | 13 ++++++ src/main/java/a8k/appbean/cfg/Pos3d.java | 13 ++++++ src/main/java/a8k/appbean/cfg/SampleZPosInfo.java | 17 ++++++++ .../java/a8k/appbean/cfg/SmallBottleBufferPos.java | 46 ++++++++++++++++++++++ src/main/java/a8k/appbean/cfg/TubeSamplePos.java | 15 +++++++ .../java/a8k/appbean/configparam/KeyValType.java | 22 ----------- .../appbean/configparam/LargeBottleBufferPos.java | 15 ------- .../appbean/configparam/Plates2dCodeScanPos.java | 11 ------ src/main/java/a8k/appbean/configparam/Pos2d.java | 13 ------ src/main/java/a8k/appbean/configparam/Pos3d.java | 13 ------ .../a8k/appbean/configparam/SampleZPosInfo.java | 17 -------- .../appbean/configparam/SmallBottleBufferPos.java | 46 ---------------------- .../a8k/appbean/configparam/TubeSamplePos.java | 15 ------- .../java/a8k/base_hardware/A8kCanBusService.java | 2 +- .../a8k/service/db/dao/HbotControlParamsDao.java | 8 ++-- 19 files changed, 167 insertions(+), 157 deletions(-) create mode 100644 src/main/java/a8k/appbean/cfg/KeyValType.java create mode 100644 src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java create mode 100644 src/main/java/a8k/appbean/cfg/PipetteCfg.java create mode 100644 src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java create mode 100644 src/main/java/a8k/appbean/cfg/Pos2d.java create mode 100644 src/main/java/a8k/appbean/cfg/Pos3d.java create mode 100644 src/main/java/a8k/appbean/cfg/SampleZPosInfo.java create mode 100644 src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java create mode 100644 src/main/java/a8k/appbean/cfg/TubeSamplePos.java delete mode 100644 src/main/java/a8k/appbean/configparam/KeyValType.java delete mode 100644 src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java delete mode 100644 src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java delete mode 100644 src/main/java/a8k/appbean/configparam/Pos2d.java delete mode 100644 src/main/java/a8k/appbean/configparam/Pos3d.java delete mode 100644 src/main/java/a8k/appbean/configparam/SampleZPosInfo.java delete mode 100644 src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java delete mode 100644 src/main/java/a8k/appbean/configparam/TubeSamplePos.java diff --git a/src/main/java/a8k/appbean/cfg/KeyValType.java b/src/main/java/a8k/appbean/cfg/KeyValType.java new file mode 100644 index 0000000..046f097 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/KeyValType.java @@ -0,0 +1,22 @@ +package a8k.appbean.cfg; + +public enum KeyValType { + Pos3d("Pos3d"),// + Pos2d("Pos2d"),// + Bool("Bool"),// + Int("Int"),// + String("String"),// + LargeBottleBufferPosInfo("LargeBottleBufferPosInfo"),// + Plates2dCodeScanPosInfo("Plates2dCodeScanPosInfo"),// + SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// + TipPickUpPosInfo("TipPickUpPosInfo"),// + TubeSamplePos("TubeSamplePos"),// + Float("Float"); + + final public String name; + + KeyValType(String name) { + this.name = name; + } + +} diff --git a/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java new file mode 100644 index 0000000..f925f39 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java @@ -0,0 +1,15 @@ +package a8k.appbean.cfg; + +/** + * 大瓶缓冲液位置信息 + */ +public class LargeBottleBufferPos { + public Pos2d topLelf; + + public Integer xinterval; //x间隔 + public Integer yinterval; //y间隔 + + public Integer scancodeRelaPos; //扫码相对每个大屏缓冲液的位置，第一排 -dy，第二排dy + public Integer sampleZPos; //取样开始位置 + public Integer sampleZDepth; //取样深度 +} diff --git a/src/main/java/a8k/appbean/cfg/PipetteCfg.java b/src/main/java/a8k/appbean/cfg/PipetteCfg.java new file mode 100644 index 0000000..6706352 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/PipetteCfg.java @@ -0,0 +1,10 @@ +package a8k.appbean.cfg; + +public class PipetteCfg { + public Integer LLFCThresh;//液面跟随电容阈值 + public Integer LLFPThresh;//液面跟随压力阈值 + + public Integer operatVerifFeatureTime;//操作验证特征时间 + public Integer operatVerifPThresh;//压力阈值 + public Integer tolerance; //吸空检测容差值 +} diff --git a/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java new file mode 100644 index 0000000..61ff0fc --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java @@ -0,0 +1,11 @@ +package a8k.appbean.cfg; + +/** + * 板夹仓扫码信息 + */ +public class Plates2dCodeScanPos { + public Pos2d ch0ScanPos; //通道1扫码位置 + public Integer scanYInterval; //扫码间隔 + + +} diff --git a/src/main/java/a8k/appbean/cfg/Pos2d.java b/src/main/java/a8k/appbean/cfg/Pos2d.java new file mode 100644 index 0000000..62d2cef --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/Pos2d.java @@ -0,0 +1,13 @@ +package a8k.appbean.cfg; + +public class Pos2d { + + public Integer x; + public Integer y; + + public Pos2d(Integer x, Integer y) { + this.x = x; + this.y = y; + } + +} diff --git a/src/main/java/a8k/appbean/cfg/Pos3d.java b/src/main/java/a8k/appbean/cfg/Pos3d.java new file mode 100644 index 0000000..5d61171 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/Pos3d.java @@ -0,0 +1,13 @@ +package a8k.appbean.cfg; + +public class Pos3d { + public Integer x; + public Integer y; + public Integer z; + + public Pos3d(Integer x, Integer y, Integer z) { + this.x = x; + this.y = y; + this.z = z; + } +} diff --git a/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java b/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java new file mode 100644 index 0000000..16e2e25 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java @@ -0,0 +1,17 @@ +package a8k.appbean.cfg; + +public class SampleZPosInfo { + public Integer sampleZPos;//采样探测起始位 + public Integer sampleZDepth;//采样深度 + + /* + * 如果样本容器直径不随液面高度变化，那么LLFVelK=0，LLFVel=常数 + * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel + * + * 如果样本容器直径随液面高度变化，那么LLFVelK=常数，LLFVel=常数 + * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel + */ + + public Integer LLFVelK;//液面跟随速度 + public Integer LLFVel;//液面跟随速度 +} diff --git a/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java new file mode 100644 index 0000000..7b86973 --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java @@ -0,0 +1,46 @@ +package a8k.appbean.cfg; + +public class SmallBottleBufferPos { + /* + * { + * "topLelf":[ + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y}, + * {"x":x,"y":y} + * ], + * "xinterval":, + * "yinterval":, + * + * "scancodeRelaPos":[dx,dy], + * "piercedZPos":z,//刺破高度 + * "distributeZPos":z,//吐液高度 + * "detectMaterialDistributeZpos":z//探测物质吐液高度 + + * + * } + */ + + public Pos2d g0TopLelf; + public Pos2d g1TopLelf; + public Pos2d g2TopLelf; + public Pos2d g3TopLelf; + public Pos2d g4TopLelf; + public Pos2d g5TopLelf; + + public Integer xInterval; //x间隔 + public Integer yInterval; //y间隔 + + public Integer sampleZPos; //取样开始位置 + public Integer sampleZDepth; //取样深度 + + public Pos2d scanRelaPos;//扫码相对配置 + + public Integer piercedZPos; //刺破高度 + public Integer smallBottleBufDistributeZPos; //小瓶缓冲液吐液高度 + public Integer detectMaterialDistributeZpos; //探测物质吐液高度 + + +} diff --git a/src/main/java/a8k/appbean/cfg/TubeSamplePos.java b/src/main/java/a8k/appbean/cfg/TubeSamplePos.java new file mode 100644 index 0000000..1991e8b --- /dev/null +++ b/src/main/java/a8k/appbean/cfg/TubeSamplePos.java @@ -0,0 +1,15 @@ +package a8k.appbean.cfg; + +public class TubeSamplePos { + + Pos2d sampleXYPos0; //不需要脱帽盖帽摇匀的取样位置 + Pos2d sampleXYPos1; //需要脱帽盖帽摇匀的取样位置 + + SampleZPosInfo HighBlood; //sampleXYPos1 + SampleZPosInfo ShortBlood;//sampleXYPos1 + + SampleZPosInfo Mini; //sampleXYPos0 + SampleZPosInfo MiniBlood; //sampleXYPos0 + SampleZPosInfo BulletTube1P5; //sampleXYPos0 + SampleZPosInfo BulletTube0P5; //sampleXYPos0 +} diff --git a/src/main/java/a8k/appbean/configparam/KeyValType.java b/src/main/java/a8k/appbean/configparam/KeyValType.java deleted file mode 100644 index cea9538..0000000 --- a/src/main/java/a8k/appbean/configparam/KeyValType.java +++ /dev/null @@ -1,22 +0,0 @@ -package a8k.appbean.configparam; - -public enum KeyValType { - Pos3d("Pos3d"),// - Pos2d("Pos2d"),// - Bool("Bool"),// - Int("Int"),// - String("String"),// - LargeBottleBufferPosInfo("LargeBottleBufferPosInfo"),// - Plates2dCodeScanPosInfo("Plates2dCodeScanPosInfo"),// - SmallBottleBufferPosInfo("SmallBottleBufferPosInfo"),// - TipPickUpPosInfo("TipPickUpPosInfo"),// - TubeSamplePos("TubeSamplePos"),// - Float("Float"); - - final public String name; - - KeyValType(String name) { - this.name = name; - } - -} diff --git a/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java deleted file mode 100644 index 4f5ac0b..0000000 --- a/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java +++ /dev/null @@ -1,15 +0,0 @@ -package a8k.appbean.configparam; - -/** - * 大瓶缓冲液位置信息 - */ -public class LargeBottleBufferPos { - public Pos2d topLelf; - - public Integer xinterval; //x间隔 - public Integer yinterval; //y间隔 - - public Integer scancodeRelaPos; //扫码相对每个大屏缓冲液的位置，第一排 -dy，第二排dy - public Integer sampleZPos; //取样开始位置 - public Integer sampleZDepth; //取样深度 -} diff --git a/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java b/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java deleted file mode 100644 index 21d2428..0000000 --- a/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java +++ /dev/null @@ -1,11 +0,0 @@ -package a8k.appbean.configparam; - -/** - * 板夹仓扫码信息 - */ -public class Plates2dCodeScanPos { - public Pos2d ch0ScanPos; //通道1扫码位置 - public Integer scanYInterval; //扫码间隔 - - -} diff --git a/src/main/java/a8k/appbean/configparam/Pos2d.java b/src/main/java/a8k/appbean/configparam/Pos2d.java deleted file mode 100644 index f11558e..0000000 --- a/src/main/java/a8k/appbean/configparam/Pos2d.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.appbean.configparam; - -public class Pos2d { - - public Integer x; - public Integer y; - - public Pos2d(Integer x, Integer y) { - this.x = x; - this.y = y; - } - -} diff --git a/src/main/java/a8k/appbean/configparam/Pos3d.java b/src/main/java/a8k/appbean/configparam/Pos3d.java deleted file mode 100644 index b7cd0ab..0000000 --- a/src/main/java/a8k/appbean/configparam/Pos3d.java +++ /dev/null @@ -1,13 +0,0 @@ -package a8k.appbean.configparam; - -public class Pos3d { - public Integer x; - public Integer y; - public Integer z; - - public Pos3d(Integer x, Integer y, Integer z) { - this.x = x; - this.y = y; - this.z = z; - } -} diff --git a/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java b/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java deleted file mode 100644 index 08ed851..0000000 --- a/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java +++ /dev/null @@ -1,17 +0,0 @@ -package a8k.appbean.configparam; - -public class SampleZPosInfo { - public Integer sampleZPos;//采样探测起始位 - public Integer sampleZDepth;//采样深度 - - /* - * 如果样本容器直径不随液面高度变化，那么LLFVelK=0，LLFVel=常数 - * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel - * - * 如果样本容器直径随液面高度变化，那么LLFVelK=常数，LLFVel=常数 - * 液面跟随速度=LLFVelK*液面相对起始位置高度+LLFVel - */ - - public Integer LLFVelK;//液面跟随速度 - public Integer LLFVel;//液面跟随速度 -} diff --git a/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java b/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java deleted file mode 100644 index 11ea93d..0000000 --- a/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java +++ /dev/null @@ -1,46 +0,0 @@ -package a8k.appbean.configparam; - -public class SmallBottleBufferPos { - /* - * { - * "topLelf":[ - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y}, - * {"x":x,"y":y} - * ], - * "xinterval":, - * "yinterval":, - * - * "scancodeRelaPos":[dx,dy], - * "piercedZPos":z,//刺破高度 - * "distributeZPos":z,//吐液高度 - * "detectMaterialDistributeZpos":z//探测物质吐液高度 - - * - * } - */ - - public Pos2d g0TopLelf; - public Pos2d g1TopLelf; - public Pos2d g2TopLelf; - public Pos2d g3TopLelf; - public Pos2d g4TopLelf; - public Pos2d g5TopLelf; - - public Integer xInterval; //x间隔 - public Integer yInterval; //y间隔 - - public Integer sampleZPos; //取样开始位置 - public Integer sampleZDepth; //取样深度 - - public Pos2d scanRelaPos;//扫码相对配置 - - public Integer piercedZPos; //刺破高度 - public Integer smallBottleBufDistributeZPos; //小瓶缓冲液吐液高度 - public Integer detectMaterialDistributeZpos; //探测物质吐液高度 - - -} diff --git a/src/main/java/a8k/appbean/configparam/TubeSamplePos.java b/src/main/java/a8k/appbean/configparam/TubeSamplePos.java deleted file mode 100644 index ef49fce..0000000 --- a/src/main/java/a8k/appbean/configparam/TubeSamplePos.java +++ /dev/null @@ -1,15 +0,0 @@ -package a8k.appbean.configparam; - -public class TubeSamplePos { - - Pos2d sampleXYPos0; //不需要脱帽盖帽摇匀的取样位置 - Pos2d sampleXYPos1; //需要脱帽盖帽摇匀的取样位置 - - SampleZPosInfo HighBlood; //sampleXYPos1 - SampleZPosInfo ShortBlood;//sampleXYPos1 - - SampleZPosInfo Mini; //sampleXYPos0 - SampleZPosInfo MiniBlood; //sampleXYPos0 - SampleZPosInfo BulletTube1P5; //sampleXYPos0 - SampleZPosInfo BulletTube0P5; //sampleXYPos0 -} diff --git a/src/main/java/a8k/base_hardware/A8kCanBusService.java b/src/main/java/a8k/base_hardware/A8kCanBusService.java index 1954863..a749b2c 100644 --- a/src/main/java/a8k/base_hardware/A8kCanBusService.java +++ b/src/main/java/a8k/base_hardware/A8kCanBusService.java @@ -3,7 +3,7 @@ package a8k.base_hardware; import a8k.a8k_can_protocol.*; import a8k.a8k_can_protocol.MId; import a8k.appbean.HardwareException; -import a8k.appbean.configparam.Pos2d; +import a8k.appbean.cfg.Pos2d; import a8k.appbean.appevent.A8kHardwareReport; import a8k.service.AppEventBusService; import a8k.utils.ByteArray; diff --git a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java index abee730..3a712ac 100644 --- a/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java +++ b/src/main/java/a8k/service/db/dao/HbotControlParamsDao.java @@ -1,10 +1,10 @@ package a8k.service.db.dao; import a8k.appbean.*; -import a8k.appbean.configparam.LargeBottleBufferPos; -import a8k.appbean.configparam.Plates2dCodeScanPos; -import a8k.appbean.configparam.Pos3d; -import a8k.appbean.configparam.SmallBottleBufferPos; +import a8k.appbean.cfg.LargeBottleBufferPos; +import a8k.appbean.cfg.Plates2dCodeScanPos; +import a8k.appbean.cfg.Pos3d; +import a8k.appbean.cfg.SmallBottleBufferPos; /** * XY机械臂控制相关参数访问