From a519e1aa12852e5a6d53a8e1b9bbc095391e2415 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 21 三月 2024 13:12:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensRgvThread.java | 42 ++++++++++++++++++++----------------------
1 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensRgvThread.java b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
index e18a15d..6092901 100644
--- a/src/main/java/com/zy/core/thread/SiemensRgvThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensRgvThread.java
@@ -67,9 +67,9 @@
readStatus();
break;
// // 宸ヤ綅1銆�2鍐欏叆鏁版嵁
-// case 2:
-// write((RgvCommand) task.getData());
-// break;
+ case 2:
+ write((RgvCommand) task.getData());
+ break;
//宸ヤ綅1鍐欏叆鏁版嵁
case 4:
write1((RgvCommand) task.getData());
@@ -249,25 +249,23 @@
return false;
}
// convertRow(command);
- command.setRgvNo(slave.getId());
- short[] array = new short[11];
- array[0] = command.getAckFinish1();
- array[1] = command.getTaskNo1();
- array[2] = command.getTaskMode1();
- array[3] = command.getSourceStaNo1();
- array[4] = command.getDestinationStaNo1();
-// array[0] = command.getAckFinish1();
-// array[1] = command.getTaskNo1();
-// array[2] = command.getTaskMode1();
-// array[3] = command.getSourceStaNo1();
-// array[4] = command.getDestinationStaNo1();
-// array[5] = command.getAckFinish2();
-// array[6] = command.getTaskNo2();
-// array[7] = command.getTaskMode2();
-// array[8] = command.getSourceStaNo2();
-// array[9] = command.getDestinationStaNo2();
-// array[10] = command.getCommand();
- OperateResult result = siemensNet.Write("DB100.0", array);
+ OperateResult result = new OperateResult();
+ boolean[] array = new boolean[1];
+ array[0] = true;
+ if (command.isAuto()){
+ result = siemensNet.Write("DB99.0.1", array);
+ } else if (command.isRestoreTask()) {
+ result = siemensNet.Write("DB99.0.2", array);
+ }
+ else if (command.isCompTask()) {
+ result = siemensNet.Write("DB99.0.3", array);
+ }
+ else if (command.isStop()) {
+ result = siemensNet.Write("DB99.0.4", array);
+ }
+ else if (command.isReset()) {
+ result = siemensNet.Write("DB99.0.5", array);
+ }
// if (command.getAckFinish1() == 0 && command.getAckFinish2() == 0) {
// short commandFinish = 3; //宸ヤ綅1銆�2浠诲姟鍚屾椂鍐欏叆
--
Gitblit v1.9.1