From f4904c7de38d0fed9b15ed8b52926bb6e8aceb9e Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期四, 14 九月 2023 17:03: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/S7control.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 2f92e4a..30ff968 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
@@ -42,7 +42,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓獁ord
- *
+ *
* @param address 鍦板潃
* @param data word鐨勫��
*/
@@ -56,7 +56,7 @@
/**
* 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜word
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
@@ -74,7 +74,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜word
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
@@ -92,7 +92,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆涓�涓狟it
- *
+ *
* @param address 鍦板潃
* @param data Bit鐨勫��
*/
@@ -104,7 +104,7 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 鍐欏叆澶氫釜bit
- *
+ *
* @param address 鍦板潃
* @param datas bit鐨勫��
*/
@@ -122,7 +122,7 @@
/**
* 浠庢煇鍦板潃杩炵画 鍐欏叆澶氫釜bit
- *
+ *
* @param address 鍦板潃
* @param datas word鐨勫��
*/
@@ -140,26 +140,26 @@
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
+ *
* @param address 鍦板潃
* @return 缁撴灉
*/
public List<Short> ReadWord(List<String> address) {
if (s7PLC==null)
- return new ArrayList<Short>();
+ return new ArrayList<Short>();
return s7PLC.readInt16(address);
}
/**
* 鎸夋寚瀹氱殑鍦板潃 璇诲彇word缁撴灉闆�
- *
+ *
* @param address 鍦板潃
* @param count 杩炵画璇诲灏戜釜word
* @return 缁撴灉
*/
public List<Short> ReadWord(String address, int count) {
if (s7PLC==null)
- return new ArrayList<Short>();
+ return new ArrayList<Short>();
List<String> addresslist = GetAddressList(address, count, 16);
return s7PLC.readInt16(addresslist);
@@ -173,7 +173,7 @@
*/
public List<Boolean> ReadBits(List<String> addresslist) {
if (s7PLC==null)
- return new ArrayList<Boolean>();
+ return new ArrayList<Boolean>();
return s7PLC.readBoolean(addresslist);
}
@@ -218,4 +218,4 @@
}
return addresslist;
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0