From ea242c8b2c7456b86e2b1196744d89ba6a660bc1 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 17 五月 2023 16:29:03 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index c665daf..d43f01b 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,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][2];
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
@@ -84,7 +81,8 @@
break;
//澶嶄綅娴嬭瘯淇″彿
case 3:
- siemensS7Net.Write("DB100." + (150 + (int)task.getData()), 0);
+ StaProtocol staProtocol = (StaProtocol)task.getData();
+ siemensS7Net.Write("DB102.0" + staProtocol.getSiteId(), staProtocol.getStaNo());
break;
default:
break;
@@ -190,12 +188,13 @@
}
Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB100.150", (short) 8);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
+ OperateResultExOne<byte[]> result4 = 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][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");
// if (result2.IsSuccess) {
@@ -238,7 +237,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