From f66c565a395e10901fc71abcfa37f4ff5a15be09 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 26 一月 2024 11:34:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 164 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 125 insertions(+), 39 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index 7d01342..79f5ef3 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -3,7 +3,8 @@
{
"button": {
"name": "D01鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -11,7 +12,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -21,14 +23,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "D02鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -36,7 +40,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -46,14 +51,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "D03鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -61,7 +68,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -71,14 +79,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "D04鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -86,7 +96,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -96,14 +107,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "D05鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -111,7 +124,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -121,14 +135,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "D06鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -136,7 +152,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -146,14 +163,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "A01鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -161,7 +180,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -171,14 +191,16 @@
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "ID2",
"read": 33,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
@@ -187,7 +209,8 @@
{
"button": {
"name": "A02鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -195,7 +218,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "3"
@@ -205,14 +229,16 @@
"read": "ID28",
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "B01鎵嬪姩鐘舵��",
- "value": 0
+ "value": 0,
+"value2": 0
},
"type": "4"
@@ -220,7 +246,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0
+ "value": 0,
+"value2": 0
},
"type": "3"
@@ -230,14 +257,16 @@
"read": "ID29",
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
{
"button": {
"name": "B02鎵嬪姩鐘舵��",
- "value": 0,
+ "value": 0,
+"value2": 0,
"address": "DB10.0"
},
"type": "4"
@@ -245,7 +274,8 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0
+ "value": 0,
+"value2": 0
},
"type": "3"
@@ -255,7 +285,8 @@
"read": "ID210",
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
@@ -264,14 +295,16 @@
"read": 0,
"sending": 0,
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "ID1",
"read": 66,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
@@ -280,14 +313,16 @@
"read": 0,
"sending": 0,
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "ID2",
"read": 666,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
],
[
@@ -296,28 +331,79 @@
"read": 333,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "A02鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "B01鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
},
{
"name": "B02鎵�鍦ㄦ牸瀛�",
"read": 333,
"sending": 0,
"type": "0",
- "value": 0
+ "value": 0,
+"value2": 0
}
]
+ ,
+ [
+
+ {
+ "button": {
+ "name": "A01缁堟/缁х画",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }],
+
+
+ [
+ {
+ "button": {
+ "name": "A02缁堟/缁х画",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }],
+ [
+
+
+
+ {
+ "name": "瀛樼墖绛夊緟寤舵椂",
+ "read": 666,
+ "sending": 0,
+ "type": "0",
+ "value": 0,
+"value2": 0
+ }
+
+
+ ],
+ [
+ {
+ "button": {
+ "name": "杞�ュ仠",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }]
+
]
\ No newline at end of file
--
Gitblit v1.8.0