From 7d9b1890d255df2383f85691ac92a4018074cdad Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 18:24:14 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index b3ca0b2..e13b1bc 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -242,10 +242,11 @@
News.error("SiemensCrn"+" - 6"+" - 鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
+ System.out.println("------------------");
System.out.println(command);
// convertRow(command);
command.setCrnNo(slave.getId());
- short[] array = new short[17];
+ short[] array = new short[16];
array[0] = command.getTaskNo();
array[1] = command.getTaskMode();
array[2] = command.getSourcePosX();
@@ -270,8 +271,6 @@
log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
-
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
Thread.sleep(200);
@@ -333,19 +332,19 @@
if (command.getAckFinish() == 0) {
short commandFinish = 1;
Thread.sleep(100L);
- result = siemensNet.Write("DB100.18", commandFinish);
+ result = siemensNet.Write("DB100.30", commandFinish);
int signFinish = 1;
while (signFinish<5){
- OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.18", (short) 2);
+ OperateResultExOne<byte[]> result10018 = siemensNet.Read("DB100.30", (short) 2);
short transInt16 = siemensNet.getByteTransform().TransInt16(result10018.Content, 0);
if (transInt16 != commandFinish){
- log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
+ log.info("涓嬪彂DB100.30 鍥炶澶辫触" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.30 鍥炶澶辫触" + "array:"+ JSON.toJSONString(array));
result = siemensNet.Write("DB100.18", commandFinish);
signFinish++;
}else {
- log.info("涓嬪彂DB100.18" + "commandFinish:"+commandFinish);
- log.info("涓嬪彂DB100.18" + "array:"+ JSON.toJSONString(array));
+ log.info("涓嬪彂DB100.30" + "commandFinish:"+commandFinish);
+ log.info("涓嬪彂DB100.30" + "array:"+ JSON.toJSONString(array));
break;
}
}
--
Gitblit v1.9.1