From 7bd81eba64232379e6623c595b57574df1e5446b Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期三, 28 八月 2024 23:10:11 +0800
Subject: [PATCH] 配置
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 8 +++++---
src/main/java/com/zy/core/model/protocol/CrnProtocol.java | 8 +++++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
index 0736d69..899367c 100644
--- a/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/CrnProtocol.java
@@ -194,6 +194,10 @@
* Z琛岃蛋绾块�熷害m/min
*/
private Float zSpeed;
+ /**
+ * Z琛岃蛋绾块�熷害m/min
+ */
+ private Float zSpeedTwo;
/**
* 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
@@ -290,7 +294,9 @@
public void setzSpeed(Short zSpeed) {
this.zSpeed = Float.valueOf(zSpeed);
}
-
+ public void setzSpeedTwo(Short zSpeedTwo) {
+ this.zSpeedTwo = Float.valueOf(zSpeedTwo);
+ }
public void setxDistance(Short xDistance) {
this.xDistance = Float.valueOf(xDistance);
}
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 76682f4..a693cc2 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -174,11 +174,13 @@
crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 26));
crnProtocol.setWalkPosTwo(siemensNet.getByteTransform().TransInt16(result.Content, 28));
crnProtocol.setLiftPos(siemensNet.getByteTransform().TransInt16(result.Content, 30));
- crnProtocol.setError1(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+ crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 32));
crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
- crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
- crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+ crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 42));
+ crnProtocol.setzSpeedTwo(siemensNet.getByteTransform().TransInt16(result.Content, 46));
+
+
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1