From a6eb7e9a101b007adfa9b2f7a719dfd6f9e7f259 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 15 十二月 2023 13:46:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/ServoManualone.json | 509 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 322 insertions(+), 187 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index 666f7c3..39c014f 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -1,218 +1,353 @@
[
- [
- {
- "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 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.0",
- "count": 3
- },
- {
- "name": "鍙栫墖鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "sending": 0,
- "type": "0"
- },
- {
- "button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
+
+ [
+ {
+ "name": "A01 鎵�鍦ㄦ牸瀛�",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "address":"DB100.0",
+ "value":0
+
+ },
+ {
+ "name": "鏁伴噺",
+ "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
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 9999,
+ "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,
+ "type":66,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A01鍗婅嚜鍔ㄥ惎鍔�",
+ "value":0,
+ "type":66,
+ "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": 8888,
+ "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,
+ "type":66,
+ "address":"DB10.0"
+ }
+ },
+ {
+ "button": {
+ "name": "A02鍗婅嚜鍔ㄥ惎鍔�",
+ "value":0,
+ "type":66,
+ "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":1,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ },
+ {
+ "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":1,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "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
- },
- {
- "name": "鍙栫墖鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
- "name": "瀛樼墖鏍煎瓙",
- "read": 22,
- "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"
- }
- }
- ],
- [
- {
+], [
+ {
"name": "B01 鎵�鍦ㄦ牸瀛�",
"read": 33,
"sending": 0,
"type": "0",
- "address": "DB100.2",
- "count": 3
+ "address":"DB100.2",
+ "count":3,
+ "value":0
},
{
"name": "鐩爣鏍煎瓙",
"read": 11,
"sending": 0,
- "type": "0"
+ "type": "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"
}
- }
- ],
- [
- {
- "name": "B02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.3",
- "count": 3
- },
- {
- "name": "鐩爣鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "0"
- },
- {
+ } ,{
"button": {
- "name": "鏁呴殰",
- "value": 0,
- "address": "DB10.0"
+ "name": "鏈洖闆�",
+
+ "value":1,
+ "address":"DB10.0",
+ "type":"66"
}
},
{
"button": {
- "name": "澶嶄綅",
- "value": 0,
- "address": "DB10.0"
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
}
}
- ],
- [
- {
- "name": "B02 鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "address": "DB100.3",
- "count": 3
- },
- {
- "name": "鐩爣鏍煎瓙",
- "read": 11,
- "sending": 0,
- "type": "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
- }
+],
+
+ [
+ {
+ "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":1,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ },
+ {
+ "button": {
+ "name": "鍥為浂",
+ "value":0,
+ "address":"DB10.0"
+ }
+ }
+
+ ]
+
+
+
]
-]
\ No newline at end of file
+
\ No newline at end of file
--
Gitblit v1.8.0