From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/ServoManualone.json | 595 ++++++++++++++++++++++++++++------------------------------
1 files changed, 286 insertions(+), 309 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 2060629..6c558bd 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -1,342 +1,319 @@
[
-
- [
- {
- "name": "A01 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.0",
- "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",
- "value":0
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "sending": 0,
- "type": "0",
- "value":0
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "name": "A01鍗婅嚜鍔�",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "name": "鍗婅嚜鍔ㄥ惎鍔�",
- "value":0,
- "address":"DB10.0"
- }
- }
- ],
- [
- {
- "name": "A02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.1",
- "count":3,
- "value":0
- },
- {
- "name": "鍙栫墖鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0",
- "value":0
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "sending": 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": {
- "name": "鏁呴殰",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "name": "澶嶄綅",
- "value":0,
- "address":"DB10.0"
- }
- },
- {
- "button": {
- "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
- },
-
-
- {
- "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": "A01 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.0",
+ "value": 1
+ },
+ {
+ "name": "鏁伴噺",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "name": "闀垮害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "name": "楂樺害",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 0,
+ "type": "0",
+ "value": 1
+ },
+ {
+ "button": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0"
}
-], [
- {
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A01鍗婅嚜鍔�",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "鍗婅嚜鍔ㄥ惎鍔�",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ }
+ ],
+ [
+ {
+ "name": "A02 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address": "DB100.1",
+ "count": 3,
+ "value": 0
+ },
+ {
+ "name": "鍙栫墖鏍煎瓙",
+ "read": 11,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ },
+ {
+ "name": "瀛樼墖鏍煎瓙",
+ "read": 22,
+ "sending": 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": {
+ "name": "鏁呴殰",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "澶嶄綅",
+ "value": 0,
+ "address": "DB10.0"
+ }
+ },
+ {
+ "button": {
+ "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
+ },
+ {
+ "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
+ "address": "DB100.2",
+ "count": 3,
+ "value": 0
},
{
"name": "鐩爣鏍煎瓙",
"read": 11,
"sending": 0,
"type": "0",
- "value":0
+ "value": 0
},
-
{
"button": {
"name": "鏁呴殰",
- "value":0,
- "address":"DB10.0"
+ "value": 0,
+ "address": "DB10.0"
}
},
{
"button": {
"name": "澶嶄綅",
- "value":0,
- "address":"DB10.0"
+ "value": 0,
+ "address": "DB10.0"
}
- } ,{
+ },
+ {
"button": {
"name": "鏈洖闆�",
- "value":0,
- "address":"DB10.0"
+ "value": 0,
+ "address": "DB10.0"
}
},
{
"button": {
"name": "鍥為浂",
- "value":0,
- "address":"DB10.0"
+ "value": 0,
+ "address": "DB10.0"
}
}
-],
-
- [
- {
- "name": "B02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address":"DB100.3",
- "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,
+ "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"
+ }
+ }
]
-
\ No newline at end of file
+]
\ No newline at end of file
--
Gitblit v1.8.0