From 97642f31e88b8486af715855b5801265da319aac Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 16 七月 2024 20:45:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/JarThread.java | 6 +++---
src/main/java/com/zy/core/model/protocol/JarProtocol.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/model/protocol/JarProtocol.java b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
index 41b0859..9fdd2cb 100644
--- a/src/main/java/com/zy/core/model/protocol/JarProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/JarProtocol.java
@@ -109,7 +109,7 @@
* */
public Integer rightDoorClose;
- public Integer jarTemperature;
+ public Float jarTemperature;
/**
diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java
index faf68c1..123fcc9 100644
--- a/src/main/java/com/zy/core/thread/JarThread.java
+++ b/src/main/java/com/zy/core/thread/JarThread.java
@@ -134,10 +134,10 @@
jarProtocol.setRightDoorOpen(0);//open the right door //鍑烘枡闂�
jarProtocol.setRightDoorClose(0);//close the right door //鍑烘枡闂�
- jarProtocol.setJarTemperature(0);
+ jarProtocol.setJarTemperature(0.0F);
return;
}
- OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 28);
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("V300", (short) 30);
if (result.IsSuccess) {
if (null == jarProtocol) {
jarProtocol = new JarProtocol();
@@ -169,7 +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, 26));//娓╁害
+ jarProtocol.setJarTemperature(siemensS7Net.getByteTransform().TransSingle(result.Content, 26));//娓╁害
jarProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, 12) == 2);//鑷姩
--
Gitblit v1.9.1