From 4e6c566128bc0430d28e204672d54f0efcb4713d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 30 三月 2025 11:04:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/core/thread/RgvThread.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/RgvThread.java b/src/main/java/com/zy/core/thread/RgvThread.java
index f384975..496ec77 100644
--- a/src/main/java/com/zy/core/thread/RgvThread.java
+++ b/src/main/java/com/zy/core/thread/RgvThread.java
@@ -105,6 +105,7 @@
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
}
+ rgvProtocol.setRgvNo(slave.getId());
rgvProtocol.setMode((short) -1);
rgvProtocol.setStatus((short)-1);
rgvProtocol.setTaskNo1((short)0);
@@ -147,11 +148,14 @@
private void readStatus(){
try {
OperateResultExOne<byte[]> result = siemensNet.Read("DB100.0", (short) 20);
+ OperateResultExOne<byte[]> resultV = siemensNet.Read("DB20.16", (short) 2);
+ OperateResultExOne<byte[]> resultE = siemensNet.Read("DB20.26", (short) 2);
if (result.IsSuccess) {
if (null == rgvProtocol) {
rgvProtocol = new RgvProtocol();
rgvProtocol.setRgvNo(slave.getId());
}
+ rgvProtocol.setRgvNo(slave.getId());
rgvProtocol.setMode(siemensNet.getByteTransform().TransInt16(result.Content, 2));
rgvProtocol.setStartSta(siemensNet.getByteTransform().TransInt16(result.Content, 4));
rgvProtocol.setEndSta(siemensNet.getByteTransform().TransInt16(result.Content, 6));
@@ -160,6 +164,8 @@
rgvProtocol.setStatus(siemensNet.getByteTransform().TransInt16(result.Content, 12));
rgvProtocol.setxSpeed(siemensNet.getByteTransform().TransInt16(result.Content, 14));
rgvProtocol.setRgvPos(siemensNet.getByteTransform().TransUInt32(result.Content, 16));
+ rgvProtocol.setInstantaneousSpeed(Double.valueOf(siemensNet.getByteTransform().TransInt16(resultV.Content, 0)));
+ rgvProtocol.setEndStaM(siemensNet.getByteTransform().TransInt16(resultE.Content, 0));
// rgvProtocol.setRgvPos((long)NumUtils.GetRandomIntInRange(1737000));
OutputQueue.RGV.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -210,9 +216,13 @@
array[3] = command.getTaskMode1();//浠诲姟妯″紡
array[4] = command.getTaskNo1();
+
+
OperateResult result = siemensNet.Write("DB24.0", array);
if (command.getAckFinish1().equals((short)0)) {
+// Thread.sleep(100L);
+ siemensNet.Write("DB24.10.7", command.getRgvSome() == 1);
Thread.sleep(100L);
result = siemensNet.Write("DB24.10.0", true);
} else {
--
Gitblit v1.9.1