From 7ae7bcc0245afa4d94516feddc2b8bd60e4253c6 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 11 十二月 2023 10:25:02 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/parameter2.json | 55 ++++++++++++++++++++++++-------------------------------
1 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/parameter2.json b/CanadaMes-ui/src/configuration/parameter2.json
index 884e9d9..a477253 100644
--- a/CanadaMes-ui/src/configuration/parameter2.json
+++ b/CanadaMes-ui/src/configuration/parameter2.json
@@ -172,25 +172,6 @@
"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": "ID2",
@@ -201,6 +182,7 @@
}
],
+
[
{
"button": {
@@ -219,8 +201,8 @@
"type": "3"
},
{
- "name": "ID",
- "read": 33,
+ "name": "A02ID",
+ "read": "ID28",
"sending": 0,
"type": "0",
"value": 0
@@ -230,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
@@ -263,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
@@ -338,4 +320,15 @@
"value": 0
}
]
+ , [
+ {
+ "button": {
+ "name": "鎬ュ仠鍚庝腑姝�/缁х画閫夋嫨",
+ "value":0,
+ "address":"DB10.0",
+ "type":"66"
+ }
+ }
+
+]
]
\ No newline at end of file
--
Gitblit v1.8.0