Merge remote-tracking branch 'origin/master'

src/main/java/a8k/service/devicectrl/param/PosParam.java

@@ -67,27 +67,27 @@ public class PosParam {
 
 	@EnginnerPageParam(name = "抓手张开位置", group = "抓手", order = ORDER.getGripperOpenPos)
 	public Integer getGripperOpenPos() {
-		return hpReader.getInteger("GripperOpenPos", 300 + 150);
+		return hpReader.getInteger("GripperOpenPos", 450);
 	}
 
 	@EnginnerPageParam(name = "抓手闭合位置", group = "抓手", order = ORDER.getGripperClosePos)
 	public Integer getGripperClosePos() {
-		return hpReader.getInteger("GripperClosePos", 300 + 10);
+		return hpReader.getInteger("GripperClosePos", 310);
 	}
 
 	@EnginnerPageParam(name = "抓手取试管位置", group = "抓手", order = ORDER.getGripperTakeCapPos)
 	public Integer getGripperTakeCapPos() {
-		return hpReader.getInteger("GripperTakeCapPos", 300 + 55);
+		return hpReader.getInteger("GripperTakeCapPos", 355);
 	}
 
 	@EnginnerPageParam(name = "取试管位置", group = "抓手Y轴位置", order = ORDER.getGripperTakeTubeYPos)
 	public Integer getGripperTakeTubeYPos() {
-		return hpReader.getInteger("GripperTakeTubeYPos", 2750 + 300);
+		return hpReader.getInteger("GripperTakeTubeYPos", 3080);
 	}
 
 	@EnginnerPageParam(name = "摇匀位置", group = "抓手Y轴位置", order = ORDER.getGripperShakeYPos)
 	public Integer getGripperShakeYPos() {
-		return hpReader.getInteger("GripperShakeYPos", 1828 + 300);
+		return hpReader.getInteger("GripperShakeYPos", 2130);
 	}
 
 	@EnginnerPageParam(name = "待机位", group = "抓手Y轴位置", order = ORDER.getGripperZeroYPos)
@@ -103,7 +103,7 @@ public class PosParam {
 
 	@EnginnerPageParam(name = "取低试管位置", group = "抓手Z轴位置", order = ORDER.getGripperTakeSTubeZPos)
 	public Integer getGripperTakeSTubeZPos() {
-		return hpReader.getInteger("GripperTakeSTubeZPos", 985);
+		return hpReader.getInteger("GripperTakeSTubeZPos", 983);
 	}
 
 	//JudgeTubeCapZ
@@ -147,7 +147,7 @@ public class PosParam {
 
 	@EnginnerPageParam(name = "入料X位置", group = "进出料<试管架>坐标", order = ORDER.getTREnterXPos)
 	public Integer getTREnterXPos() {
-		return hpReader.getInteger("TREnterXPos", -51);
+		return hpReader.getInteger("TREnterXPos", -46);
 	}
 
 	@EnginnerPageParam(name = "出料X位置", group = "进出料<试管架>坐标", order = ORDER.getTRExitXPos)
@@ -182,7 +182,7 @@ public class PosParam {
 	@EnginnerPageParam(name = "试管预处理位置", group = "进出料<试管位置>信息", order = ORDER.getTPreProcessXPos)
 	public Integer getTPreProcessXPos() {
 		//运动方向:  <-
-		return hpReader.getInteger("TPreProcessXPos", 1244);
+		return hpReader.getInteger("TPreProcessXPos", 1225);
 	}
 
 	@EnginnerPageParam(name = "试管架孔间距", group = "其他", order = ORDER.getTubeSpacing)

src/main/resources/application-zhaohe_pc.yml

@@ -3,7 +3,7 @@ server :
 
 spring:
   datasource:
-    url: jdbc:sqlite:D:/java_workspace/a8000/zhaohe_app.db
+    url: jdbc:sqlite:D:/java_workspace/a8000/app.db
     driver-class-name: org.sqlite.JDBC
 
 device: