From 2a6d8a858ca7e41436548b35db147b5cdad4e4be Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期四, 14 十二月 2023 14:08:17 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/ServoManualone.json | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index d0a65e1..39c014f 100644
--- a/CanadaMes-ui/src/configuration/ServoManualone.json
+++ b/CanadaMes-ui/src/configuration/ServoManualone.json
@@ -19,15 +19,7 @@
},
- {
- "name": "杩涚墖ID",
- "read": 33,
- "sending": 0,
- "type": "0",
- "value":0
-
- },
{
"name": "闀垮害",
"read": 33,
@@ -61,6 +53,15 @@
"value":0
},
{
+ "name": "杩涚墖ID",
+ "read": 9999,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
+ },
+ {
"button": {
"name": "鏁呴殰",
"value":0,
@@ -78,6 +79,7 @@
"button": {
"name": "A01鍗婅嚜鍔�",
"value":0,
+ "type":66,
"address":"DB10.0"
}
},
@@ -85,6 +87,7 @@
"button": {
"name": "A01鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
+ "type":66,
"address":"DB10.0"
}
}
@@ -124,7 +127,7 @@
},
{
"name": "鍙栫墖ID",
- "read": 33,
+ "read": 8888,
"sending": 0,
"type": "0",
"value":0
@@ -149,6 +152,7 @@
"button": {
"name": "A02鍗婅嚜鍔�",
"value":0,
+ "type":66,
"address":"DB10.0"
}
},
@@ -156,6 +160,7 @@
"button": {
"name": "A02鍗婅嚜鍔ㄥ惎鍔�",
"value":0,
+ "type":66,
"address":"DB10.0"
}
}
@@ -190,8 +195,9 @@
{
"button": {
"name": "鏈洖闆�",
- "value":0,
- "address":"DB10.0"
+ "value":1,
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -230,8 +236,9 @@
{
"button": {
"name": "鏈洖闆�",
- "value":0,
- "address":"DB10.0"
+ "value":1,
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -275,8 +282,10 @@
} ,{
"button": {
"name": "鏈洖闆�",
- "value":0,
- "address":"DB10.0"
+
+ "value":1,
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -323,8 +332,9 @@
} ,{
"button": {
"name": "鏈洖闆�",
- "value":0,
- "address":"DB10.0"
+ "value":1,
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -336,6 +346,7 @@
}
]
+
]
--
Gitblit v1.8.0