From f2bcc69468fad1901486ab49a92dabdcdc89960f Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期四, 29 九月 2022 09:57:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d971acd..c665daf 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -42,9 +42,9 @@
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
- add(101);add(102);add(103);add(104);
- add(201);add(202);add(203);add(204);
- add(301);add(302);add(303);add(304);add(305);add(306);
+ add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);
+// add(201);add(202);add(203);add(204);
+// add(301);add(302);add(303);add(304);add(305);add(306);
}};
/**
@@ -52,6 +52,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;
@@ -76,6 +81,10 @@
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
write((StaProtocol)task.getData());
+ break;
+ //澶嶄綅娴嬭瘯淇″彿
+ case 3:
+ siemensS7Net.Write("DB100." + (150 + (int)task.getData()), 0);
break;
default:
break;
@@ -146,7 +155,7 @@
// }
// }
Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB150.0", (short) (staNoSize*2));
+ OperateResultExOne<byte[]> result1 = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
@@ -168,18 +177,26 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*12));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
+// String barcode=new String(result2.Content,i*12,12);
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
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