From 1ebc598658f85c07c7cbabaf289ab89838a8acc9 Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 08:54:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/S7control.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
index 3ae24aa..5caea97 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/S7control.java
@@ -90,6 +90,8 @@
s7PLC.writeMultiData(addressWrite);
}
+
+
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
*
@@ -137,6 +139,18 @@
}
s7PLC.writeMultiData(addressWrite);
}
+ /**
+ * 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜byte
+ *
+ * @param address 鍦板潃
+ * @param datas byte鐨勫��
+ */
+ public void WriteByte(String address, byte[] datas) {
+ if (s7PLC==null)
+ return;
+ // s7PLC.write(address, data);
+ s7PLC.writeByte(address, datas);
+ }
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
@@ -148,6 +162,56 @@
if (s7PLC==null)
return null;
return s7PLC.readInt16(address);
+ }
+
+ public List<Short> readWords(List<String> addresses) {
+ if (s7PLC == null) {
+ return null;
+ }
+
+ List<Short> data = new ArrayList<>();
+
+ for (String address : addresses) {
+ if (address.contains("-")) {
+ String[] range = address.split("-");
+ String startAddress = range[0];
+ String endAddress = range[1];
+
+ if (startAddress.equals(endAddress)) {
+ // 鍗曚釜鍦板潃
+ Short value = s7PLC.readInt16(startAddress);
+ data.add(value);
+ } else {
+ // 鑼冨洿鍦板潃
+ int startIndex = getIndexFromAddress(startAddress);
+ int endIndex = getIndexFromAddress(endAddress);
+
+ for (int i = startIndex; i <= endIndex; i++) {
+ String currentAddress = getAddressFromIndex(i);
+ Short value = s7PLC.readInt16(currentAddress);
+ data.add(value);
+ }
+ }
+ } else {
+ // 鍗曚釜鍦板潃
+ Short value = s7PLC.readInt16(address);
+ data.add(value);
+ }
+ }
+
+ return data;
+ }
+
+ private int getIndexFromAddress(String address) {
+
+ // 鍙互瑙ｆ瀽鍑哄湴鍧�涓殑鏁板瓧閮ㄥ垎锛屽苟杞崲涓烘暣鏁�
+ return 0;
+ }
+
+ private String getAddressFromIndex(int index) {
+
+ // 鏁存暟杞崲涓哄湴鍧�鏍煎紡鐨勫瓧绗︿覆
+ return "";
}
/**
@@ -164,6 +228,20 @@
List<String> addresslist = GetAddressList(address, count, 16);
return s7PLC.readInt16(addresslist);
}
+ /**
+ * 鎸夋寚瀹氱殑鍦板潃 璇诲彇byte缁撴灉闆�
+ *
+ * @param address 鍦板潃
+ * @param count 杩炵画璇诲灏戜釜byte
+ * @return 缁撴灉
+ */
+ public byte[] ReadByte(String address, int count) {
+ if (s7PLC==null)
+ return null;
+
+ // List<String> addresslist = GetAddressList(address, count, 16);
+ return s7PLC.readByte(address,count);
+ }
/**
* 鎸夋寚瀹氱殑鍦板潃 鎸塨it浣� 0 flase 1 true 璇诲彇缁撴灉
--
Gitblit v1.8.0