From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 05 十月 2025 10:35:32 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/MelsecCrnThread.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/MelsecCrnThread.java b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
index 14d520f..12f2e71 100644
--- a/src/main/java/com/zy/core/thread/MelsecCrnThread.java
+++ b/src/main/java/com/zy/core/thread/MelsecCrnThread.java
@@ -126,13 +126,13 @@
crnProtocol.setWalkPos((short)0);
crnProtocol.setLoaded((short)0);
crnProtocol.setAlarm((short)0);
- crnProtocol.setxSpeed((short)0);
- crnProtocol.setySpeed((short)0);
- crnProtocol.setzSpeed((short)0);
- crnProtocol.setxDistance((short)0);
- crnProtocol.setyDistance((short)0);
- crnProtocol.setxDuration((short)0);
- crnProtocol.setyDuration((short)0);
+ crnProtocol.setxSpeed((float)0);
+ crnProtocol.setySpeed((float)0);
+ crnProtocol.setzSpeed((float)0);
+ crnProtocol.setxDistance((float)0);
+ crnProtocol.setyDistance((float)0);
+ crnProtocol.setxDuration((float)0);
+ crnProtocol.setyDuration((float)0);
}
@Override
@@ -183,13 +183,13 @@
crnProtocol.setTemp2(melsecMcNet.getByteTransform().TransInt16(result.Content, 22));
crnProtocol.setTemp3(melsecMcNet.getByteTransform().TransInt16(result.Content, 24));
crnProtocol.setTemp4(melsecMcNet.getByteTransform().TransInt16(result.Content, 26));
- crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
- crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
- crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
- crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
- crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
- crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
- crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
+// crnProtocol.setxSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 28));
+// crnProtocol.setySpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 32));
+// crnProtocol.setzSpeed(melsecMcNet.getByteTransform().TransInt16(result.Content, 36));
+// crnProtocol.setxDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 40));
+// crnProtocol.setyDistance(melsecMcNet.getByteTransform().TransInt16(result.Content, 44));
+// crnProtocol.setxDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 48));
+// crnProtocol.setyDuration(melsecMcNet.getByteTransform().TransInt16(result.Content, 52));
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1