From 0df958a7911eca72bf4d822b30fc1eb7c10d8e4c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 30 八月 2024 18:34:31 +0800
Subject: [PATCH] 对照协议调整
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 2a19974..57dd5a6 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -242,9 +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();
@@ -259,7 +261,8 @@
array[11] = command.getDestinationPosXTwo();
array[12] = command.getDestinationPosYTwo();
array[13] = command.getDestinationPosZTwo();
- array[14] = command.getCommand();
+ //array[14] = command.getCommand();
+ array[14] = 1;
array[15] = command.getAckFinish();
// array[9] = command.getSourceStaNo();
@@ -269,8 +272,6 @@
log.info("鍫嗗灈鏈哄懡浠や笅鍙慬id:{}] >>>>> {}", slave.getId(), array);
-
-
//鍫嗗灈鏈轰换鍔″啓鍏ュ悗锛屽洖璇讳竴娆★紝鐪嬫槸鍚︽垚鍔�
Thread.sleep(200);
@@ -284,7 +285,7 @@
writeCount++;
continue;
}
- OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 24);
+ OperateResultExOne<byte[]> resultRead = siemensNet.Read("DB100.0", (short) 32);
if (resultRead.IsSuccess) {
CrnCommand one = new CrnCommand();
one.setTaskNo(siemensNet.getByteTransform().TransInt16(resultRead.Content, 2));
@@ -332,19 +333,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