From b8c41a54d3c1ce563b30406ad5d132352f8a30aa Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 17:01:05 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index d80a469..6e66638 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(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);
+ add(201);add(202);add(203);add(204);add(205);add(206);
+ add(207);add(208);add(209);add(210);add(211);add(212);
+ add(213);add(101);add(102);add(103);add(104);
}};
/**
@@ -53,7 +53,7 @@
private int barcodeSize = 1;
public IoModeType ioMode = IoModeType.NONE;
- public int[] startSignal = new int[48];
+ public int[][] startSignal = new int[48][2];
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -82,7 +82,7 @@
//澶嶄綅娴嬭瘯淇″彿
case 3:
StaProtocol staProtocol = (StaProtocol)task.getData();
- siemensS7Net.Write("DB200." + staProtocol.getSiteId(), staProtocol.getStaNo());
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
break;
default:
break;
@@ -175,10 +175,10 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*12));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB100.190",(short)(barcodeSize*6));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*12,12, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*6,6, "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)) {
@@ -189,9 +189,11 @@
Thread.sleep(200);
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB102.0", (short) 96);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
- startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+ startSignal[i][0] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
+ startSignal[i][1] = siemensS7Net.getByteTransform().TransInt16(result4.Content, i*2);
}
}
// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
--
Gitblit v1.9.1