From f895522bda8f02e42cad121d19c48c45caa676bc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 12:45:45 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index f77c5a8..e18a15d 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -137,7 +137,7 @@
rgvProtocol.setStatus1((short)-1);
rgvProtocol.setLoaded1((short)0);
rgvProtocol.setWalkPos((short)0);
- rgvProtocol.setRgvPos((short)0);
+ rgvProtocol.setRgvPos(0);
// rgvProtocol.setTaskNo2((short)0);
// rgvProtocol.setStatus2((short)-1);
// rgvProtocol.setLoaded2((short)0);
@@ -172,32 +172,21 @@
*/
private void readStatus(){
try {
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 30);
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 30);
if (result.IsSuccess) {
if (null == rgvProtocol || rgvProtocol.getRgvNo() == null) {
rgvProtocol = new RgvProtocol();
rgvProtocol.setRgvNo(slave.getId());
}
rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 0));
- rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 2));
- rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 4));
- rgvProtocol.setStatus1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
- rgvProtocol.setLoaded1(siemensNet.getByteTransform().TransInt16(result.Content, 8));
- rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt16(result.Content, 10));
- rgvProtocol.setWalkPos(siemensNet.getByteTransform().TransInt16(result.Content, 12));
- rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 14));
-// rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 18));
-// rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
- rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 22));
-// rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
- rgvProtocol.setTemp2(siemensNet.getByteTransform().TransInt16(result.Content, 26));
-// rgvProtocol.setTemp3(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-// rgvProtocol.setTemp4(siemensNet.getByteTransform().TransInt16(result.Content, 30));
-// rgvProtocol.setTemp5(siemensNet.getByteTransform().TransInt16(result.Content, 32));
-// rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 28));
-// rgvProtocol.setxDistance(siemensNet.getByteTransform().TransInt16(result.Content, 40));
-// rgvProtocol.setxDuration(siemensNet.getByteTransform().TransInt16(result.Content, 48));
+ rgvProtocol.setSouSta(siemensNet.getByteTransform().TransInt16(result.Content, 2));
+ rgvProtocol.setEndSta(siemensNet.getByteTransform().TransInt16(result.Content, 4));
+ rgvProtocol.setTaskNo1(siemensNet.getByteTransform().TransInt16(result.Content, 6));
+ rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 8));
+ rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 10));
+ rgvProtocol.setSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 12));
+ rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransInt32(result.Content, 14));
+
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛", DateUtils.convert(new Date()), slave.getId()));
--
Gitblit v1.9.1