From ef63958fa8c4667de0d6ca7680c4a10792ebee38 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 22 五月 2023 09:57:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnwcs' into zjfnwcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 6a84bae..6e66638 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -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;
@@ -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