From d75d7d7d76fe16e133f793cc31bfaea17a10cd24 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 27 十一月 2023 13:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/ServoManualone.json | 319 ++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 228 insertions(+), 91 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 67eaa24..3b7d999 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -1,30 +1,5 @@
[
- [
- {
- "name": "澶ц溅鑷姩閫熷害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.0",
- "count":3
- }
-
-
-
- ],
- [
- {
- "name": "灏忚溅鑷姩閫熷害",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.0",
- "count":3
- }
-
-
-
- ],
+
[
{
"name": "A01 鎵�鍦ㄦ牸瀛�",
@@ -32,19 +7,58 @@
"sending": 0,
"type": "0",
"address":"DB100.0",
- "count":3
+ "value":0
+
+ },
+ {
+ "name": "鏁伴噺",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "闀垮害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "楂樺害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
},
{
"name": "鍙栫墖鏍煎瓙",
"read": 11,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
},
{
"name": "瀛樼墖鏍煎瓙",
"read": 22,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
},
{
"button": {
@@ -62,7 +76,14 @@
},
{
"button": {
- "name": "鑷姩鍚姩",
+ "name": "A01鍗婅嚜鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
"address":"DB10.0"
}
@@ -75,19 +96,40 @@
"sending": 0,
"type": "0",
"address":"DB100.1",
- "count":3
+ "count":3,
+ "value":0
},
{
"name": "鍙栫墖鏍煎瓙",
"read": 11,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
},
{
"name": "瀛樼墖鏍煎瓙",
"read": 22,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
+ },
+ {
+ "name": "鏁伴噺",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
+ "name": "鍙栫墖ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
},
{
"button": {
@@ -105,56 +147,163 @@
},
{
"button": {
- "name": "鑷姩鍚姩",
+ "name": "A02鍗婅嚜鍔�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
"address":"DB10.0"
}
}
],
+
[
+ {
+ "name": "A01缈昏浆瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.2",
+ "count":3,
+ "value":0
+ },
+
+
{
- "name": "B01 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.2",
- "count":3
- },
- {
- "name": "鐩爣鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
-
- {
- "button": {
- "name": "鏁呴殰",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value":0,
- "address":"DB10.0"
- }
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
}
- ],[
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+ ],[
+ {
+ "name": "A02缈昏浆瀹炴椂浣嶇疆",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.2",
+ "count":3,
+ "value":0
+ },
+
+
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+], [
+ {
+ "name": "B01 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.2",
+ "count":3,
+ "value":0
+ },
+ {
+ "name": "鐩爣鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value":0
+ },
+
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value":0,
+ "address":"DB10.0"
+ }
+ } ,{
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+],
+
+ [
{
"name": "B02 鎵�鍦ㄦ牸瀛�",
"read": 33,
"sending": 0,
"type": "0",
"address":"DB100.3",
- "count":3
+ "count":3,
+ "value":0
},
{
"name": "鐩爣鏍煎瓙",
"read": 11,
"sending": 0,
- "type": "0"
+ "type": "0",
+ "value":0
},
{
@@ -171,35 +320,23 @@
"address":"DB10.0"
}
+ } ,{
+ "button": {
+ "name": "鏈洖闆�",
+ "value":0,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
}
- ],
- [
- {
- "name": "瀛樼墖鎺ョ墖鍦板潃",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.4",
- "count":3
- }
-
-
-
- ],
- [
- {
- "name": "鍑虹墖鎺ョ墖鍦板潃",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.5",
- "count":3
- }
-
-
-
- ]
+ ]
+
]
\ No newline at end of file
--
Gitblit v1.8.0