From ca96d16cd7f9ea52c4bb1c893066cf244cda09ca Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 25 四月 2024 08:10:24 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 211c5dd..ab70f5b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -158,7 +158,7 @@
      */
     private void readStatus(){
         try {
-            OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
+            OperateResultExOne<byte[]> result = siemensNet.Read("DB91.0", (short) 52);
             if (result.IsSuccess) {
                 if (null == crnProtocol) {
                     crnProtocol = new CrnProtocol();
@@ -174,17 +174,29 @@
                 crnProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 14));
                 crnProtocol.setLoaded(siemensNet.getByteTransform().TransInt16(result.Content, 16));
                 crnProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+
+//                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
+//                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 32));
+//                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+                crnProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 34));
+                crnProtocol.setySpeed(siemensNet.getByteTransform().TransInt16(result.Content, 36));
+                crnProtocol.setzSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 38));
+
+//                crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
+//                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+//                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
                 crnProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
-                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 44));
-                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
-                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 52));
+                crnProtocol.setyDistance(siemensNet.getByteTransform().TransInt16(result.Content, 42));
+                crnProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 44));
+                crnProtocol.setyDuration(siemensNet.getByteTransform().TransInt16(result.Content, 46));
+
+
+//                crnProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 20));
+//                crnProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 22));
+//                crnProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 24));
+//                crnProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+
+
 
                 OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
 
@@ -258,12 +270,12 @@
 //        array[9] = command.getSourceStaNo();
 //        array[10] = command.getDestinationStaNo();
         array[9] = command.getCommand();
-        OperateResult result = siemensNet.Write("DB100.0", array);
+        OperateResult result = siemensNet.Write("DB90.0", array);
 
         if (command.getAckFinish() == 0) {
             short commandFinish = 1;
             Thread.sleep(100L);
-            result = siemensNet.Write("DB100.18", commandFinish);
+            result = siemensNet.Write("DB90.18", commandFinish);
         }
 
         try {

--
Gitblit v1.9.1