From 0f3ea8b9dd921b942015d30c5dfce06af25cd71c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期三, 13 十二月 2023 09:15:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java | 62 ++++++++-----------------------
1 files changed, 16 insertions(+), 46 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
index 1d685d8..819e14e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition.java
@@ -16,6 +16,14 @@
config = new Configuration("config.properties");
}
+
+
+ // 鍒涘缓涓�涓嚜瀹氫箟鐨� S7 鎺у埗鍣ㄦ秷鎭鐞嗗櫒瀵硅薄
+ MessageHandler customS7Control = new MessageHandler();
+
+
+
+
public static class PLCBooleanConverter {
public static short[] convertListsToBinaryShortArray(List<Boolean>... lists) {
@@ -247,18 +255,6 @@
}
if (!sValue.isEmpty()) {
S7control.getinstance().WriteWord(waddresses1, sValue);
- if (A01readstart != null && !A01readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> a01startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : A01readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- a01startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(A01start, a01startval);
- System.out.println("a01startval " + a01startval + " written to PLC at address " + A01start);
- }
System.out.println("Values " + sValue + " written to PLC at address " + waddresses1);
@@ -286,17 +282,7 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses2, sValue2);
- if (A02readstart != null && !A02readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> a02startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : A02readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- a02startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(A02start, a02startval);
- }
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses2);
@@ -323,17 +309,7 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses3, sValue2);
- if (B01readstart != null && !B01readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> b01startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : B01readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- b01startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(B01start, b01startval);
- }
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses3);
}
}
@@ -358,18 +334,7 @@
}
if (!sValue2.isEmpty()) {
S7control.getinstance().WriteWord(waddresses4, sValue2);
- if (B02readstart != null && !B02readstart.isEmpty()) {
- // 鍒涘缓涓�涓柊鐨勫垪琛ㄧ敤浜庡啓鍏ユ柊鍊�
- List<Boolean> b02startval = new ArrayList<>();
- // 閬嶅巻鎵�鏈夎鍙栧埌鐨勪綅鍊�
- for (Boolean bit : B02readstart) {
- // 鍙栧弽褰撳墠浣嶇殑鍊煎苟娣诲姞鍒版柊鐨勫垪琛ㄤ腑
- b02startval.add(!bit);
- }
- // 鍐欏叆鏂扮殑浣嶅�煎垪琛�
- S7control.getinstance().WriteBit(B02start, b02startval);
- System.out.println("Values " + b02startval + " written to PLC at address " + B02start);
- }
+
System.out.println("Values " + sValue2 + " written to PLC at address " + waddresses4);
}
}
@@ -446,6 +411,11 @@
}
}
+ customS7Control.writeBitToPLC( messageArray, A01start,7);
+ customS7Control.writeBitToPLC( messageArray, A02start,8);
+ customS7Control.writeBitToPLC( messageArray,B01start,9);
+ customS7Control.writeBitToPLC( messageArray, B02start,10);
+
// 娓呯┖娑堟伅鍒楄〃
webserver.clearMessages();
}
--
Gitblit v1.8.0