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/parameter2.json | 570 +++++++++++++++++++++++++++-----------------------------
1 files changed, 276 insertions(+), 294 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index dfadfb6..442b36e 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -1,316 +1,298 @@
[
-
- [
- {
- "button": {
- "name": "D03鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ [
+ {
+ "button": {
+ "name": "D01鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }]
- ,[
- {
- "button": {
- "name": "D04鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D02鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
- ]
- ,[
- {
- "button": {
- "name": "D05鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D03鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
- ]
- ,[
- {
- "button": {
- "name": "D06鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D04鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
-
- ,[
- {
- "button": {
- "name": "A02鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D05鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
- ,[
- {
- "button": {
- "name": "B01鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "D06鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ] ,[
- {
- "button": {
- "name": "B02鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A01鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
-
- ,[
- {
- "button": {
- "name": "D01鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID1",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ },
+ {
+ "name": "ID2",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "A02鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
- ,[
- {
- "button": {
- "name": "D02鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B01鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ],[
- {
- "button": {
- "name": "A01鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "button": {
+ "name": "B02鎵嬪姩鐘舵��",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
+ "type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value": 0,
+ "address": "DB10.0"
},
- {
- "name": "ID1",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
- {
- "name": "ID2",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
-
- ,[
- {
- "name": "鎵弿鏋壂鐮佺殑ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
- ,[
- {
- "name": "A01褰撳墠鏍煎瓙",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
- {
- "name": "A02鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
- {
- "name": "B01鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
- {
- "name": "B02鎵�鍦ㄦ牸瀛�",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
-
-
+ "type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 66,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "name": "A01褰撳墠鏍煎瓙",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ },
+ {
+ "name": "A02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ },
+ {
+ "name": "B01鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ },
+ {
+ "name": "B02鎵�鍦ㄦ牸瀛�",
+ "read": 333,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
]
-
\ No newline at end of file
+]
\ No newline at end of file
--
Gitblit v1.8.0