From 12c065f48d6a4f5b1489da95f2091edb9a831196 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 21 十二月 2023 13:07:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 86 +++++++++++++++++++++++++++++++++++++------
1 files changed, 74 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index 442b36e..fcc0f7a 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -180,7 +180,9 @@
"type": "0",
"value": 0
}
+
],
+
[
{
"button": {
@@ -199,8 +201,8 @@
"type": "3"
},
{
- "name": "ID",
- "read": 33,
+ "name": "A02ID",
+ "read": "ID28",
"sending": 0,
"type": "0",
"value": 0
@@ -210,22 +212,22 @@
{
"button": {
"name": "B01鎵嬪姩鐘舵��",
- "value": 0,
- "address": "DB10.0"
+ "value": 0
+
},
"type": "4"
},
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
- "address": "DB10.0"
+ "value": 0
+
},
"type": "3"
},
{
- "name": "ID",
- "read": 33,
+ "name": "B01ID",
+ "read": "ID29",
"sending": 0,
"type": "0",
"value": 0
@@ -243,14 +245,14 @@
{
"button": {
"name": "娓呴櫎ID",
- "value": 0,
- "address": "DB10.0"
+ "value": 0
+
},
"type": "3"
},
{
- "name": "ID",
- "read": 33,
+ "name": "B02ID",
+ "read": "ID210",
"sending": 0,
"type": "0",
"value": 0
@@ -259,7 +261,30 @@
[
{
"name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 0,
+ "sending": 0,
+
+ "value": 0
+ },
+ {
+ "name": "ID1",
"read": 66,
+ "sending": 0,
+ "type": "0",
+ "value": 0
+ }
+ ],
+ [
+ {
+ "name": "鎵弿鏋壂鐮佺殑ID",
+ "read": 0,
+ "sending": 0,
+
+ "value": 0
+ },
+ {
+ "name": "ID2",
+ "read": 666,
"sending": 0,
"type": "0",
"value": 0
@@ -295,4 +320,41 @@
"value": 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
+ }
+
+
+ ]
+
]
\ No newline at end of file
--
Gitblit v1.8.0