From 7f1806c6a01318f3b1eff38da7c7c41ae82ff8c0 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 11 十二月 2023 13:19:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/resources/config.properties |  111 +++++++++++++++++++++++++++----------------------------
 1 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/springboot-vue3/src/main/resources/config.properties b/springboot-vue3/src/main/resources/config.properties
index 724a48a..7d251cb 100644
--- a/springboot-vue3/src/main/resources/config.properties
+++ b/springboot-vue3/src/main/resources/config.properties
@@ -1,57 +1,56 @@
-#PlcServoManualone 鍦板潃 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-# A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
-A01.addresses=DB103.32,DB100.144,DB100.184,DB100.186,DB100.180,DB100.182
-# A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
-A02.addresses=DB103.26,DB100.188,DB100.190,DB100.146
-# A01缈昏浆鍦板潃
-A01.flipAddress=DB103.42
-# A02缈昏浆鍦板潃
-A02.flipAddress=DB103.46
-# B01缁勫悎涓湴鍧�
-B01.address=DB103.27
-# B02缁勫悎鍦板潃
-B02.address=DB103.29
-# 鎵�鏈夋晠闅滄寜閽湴鍧�
-faultButtonAddresses=DB104.1.4,DB104.1.5,DB104.1.2,DB104.1.3,DB104.1.6,DB104.1.7
-# 澶嶄綅鎸夐挳鍦板潃
-resetButtonAddresses=DB101.4.0,DB101.4.3,DB101.3.6,DB101.4.1,DB101.4.4,DB101.4.6
-# 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
-notHomedButtonAddresses=DB104.9.0,DB104.9.1,DB104.9.4,DB104.9.5
-# 杩涚墖id鍦板潃
-
-inputGlassIdAddress=DB100.148
-# 瀛樼墖id鍦板潃
-outputGlassIdAddress=DB100.162
-#鍥為浂鎸夐挳鍦板潃
-HomedButtonAddresses=DB101.3.7,DB101.4.2,DB101.4.5,DB101.4.7
-#A02start
-A02start=DB101.5.1
-#A01start
-A01start=DB101.5.0
-#A02start
-A02Bstart=DB101.11.1
-#A01start
-A01Bstart=DB101.11.0
-#abort/resumeTasks
-abortresumeTasks=DB101.10.4
-#------------------------------------------------------------
-
-
-#A02start
-mlp.A02start=DB101.2.3
-#A01start
-mlp.A01start=DB101.2.2
-#A02start
-mlp.B02start=DB101.2.5
-#A01start
-mlp.B01start=DB101.2.4
-
-#--------------------------
-#A02start
-mlp2.A02start=DB101.2.1
-#A01start
-mlp2.A01start=DB101.2.0
-
-
-
+#PlcServoManualone 鍦板潃 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+# A01缁勫悎涓湴鍧�琛ㄩ泦鍚�
+A01.addresses=DB103.32,DB100.144,DB100.184,DB100.186,DB100.180,DB100.182
+# A02缁勫悎涓湴鍧�琛ㄩ泦鍚�
+A02.addresses=DB103.34,DB100.188,DB100.190,DB100.146
+# A01缈昏浆鍦板潃
+A01.flipAddress=DB106.2
+# A02缈昏浆鍦板潃
+A02.flipAddress=DB106.14
+# B01缁勫悎涓湴鍧�
+B01.address=DB103.36
+# B02缁勫悎鍦板潃
+B02.address=DB103.40
+# 鎵�鏈夋晠闅滄寜閽湴鍧�
+faultButtonAddresses=DB104.1.4,DB104.1.5,DB104.1.2,DB104.1.3,DB104.1.6,DB104.1.7
+# 澶嶄綅鎸夐挳鍦板潃
+resetButtonAddresses=DB101.4.0,DB101.4.3,DB101.3.6,DB101.4.1,DB101.4.4,DB101.4.6
+# 鎵�鏈夋湭鍥為浂鎸夐挳鍦板潃
+notHomedButtonAddresses=DB104.9.0,DB104.9.1,DB104.9.4,DB104.9.5
+# 杩涚墖id鍦板潃
+inputGlassIdAddress=DB100.148
+# 瀛樼墖id鍦板潃
+outputGlassIdAddress=DB100.162
+#鍥為浂鎸夐挳鍦板潃
+HomedButtonAddresses=DB101.3.7,DB101.4.2,DB101.4.5,DB101.4.7
+#A02start
+A02start=DB101.5.1
+#A01start
+A01start=DB101.5.0
+#A02start
+A02Bstart=DB101.11.1
+#A01start
+A01Bstart=DB101.11.0
+#abort/resumeTasks
+abortresumeTasks=DB101.10.4
+#------------------------------------------------------------
+
+
+#A02start
+mlp.A02start=DB101.2.3
+#A01start
+mlp.A01start=DB101.2.2
+#A02start
+mlp.B02start=DB101.2.5
+#A01start
+mlp.B01start=DB101.2.4
+
+#--------------------------
+#A02start
+mlp2.A02start=DB101.2.1
+#A01start
+mlp2.A01start=DB101.2.0
+
+
+
 #PLCManualJog--------------------------
\ No newline at end of file

--
Gitblit v1.8.0