From 1de312a18d164c2fa3718a1a975b8c5804723bcf Mon Sep 17 00:00:00 2001
From: clll <1320612696@qq.com>
Date: 星期一, 27 十一月 2023 13:46:12 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index dfadfb6..e7956d1 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -3,7 +3,7 @@
[
{
"button": {
- "name": "D03鎵嬪姩鐘舵��",
+ "name": "D01鎵嬪姩鐘舵��",
"value":0,
"address":"DB10.0"
},"type": "4"
@@ -26,7 +26,7 @@
,[
{
"button": {
- "name": "D04鎵嬪姩鐘舵��",
+ "name": "D02鎵嬪姩鐘舵��",
"value":0,
"address":"DB10.0"
},"type": "4"
@@ -50,6 +50,57 @@
,[
{
"button": {
+ "name": "D03鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+ ]
+ ,[
+ {
+ "button": {
+ "name": "D04鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "3"
+ },
+ {
+ "name": "ID",
+ "read": 33,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+ }
+
+
+ ]
+
+ ,[
+ {
+ "button": {
"name": "D05鎵嬪姩鐘舵��",
"value":0,
"address":"DB10.0"
@@ -70,6 +121,8 @@
"value":0
}
+
+
]
,[
{
@@ -96,9 +149,41 @@
}
+ ] ,[
+ {
+ "button": {
+ "name": "A01鎵嬪姩鐘舵��",
+ "value":0,
+ "address":"DB10.0"
+ },"type": "4"
+ },
+ {
+ "button": {
+ "name": "娓呴櫎ID",
+ "value":0,
+ "address":"DB10.0"
+ },"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鎵嬪姩鐘舵��",
@@ -130,7 +215,7 @@
"name": "B01鎵嬪姩鐘舵��",
"value":0,
"address":"DB10.0"
- },"type": "4"
+ },"type": "4"
},
{
"button": {
@@ -149,7 +234,7 @@
}
- ] ,[
+ ],[
{
"button": {
"name": "B02鎵嬪姩鐘舵��",
@@ -173,91 +258,6 @@
}
-
- ]
-
- ,[
- {
- "button": {
- "name": "D01鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
- },
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
- },
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ]
- ,[
- {
- "button": {
- "name": "D02鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
- },
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
- },
- {
- "name": "ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
-
-
- ],[
- {
- "button": {
- "name": "A01鎵嬪姩鐘舵��",
- "value":0,
- "address":"DB10.0"
- },"type": "4"
- },
- {
- "button": {
- "name": "娓呴櫎ID",
- "value":0,
- "address":"DB10.0"
- },"type": "3"
- },
- {
- "name": "ID1",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
- {
- "name": "ID2",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- }
]
@@ -265,7 +265,7 @@
,[
{
"name": "鎵弿鏋壂鐮佺殑ID",
- "read": 33,
+ "read": 66,
"sending": 0,
"type": "0",
"value":0
@@ -277,7 +277,7 @@
,[
{
"name": "A01褰撳墠鏍煎瓙",
- "read": 33,
+ "read": 333,
"sending": 0,
"type": "0",
"value":0
@@ -285,7 +285,7 @@
},
{
"name": "A02鎵�鍦ㄦ牸瀛�",
- "read": 33,
+ "read": 333,
"sending": 0,
"type": "0",
"value":0
@@ -293,7 +293,7 @@
},
{
"name": "B01鎵�鍦ㄦ牸瀛�",
- "read": 33,
+ "read": 333,
"sending": 0,
"type": "0",
"value":0
@@ -301,7 +301,7 @@
},
{
"name": "B02鎵�鍦ㄦ牸瀛�",
- "read": 33,
+ "read": 333,
"sending": 0,
"type": "0",
"value":0
--
Gitblit v1.8.0