From 57dedbc7319aefb50452c0a9668facf58852518f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期一, 04 九月 2023 19:05:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index eff1a19..1b4d471 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,7 +45,7 @@
add(101);add(102);add(103);add(104);
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(105);
+ add(213);add(105);add(1000);
}};
/**
@@ -206,14 +206,14 @@
Thread.sleep(200);
//娴嬭瘯鏌滅姸鎬佽幏鍙�
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 96);
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB38.0", (short) 48);
//鍚姩绉诲簱鎸夐挳
OperateResultExOne<byte[]> result6 = siemensS7Net.Read("DB102.0", (short) 96);
//娑堥槻鎶ヨ
- OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 48);
+ OperateResultExOne<byte[]> result4 = siemensS7Net.Read("DB108.0", (short) 96);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
- startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i*2);//娴嬭瘯鏌滅姸鎬�
+ startSignal[i][0] = siemensS7Net.getByteTransform().TransByte(result3.Content, i);//娴嬭瘯鏌滅姸鎬�
startSignal[i][1] = siemensS7Net.getByteTransform().TransBool(result4.Content, i)?1:0;//娑堥槻鐘舵��
startSignal[i][2] = siemensS7Net.getByteTransform().TransInt16(result6.Content, i*2);//鍚姩鎸夐挳鐘舵��
}
@@ -288,11 +288,17 @@
boolean idFlag = false;
OperateResult write;
while(idCount < 5){
+
write = siemensS7Net.Write("DB100." + index*4, array); // 鍐�
if(write.IsSuccess){
Thread.sleep(200);
- OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB101.0", (short) (staNoSize*2));
- if(readId.IsSuccess){
+ OperateResultExOne<byte[]> readId = siemensS7Net.Read("DB100." + index*4, (short) (staNoSize*2));
+ if(readId.IsSuccess){
+ if(staProtocol.getWorkNo()!=0&&staProtocol.getWorkNo()!=9999){
+ if(!staProtocol.isInEnable()&&(staProtocol.getSiteId()==201||staProtocol.getSiteId()==206)){
+ break;
+ }
+ }
short workNo = siemensS7Net.getByteTransform().TransInt16(readId.Content, 0);
if(staProtocol.getWorkNo().equals(workNo)){
//宸ヤ綔鍙峰啓鍏ユ垚鍔�
--
Gitblit v1.9.1