From 3c01fbc988ff90ef1f195232beb98c7776d47277 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 23 十一月 2024 14:25:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index 6b8c207..8790090 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -122,6 +122,7 @@
jarProtocol = new JarProtocol();
jarProtocol.setJarNo(slave.getId());
}
+ jarProtocol.setJarNo(slave.getId());
jarProtocol.setMode(2);//妯″紡
jarProtocol.setStatus((short)0);//鐘舵��
jarProtocol.setAutoing(true);//鑷姩
@@ -138,11 +139,13 @@
return;
}
OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
- if (result.IsSuccess) {
+ OperateResultExOne<byte[]> result338 = siemensS7Net.Read("V338", (short) 4);
+ if (result.IsSuccess && result338.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
jarProtocol.setJarNo(slave.getId());
}
+ jarProtocol.setJarNo(slave.getId());
if (slave.getId() == 1 || slave.getId() == 3){
jarProtocol.setRightDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 0) != 0);//宸﹂棬鐘舵�� //鍑烘枡闂�
jarProtocol.setLeftDoor(siemensS7Net.getByteTransform().TransInt16(result.Content, 2) != 0);//鍙抽棬鐘舵�� //杩涙枡闂�
@@ -171,6 +174,8 @@
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
+ jarProtocol.setJarPressure(siemensS7Net.getByteTransform().TransSingle(result338.Content, 0));//鍘嬪姏
+
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
//
--
Gitblit v1.9.1