From ccdcd79a48aabb15d9ce9525a3535c01e69475c8 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期五, 31 十月 2025 11:34:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdwcs' into jshdwcs
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 159512d..0f8b410 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -170,8 +170,8 @@
private void readStatus(){
try {
OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) 56);
- OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 7);
- if (result.IsSuccess) {
+ OperateResultExOne<byte[]> resultErr = siemensNet.Read("DB64.0", (short) 6);
+ if (result.IsSuccess && resultErr.IsSuccess) {
if (null == crnProtocol) {
crnProtocol = new CrnProtocol();
crnProtocol.setCrnNo(slave.getId());
@@ -200,7 +200,7 @@
crnProtocol.setyDuration(siemensNet.getByteTransform().TransSingle(result.Content, 52));
- boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 7);
+ boolean[] statusSign = siemensNet.getByteTransform().TransBool(resultErr.Content, 0, 6);
crnProtocol.setIbDriveFault(statusSign[0]); // 琛岃蛋鍙橀鍣ㄦ晠闅�
crnProtocol.setIbSupplyFault(statusSign[1]); // 鎻愪緵鍙橀鍣ㄦ晠闅�
--
Gitblit v1.9.1