From c6ac4fcda65f2033dbf4d0cfb57fc32cdd3eee2f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十一月 2022 14:42:09 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/SteProtocol.java |    6 ++++++
 src/main/java/com/zy/core/thread/SiemensDevpThread.java   |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/core/model/protocol/SteProtocol.java b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
index 036a718..ceeaeeb 100644
--- a/src/main/java/com/zy/core/model/protocol/SteProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/SteProtocol.java
@@ -70,6 +70,12 @@
      */
     public Float charge = 0.0F;
 
+    public void setCharge(Float charge) {
+        if (charge >= 0) {
+            this.charge = charge;
+        }
+    }
+
     /**
      * 婊$數
      */
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 613b9d7..69a088e 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -164,7 +164,7 @@
 
         // 鍏呯數淇″彿浣�
         Thread.sleep(100);
-        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.50", (short)1);
+        OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.128", (short)1);
         if (result3.IsSuccess) {
             boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, 0, 1);
             charge0 = status[0];

--
Gitblit v1.9.1