From bdd957b56a63913d27dbdaba48e636a7f5104c8f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 03 九月 2024 14:01:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/JsonFile/PlcdownGlass.json | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/JsonFile/PlcdownGlass.json b/hangzhoumesParent/JsonFile/PlcdownGlass.json
index 979dc66..a5698c2 100644
--- a/hangzhoumesParent/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/JsonFile/PlcdownGlass.json
@@ -1,6 +1,6 @@
{
"plcAddressBegin": "DB11.0",
- "plcAddressLenght": "100",
+ "plcAddressLenght": "94",
"dataType": "word",
"parameteInfor": [
@@ -25,17 +25,17 @@
"addressLenght": "2"
},
{
- "codeId": "G06_glass_status",
+ "codeId": "glassStatus06",
"addressIndex": "40",
"addressLenght": "2"
},
{
- "codeId": "G11_glass_status",
+ "codeId": "glassStatus11",
"addressIndex": "42",
"addressLenght": "2"
},
{
- "codeId": "G13_glass_status",
+ "codeId": "glassStatus13",
"addressIndex": "44",
"addressLenght": "2"
},
@@ -111,32 +111,37 @@
},
{
"codeId": "Glass_width",
- "addressIndex": "82",
- "addressLenght": "4"
+ "addressIndex": "80",
+ "addressLenght": "2"
},
{
"codeId": "Glass_height",
- "addressIndex": "86",
- "addressLenght": "4"
+ "addressIndex": "82",
+ "addressLenght": "2"
},
{
"codeId": "Glass_thickness",
- "addressIndex": "90",
- "addressLenght": "4"
+ "addressIndex": "84",
+ "addressLenght": "2"
},
{
"codeId": "Start_cell",
- "addressIndex": "94",
+ "addressIndex": "86",
"addressLenght": "2"
},
{
"codeId": "End_cell",
- "addressIndex": "96",
+ "addressIndex": "88",
"addressLenght": "2"
},
{
"codeId": "task_type",
- "addressIndex": "98",
+ "addressIndex": "90",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "alarm_signal",
+ "addressIndex": "92",
"addressLenght": "2"
}
--
Gitblit v1.8.0