From 1310ca11b7aec973c6d75f986fb980b2446baafe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 20 八月 2020 15:40:40 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/CrnThread.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/CrnThread.java b/src/main/java/com/zy/core/thread/CrnThread.java
index 06b844e..148a3e5 100644
--- a/src/main/java/com/zy/core/thread/CrnThread.java
+++ b/src/main/java/com/zy/core/thread/CrnThread.java
@@ -130,14 +130,17 @@
             // 寮傚父淇℃伅
             crnProtocol.setError1(siemensNet.getByteTransform().TransBool(result.Content, 22, 2));
             crnProtocol.setError2(siemensNet.getByteTransform().TransBool(result.Content, 24, 2));
-            crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 28));
-            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 32));
-            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 36));
-            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 40));
-            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 44));
-            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 48));
-            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
+            crnProtocol.setError3(siemensNet.getByteTransform().TransBool(result.Content, 26, 2));
+            crnProtocol.setError4(siemensNet.getByteTransform().TransBool(result.Content, 28, 2));
+            crnProtocol.setError5(siemensNet.getByteTransform().TransBool(result.Content, 30, 2));
+            crnProtocol.setError6(siemensNet.getByteTransform().TransBool(result.Content, 32, 2));
+            crnProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 34));
+            crnProtocol.setYSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 38));
+            crnProtocol.setZSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 42));
+            crnProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 46));
+            crnProtocol.setYDistance(siemensNet.getByteTransform().TransSingle(result.Content, 50));
+            crnProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 54));
+            crnProtocol.setYDuration(siemensNet.getByteTransform().TransSingle(result.Content, 58));
 
             /**
              *   褰撹鍒皊tatus == 90.浠诲姟瀹屾垚绛夊緟WCS纭 鏃�

--
Gitblit v1.9.1