add

src/main/java/a8k/appbean/LargeBottleBufferPosInfo.java

@@ -1,19 +0,0 @@
-package a8k.appbean;
-
-public class LargeBottleBufferPosInfo {
-	/*
-	 * {
-	 *	"topLelf":[
-	 * 		{"x":x,"y":y}
-	 * 	],
-	 *	"xinterval":,
-	 *	"yinterval":,
-	 *
-	 * 	"scancodeLineEachRelaPos":dy, //扫码相对每个大屏缓冲液的位置，第一排-dy，第二排dy
-	 * 	"sampleStartPos":z,//取样开始位置
-	 * 	"sampleHight":z,//取样深度
-	 *
-	 * }
-	 */
-
-}

src/main/java/a8k/appbean/Plates2dCodeScanPosInfo.java

@@ -1,16 +0,0 @@
-package a8k.appbean;
-
-public class Plates2dCodeScanPosInfo {
-
-	public Pos2d getCh0ScanPos() {
-		return null; //通道1扫码位置
-	}
-
-	public Integer getInterval() {
-		return 0;
-	}
-
-	public Pos2d getChScanPos(int chindex) {
-		return null;
-	}
-}

src/main/java/a8k/appbean/Pos2d.java

@@ -1,13 +0,0 @@
-package a8k.appbean;
-
-public class Pos2d {
-
-	public int x;
-	public int y;
-
-	public Pos2d(int x, int y) {
-		this.x = x;
-		this.y = y;
-	}
-
-}

src/main/java/a8k/appbean/Pos3d.java

@@ -1,13 +0,0 @@
-package a8k.appbean;
-
-public class Pos3d {
-	public int x;
-	public int y;
-	public int z;
-
-	public Pos3d(int x, int y, int z) {
-		this.x = x;
-		this.y = y;
-		this.z = z;
-	}
-}

src/main/java/a8k/appbean/PosZ.java

@@ -1,11 +0,0 @@
-package a8k.appbean;
-
-public class PosZ {
-	int zpos;
-	int depth;
-
-	PosZ(int zpos, int depth) {
-		this.zpos  = zpos;
-		this.depth = depth;
-	}
-}

src/main/java/a8k/appbean/SmallBottleBufferPosInfo.java

@@ -1,27 +0,0 @@
-package a8k.appbean;
-
-public class SmallBottleBufferPosInfo {
-	/*
-	 * {
-	 *	"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//探测物质吐液高度
-
-	 *
-	 * }
-	 */
-
-
-}

src/main/java/a8k/appbean/TubeSamplePos.java

@@ -1,35 +0,0 @@
-package a8k.appbean;
-
-public class TubeSamplePos {
-	/*
-		"{
-			"sampleXYPos0":[x,y], //非全血试管取样位置
-			"sampleXYPos1":[x,y], //全血试管取样位置
-
-			"HighBlood":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			},
-			"ShortBlood":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			}
-			"Mini":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			}
-			"MiniBlood":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			}
-			"BulletTube1P5":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			}
-			"BulletTube0P5":{
-				"sampleStartPos":1,
-				"sampleDepth":2,
-			}
-		}"
-	 */
-}

src/main/java/a8k/appbean/KeyValType.java → src/main/java/a8k/appbean/configparam/KeyValType.java

@@ -1,4 +1,4 @@
-package a8k.appbean;
+package a8k.appbean.configparam;
 
 public enum KeyValType {
 	Pos3d("Pos3d"),//

src/main/java/a8k/appbean/configparam/LargeBottleBufferPos.java

@@ -0,0 +1,15 @@
+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; //取样深度
+}

src/main/java/a8k/appbean/configparam/Plates2dCodeScanPos.java

@@ -0,0 +1,11 @@
+package a8k.appbean.configparam;
+
+/**
+ * 板夹仓扫码信息
+ */
+public class Plates2dCodeScanPos {
+	public Pos2d   ch0ScanPos; //通道1扫码位置
+	public Integer scanYInterval; //扫码间隔
+
+
+}

src/main/java/a8k/appbean/configparam/Pos2d.java

@@ -0,0 +1,13 @@
+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;
+	}
+
+}

src/main/java/a8k/appbean/configparam/Pos3d.java

@@ -0,0 +1,13 @@
+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;
+	}
+}

src/main/java/a8k/appbean/configparam/SampleZPosInfo.java

@@ -0,0 +1,17 @@
+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;//液面跟随速度
+}

src/main/java/a8k/appbean/configparam/SmallBottleBufferPos.java

@@ -0,0 +1,46 @@
+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; //探测物质吐液高度
+
+
+}

src/main/java/a8k/appbean/configparam/TubeSamplePos.java

@@ -0,0 +1,15 @@
+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
+}

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.Pos2d;
+import a8k.appbean.configparam.Pos2d;
 import a8k.appbean.appevent.A8kHardwareReport;
 import a8k.service.AppEventBusService;
 import a8k.utils.ByteArray;

src/main/java/a8k/service/db/dao/HbotControlParamsDao.java

@@ -1,6 +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;
 
 /**
  * XY机械臂控制相关参数访问
@@ -16,16 +20,16 @@ public class HbotControlParamsDao {
 	} //TIP组0 位置信息
 
 
-	SmallBottleBufferPosInfo getSmallBottleBufferPosInfo() {
+	SmallBottleBufferPos getSmallBottleBufferPosInfo() {
 		return null;
 	}//小瓶缓冲液位置
 
 
-	Plates2dCodeScanPosInfo getPlates2dCodeScanPosInfo() {
+	Plates2dCodeScanPos getPlates2dCodeScanPosInfo() {
 		return null;
 	}//反应板夹仓位置
 
-	LargeBottleBufferPosInfo getLargeBottleBufferPosInfo() {
+	LargeBottleBufferPos getLargeBottleBufferPosInfo() {
 		return null;
 	}//大瓶缓冲液位置