From ff6fd31ba5a4b6a6e74096786ff6d61293d15c73 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 04 十二月 2023 09:08:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
CanadaMes-ui/src/configuration/ServoManualone.json | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/ServoManualone.json b/CanadaMes-ui/src/configuration/ServoManualone.json
index d0a65e1..48bb45c 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,
@@ -59,6 +51,15 @@
"sending": 0,
"type": "0",
"value":0
+ },
+ {
+ "name": "杩涚墖ID",
+ "read": 9999,
+ "sending": 0,
+ "type": "0",
+ "value":0
+
+
},
{
"button": {
@@ -124,7 +125,7 @@
},
{
"name": "鍙栫墖ID",
- "read": 33,
+ "read": 8888,
"sending": 0,
"type": "0",
"value":0
@@ -191,7 +192,8 @@
"button": {
"name": "鏈洖闆�",
"value":0,
- "address":"DB10.0"
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -231,7 +233,8 @@
"button": {
"name": "鏈洖闆�",
"value":0,
- "address":"DB10.0"
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -275,8 +278,10 @@
} ,{
"button": {
"name": "鏈洖闆�",
+
"value":0,
- "address":"DB10.0"
+ "address":"DB10.0",
+ "type":"66"
}
},
{
@@ -324,7 +329,8 @@
"button": {
"name": "鏈洖闆�",
"value":0,
- "address":"DB10.0"
+ "address":"DB10.0",
+ "type":"66"
}
},
{
--
Gitblit v1.8.0