diff --git a/src/main/java/a8k/appbean/configparam/KeyValType.java b/src/main/java/a8k/appbean/cfg/KeyValType.java similarity index 93% rename from src/main/java/a8k/appbean/configparam/KeyValType.java rename to src/main/java/a8k/appbean/cfg/KeyValType.java index cea9538..046f097 100644 --- a/src/main/java/a8k/appbean/configparam/KeyValType.java +++ b/src/main/java/a8k/appbean/cfg/KeyValType.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public enum KeyValType { Pos3d("Pos3d"),// diff --git a/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java similarity index 92% rename from src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java rename to src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java index 4f5ac0b..f925f39 100644 --- a/src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java +++ b/src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; /** * 大瓶缓冲液位置信息 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/configparam/Plates2dCodeScanPos.java b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java similarity index 83% rename from src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java rename to src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java index 21d2428..61ff0fc 100644 --- a/src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java +++ b/src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; /** * 板夹仓扫码信息 diff --git a/src/main/java/a8k/appbean/configparam/Pos2d.java b/src/main/java/a8k/appbean/cfg/Pos2d.java similarity index 80% rename from src/main/java/a8k/appbean/configparam/Pos2d.java rename to src/main/java/a8k/appbean/cfg/Pos2d.java index f11558e..62d2cef 100644 --- a/src/main/java/a8k/appbean/configparam/Pos2d.java +++ b/src/main/java/a8k/appbean/cfg/Pos2d.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public class Pos2d { diff --git a/src/main/java/a8k/appbean/configparam/Pos3d.java b/src/main/java/a8k/appbean/cfg/Pos3d.java similarity index 84% rename from src/main/java/a8k/appbean/configparam/Pos3d.java rename to src/main/java/a8k/appbean/cfg/Pos3d.java index b7cd0ab..5d61171 100644 --- a/src/main/java/a8k/appbean/configparam/Pos3d.java +++ b/src/main/java/a8k/appbean/cfg/Pos3d.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public class Pos3d { public Integer x; diff --git a/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java b/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java similarity index 94% rename from src/main/java/a8k/appbean/configparam/SampleZPosInfo.java rename to src/main/java/a8k/appbean/cfg/SampleZPosInfo.java index 08ed851..16e2e25 100644 --- a/src/main/java/a8k/appbean/configparam/SampleZPosInfo.java +++ b/src/main/java/a8k/appbean/cfg/SampleZPosInfo.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public class SampleZPosInfo { public Integer sampleZPos;//采样探测起始位 diff --git a/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java similarity index 96% rename from src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java rename to src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java index 11ea93d..7b86973 100644 --- a/src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java +++ b/src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public class SmallBottleBufferPos { /* diff --git a/src/main/java/a8k/appbean/configparam/TubeSamplePos.java b/src/main/java/a8k/appbean/cfg/TubeSamplePos.java similarity index 92% rename from src/main/java/a8k/appbean/configparam/TubeSamplePos.java rename to src/main/java/a8k/appbean/cfg/TubeSamplePos.java index ef49fce..1991e8b 100644 --- a/src/main/java/a8k/appbean/configparam/TubeSamplePos.java +++ b/src/main/java/a8k/appbean/cfg/TubeSamplePos.java @@ -1,4 +1,4 @@ -package a8k.appbean.configparam; +package a8k.appbean.cfg; public class TubeSamplePos { 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机械臂控制相关参数访问