From ec82df0c678e39f7a85776b760c88f0aaf9d5847 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期四, 11 七月 2024 12:04:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ahyxwcs' into ahyxwcs
---
src/main/java/com/zy/core/thread/JarThread.java | 5 ++++-
1 files changed, 4 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 8fdd966..729dc64 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -133,9 +133,11 @@
jarProtocol.setLeftDoorClose(0);//close the left door //杩涙枡闂�
jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
+
+ jarProtocol.setJarTemperature(0);
return;
}
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 26);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 28);
if (result.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
@@ -167,6 +169,7 @@
jarProtocol.setMode((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 12));//妯″紡
jarProtocol.setJarErr((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 14));//寮傚父鐮�
jarProtocol.setStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 16));//鐘舵��
+ jarProtocol.setJarTemperature((int)siemensS7Net.getByteTransform().TransInt16(result.Content, 18));//娓╁害
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
--
Gitblit v1.9.1