From aff3977ee493cfa7554792285100c7b6407e1d74 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 20 十二月 2023 13:34:43 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/resources/config.properties | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 1037320..4e420c3 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -100,7 +100,9 @@
#鎵爜鏋�
Parameter2.scanner=DB103.256,DB103.270
#鎬ュ仠
-Parameter2.stop=DB101.10.4
+Parameter2.stop=DB101.10.4,DB101.11.2
+
+Parameter2.timeout=DB100.194
#褰撳墠鏍煎瓙
Parameter2.Currentcell=DB103.32,DB103.34,DB103.36,DB103.40
@@ -153,7 +155,7 @@
#addresses.add("DB100.36");
#addresses.add("DB100.38");
#addresses.add("DB100.40");
-Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.36,DB100.38,DB100.40
+Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
#List<String> waddresses1 = new ArrayList<>();
#waddresses1.add("DB100.0");
@@ -169,4 +171,40 @@
#waddresses1.add("DB100.38");
#waddresses1.add("DB100.40");
-Auto.shusong=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
\ No newline at end of file
+Auto.shusong=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40
+
+
+#-----PlcPositioning1-------------------------
+PlcPositioning1.address=DB100.42
+
+#----------------PlcManualonePosition-----
+
+PlcManualonePosition.addresses=DB100.108,DB100.20,DB103.32
+
+PlcManualonePosition.addresses2=DB100.110,DB100.176,DB103.34
+
+PlcManualonePosition.addresses3=DB100.112,DB100.24,DB103.36
+
+PlcManualonePosition.addresses4=DB100.114,DB100.178,DB103.40
+
+
+#鏁呴殰
+PlcManualonePosition.fault=DB104.1.2,DB104.1.3,DB104.1.6,DB104.1.7
+
+#鏈洖闆�
+PlcManualonePosition.Notzero=DB104.9.4,DB104.9.5,DB104.9.4,DB104.9.5
+
+#鏁呴殰2
+PlcManualonePosition.fault2=DB103.252,DB103.254
+
+#澶嶄綅
+PlcManualonePosition.Reset=DB101.4.0,DB101.4.3,DB101.4.4,DB101.4.6
+#鍥為浂
+PlcManualonePosition.Zero=DB101.4.5,DB101.4.7
+
+
+
+
+
+
+
--
Gitblit v1.8.0