From 9ff1f1f221aeafc99653c846b2c2442f9c033ee5 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 11 十月 2022 08:08:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'gitbit/gzynwcs' into gzynwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 776219a..ea0e6b9 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);
}};
/**
@@ -53,10 +53,7 @@
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 int[] startSignal = new int[48];
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -84,7 +81,8 @@
break;
//澶嶄綅娴嬭瘯淇″彿
case 3:
- siemensS7Net.Write("DB100." + (150 + ((int)task.getData()) * 2), 0);
+ StaProtocol staProtocol = (StaProtocol)task.getData();
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
break;
default:
break;
@@ -155,7 +153,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); // 绔欑偣缂栧彿
@@ -177,10 +175,11 @@
}
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);
@@ -189,12 +188,11 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.150", (short) 8);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
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);
+ for(int i=0; i<48; i++){
+ startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+ }
}
// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
// if (result2.IsSuccess) {
@@ -237,7 +235,7 @@
return;
}
int index = staNos.indexOf(staProtocol.getSiteId());
- short[] array = new short[10];
+ short[] array = new short[2];
array[0] = staProtocol.getWorkNo();
array[1] = staProtocol.getStaNo();
OperateResult write = siemensS7Net.Write("DB100." + index*4, array);
--
Gitblit v1.9.1