From 473bc88e44ad3e60b207012130507824cb32f04a Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 10 一月 2024 16:19:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gdykwcs' into gdykwcs
---
src/main/java/com/zy/core/thread/RgvThread.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index 6c259f9..27b3fda 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -191,9 +191,9 @@
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.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
- rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
- rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
+// rgvProtocol.setTaskNo2(siemensNet.getByteTransform().TransInt16(result.Content, 14));
+// rgvProtocol.setStatus2(siemensNet.getByteTransform().TransInt16(result.Content, 16));
+// rgvProtocol.setLoaded2(siemensNet.getByteTransform().TransInt16(result.Content, 18));
rgvProtocol.setAlarm(siemensNet.getByteTransform().TransInt16(result.Content, 20));
rgvProtocol.setHeart(siemensNet.getByteTransform().TransInt16(result.Content, 22));
rgvProtocol.setTemp1(siemensNet.getByteTransform().TransInt16(result.Content, 24));
--
Gitblit v1.9.1