From 12ae82141c1d6ed1a55922aae128ccfefb5b35dd Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 24 一月 2024 13:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java | 51 +++++++++++++++++++++++++++++++--------------------
1 files changed, 31 insertions(+), 20 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
index 3ab528a..72d225b 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -64,7 +64,7 @@
addresses.add("DB100.116");
addresses.add("DB100.16");
- addresses.add("DB103.20");
+ addresses.add("DB106.2");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
// System.out.println(arraylist);
@@ -72,7 +72,7 @@
addresses2.add("DB100.118");
addresses2.add("DB100.192");
- addresses2.add("DB103.22");
+ addresses2.add("DB106.14");
List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);
List<String> addresses9 = new ArrayList<>();
@@ -124,6 +124,32 @@
short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(
A01readstart, A02readstart
);
+ // 鏁呴殰鍦板潃
+ List<String> waddresses3 = new ArrayList<>();
+ waddresses3.add("DB103.242");
+ waddresses3.add("DB103.248");
+
+ // 澶嶄綅鍦板潃
+ List<String> waddresses4 = new ArrayList<>();
+ waddresses4.add("DB101.3.6");
+ waddresses4.add("DB101.4.1");
+
+ // 鍥為浂鍦板潃
+ List<String> waddresses5 = new ArrayList<>();
+ waddresses5.add("DB101.3.7");
+ waddresses5.add("DB101.4.2");
+
+
+
+ List<Boolean> readreast = S7control.getinstance().readBits(waddresses4);
+ short[] reast6 = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(readreast);
+
+
+
+ List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses5);
+ short[] huiling7 = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);
+
+
JSONObject jsonObject = new JSONObject();
@@ -132,6 +158,9 @@
jsonObject.append("guzhang", params2);
jsonObject.append("weihuiling", params3);
jsonObject.append("qidong", combinedBinaryShortArray);
+ jsonObject.append("fuwei", reast6);
+ jsonObject.append("huiling", huiling7);
+
// System.out.println(jsonObject);
// WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");
// if (sendwServer != null) {
@@ -155,20 +184,6 @@
waddresses2.add("DB100.192");
- // 鏁呴殰鍦板潃
- List<String> waddresses3 = new ArrayList<>();
- waddresses3.add("DB103.242");
- waddresses3.add("DB103.248");
-
- // 澶嶄綅鍦板潃
- List<String> waddresses4 = new ArrayList<>();
- waddresses4.add("DB101.3.6");
- waddresses4.add("DB101.4.1");
-
- // 鍥為浂鍦板潃
- List<String> waddresses5 = new ArrayList<>();
- waddresses5.add("DB101.3.7");
- waddresses5.add("DB101.4.2");
if (!messages.isEmpty()) {
// 灏嗘渶鍚庝竴涓秷鎭浆鎹负 short 绫诲瀷鐨勫垪琛�
@@ -179,18 +194,14 @@
// A01涓嬪彂
customS7Control.WriteWordToPLC(messageArray, waddresses1, 0);
-
// A02涓嬪彂
customS7Control.WriteWordToPLC(messageArray, waddresses2, 1);
-
// 鍐欏叆鏁呴殰鍦板潃
customS7Control.WriteWordToPLC(messageArray, waddresses3, 2);
-
// 鍐欏叆澶嶄綅鍦板潃
customS7Control.writeBitToPLC(messageArray, waddresses4, 3);
-
// 鍐欏叆鍥為浂鍦板潃
customS7Control.writeBitToPLC(messageArray, waddresses5, 4);
--
Gitblit v1.8.0