From 96868c07fba2beda4a33d4789abe43e01bafc61b Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期一, 26 九月 2022 14:34:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 8fceff3..539a299 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -8,13 +8,9 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
-import com.google.common.base.Utf8;
-import com.sun.xml.internal.bind.v2.runtime.output.Encoded;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
import com.zy.core.DevpThread;
-import com.zy.core.Slave;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
import com.zy.core.cache.SlaveConnection;
@@ -25,7 +21,6 @@
import com.zy.core.model.protocol.StaProtocol;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -58,6 +53,11 @@
private int barcodeSize = 1;
public IoModeType ioMode = IoModeType.NONE;
+ public int startSignal1 = 0;
+ public int startSignal2 = 0;
+ public int startSignal3 = 0;
+ public int startSignal4 = 0;
+
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
}
@@ -81,6 +81,10 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
+ break;
+ //澶嶄綅娴嬭瘯淇″彿
+ case 3:
+ siemensS7Net.Write("DB100." + (150 + (int)task.getData()), 0);
break;
default:
break;
@@ -182,9 +186,16 @@
barcodeThread.setBarcode(barcode);
}
}
-
}
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.150", (short) 8);
+ if(result3.IsSuccess) {
+ startSignal1 = siemensS7Net.getByteTransform().TransInt16(result.Content, 0);
+ startSignal2 = siemensS7Net.getByteTransform().TransInt16(result.Content, 2);
+ startSignal3 = siemensS7Net.getByteTransform().TransInt16(result.Content, 4);
+ startSignal4 = siemensS7Net.getByteTransform().TransInt16(result.Content, 6);
+ }
// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
// if (result2.IsSuccess) {
// this.ioMode = IoModeType.get(result2.Content);
--
Gitblit v1.9.1