From 8f9fa425d667e3d6330a3ed4553834783bb30099 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 05 六月 2025 09:53:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index c4ff6b6..e1e2829 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -142,7 +142,7 @@
}
rgvProtocol.setMode((short) -1);
rgvProtocol.setStatus((short)-1);
- rgvProtocol.setTaskNo1(0);
+ rgvProtocol.setTaskNo1(1002);
rgvProtocol.setStatus1((short)-1);
rgvProtocol.setLoaded1((short)0);
rgvProtocol.setWalkPos((short)0);
@@ -151,11 +151,13 @@
// rgvProtocol.setStatus2((short)-1);
// rgvProtocol.setLoaded2((short)0);
rgvProtocol.setAlarm((short)0);
- rgvProtocol.setxSpeed((short) 0);
- rgvProtocol.setxDistance((short) 0);
- rgvProtocol.setxDuration((short) 0);
+ rgvProtocol.setXSpeed(0.0F);
+ rgvProtocol.setXDistance(0.0F);
+ rgvProtocol.setXDuration(0.0F);
rgvProtocol.setSouSta((short)0);
rgvProtocol.setEndSta((short)0);
+ rgvProtocol.setList32(new boolean[8]);
+ rgvProtocol.setRgvPos(8000);
}
@Override
@@ -195,14 +197,18 @@
rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
rgvProtocol.setRgvPos((int) siemensNet.getByteTransform().TransInt16(result.Content, 8));
rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
-// rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
-// rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+ rgvProtocol.setCode(siemensNet.getByteTransform().TransInt32(result.Content, 12));
rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 16));
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-// rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 20));
-// rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
-// rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
+ rgvProtocol.setXSpeed(siemensNet.getByteTransform().TransSingle(result.Content, 20));
+ rgvProtocol.setXDistance(siemensNet.getByteTransform().TransSingle(result.Content, 24));
+ rgvProtocol.setXDuration(siemensNet.getByteTransform().TransSingle(result.Content, 28));
+ rgvProtocol.setList32(siemensNet.getByteTransform().TransBool(result.Content, 32, 1));
+ rgvProtocol.setList33(siemensNet.getByteTransform().TransBool(result.Content, 33, 1));
+ rgvProtocol.setList34(siemensNet.getByteTransform().TransBool(result.Content, 34, 1));
+ rgvProtocol.setList35(siemensNet.getByteTransform().TransBool(result.Content, 35, 1));
+
+
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1