From cd87c057ec64e917105bd85e4f562b54f7b165d7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 17:31:26 +0800
Subject: [PATCH] 堆垛机任务下发优化

---
 src/main/java/com/zy/core/thread/SiemensCrnThread.java |   36 ++++++++++++++++++++++++++++--------
 1 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 2701a91..70fac4b 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -182,13 +182,32 @@
 //            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().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));
+            if(slave.getId()==3){
+//                crnProtocol.setXSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 28));
+//                crnProtocol.setYSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 30));
+//                crnProtocol.setZSpeed((float) siemensNet.getByteTransform().TransInt16(result.Content, 32));
+//                crnProtocol.setXDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 34));
+//                crnProtocol.setYDistance((float) siemensNet.getByteTransform().TransInt16(result.Content, 36));
+//                crnProtocol.setXDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 38));
+//                crnProtocol.setYDuration((float) siemensNet.getByteTransform().TransInt16(result.Content, 40));
+                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));
+
+            }else{
+                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));
+
+            }
 
 
 
@@ -395,7 +414,8 @@
         OperateResult result18 = siemensNet.Write("DB100.18", (short)0);
         Thread.sleep(100L);
         OperateResult result = siemensNet.Write("DB100.0", array);
-
+        Thread.sleep(100L);
+        OperateResult result1 = siemensNet.Write("DB100.10", 1);
         int i=0;
         do{
             //鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�

--
Gitblit v1.9.1