Browse Source

update

tags/v0
zhaohe 1 year ago
parent
commit
ad5a06b590
  1. 2
      src/main/java/a8k/appbean/cfg/KeyValType.java
  2. 2
      src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java
  3. 10
      src/main/java/a8k/appbean/cfg/PipetteCfg.java
  4. 2
      src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java
  5. 2
      src/main/java/a8k/appbean/cfg/Pos2d.java
  6. 2
      src/main/java/a8k/appbean/cfg/Pos3d.java
  7. 2
      src/main/java/a8k/appbean/cfg/SampleZPosInfo.java
  8. 2
      src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java
  9. 2
      src/main/java/a8k/appbean/cfg/TubeSamplePos.java
  10. 2
      src/main/java/a8k/base_hardware/A8kCanBusService.java
  11. 8
      src/main/java/a8k/service/db/dao/HbotControlParamsDao.java

2
src/main/java/a8k/appbean/configparam/KeyValType.java → 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"),//

2
src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java → src/main/java/a8k/appbean/cfg/LargeBottleBufferPos.java

@ -1,4 +1,4 @@
package a8k.appbean.configparam;
package a8k.appbean.cfg;
/**
* 大瓶缓冲液位置信息

10
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; //吸空检测容差值
}

2
src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java → src/main/java/a8k/appbean/cfg/Plates2dCodeScanPos.java

@ -1,4 +1,4 @@
package a8k.appbean.configparam;
package a8k.appbean.cfg;
/**
* 板夹仓扫码信息

2
src/main/java/a8k/appbean/configparam/Pos2d.java → src/main/java/a8k/appbean/cfg/Pos2d.java

@ -1,4 +1,4 @@
package a8k.appbean.configparam;
package a8k.appbean.cfg;
public class Pos2d {

2
src/main/java/a8k/appbean/configparam/Pos3d.java → 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;

2
src/main/java/a8k/appbean/configparam/SampleZPosInfo.java → 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;//采样探测起始位

2
src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java → src/main/java/a8k/appbean/cfg/SmallBottleBufferPos.java

@ -1,4 +1,4 @@
package a8k.appbean.configparam;
package a8k.appbean.cfg;
public class SmallBottleBufferPos {
/*

2
src/main/java/a8k/appbean/configparam/TubeSamplePos.java → src/main/java/a8k/appbean/cfg/TubeSamplePos.java

@ -1,4 +1,4 @@
package a8k.appbean.configparam;
package a8k.appbean.cfg;
public class TubeSamplePos {

2
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;

8
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机械臂控制相关参数访问

Loading…
Cancel
Save