From 7debc55b744d2c88adf94731440301399f9373d8 Mon Sep 17 00:00:00 2001 From: hkc Date: Fri, 21 Mar 2025 13:51:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E4=BC=A0=E6=84=9F?= =?UTF-8?q?=E5=99=A8=E3=80=81=E6=B8=A9=E6=B9=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/EmsShower/addrCalc.exe | Bin 0 -> 13312 bytes applications/EmsShower/emsshower.json | 142 ++++++++++---------------- 2 files changed, 56 insertions(+), 86 deletions(-) create mode 100644 applications/EmsShower/addrCalc.exe diff --git a/applications/EmsShower/addrCalc.exe b/applications/EmsShower/addrCalc.exe new file mode 100644 index 0000000000000000000000000000000000000000..30e53a779c9f0d770f3876fd012fb761c742221f GIT binary patch literal 13312 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 literal 0 HcmV?d00001 diff --git a/applications/EmsShower/emsshower.json b/applications/EmsShower/emsshower.json index e4fa219..5250293 100644 --- a/applications/EmsShower/emsshower.json +++ b/applications/EmsShower/emsshower.json @@ -16,8 +16,8 @@ "function_code":3, "address":[ { - "start_addr":40000, - "quantity":9, + "start_addr":41984, + "quantity":7, "bytes_per_register":2, "language":"En", "device_name_chn":"温湿度", @@ -35,8 +35,18 @@ "skip":0 }, { - "comment":"温度", + "comment":"从节点地址跳过", "order":1, + "precision":1, + "unit":"", + "title_chn":"", + "title_eng":"", + "display":0, + "skip":1 + }, + { + "comment":"温度", + "order":2, "precision":10, "unit":"℃", "title_chn":"温度", @@ -46,79 +56,49 @@ }, { "comment":"湿度", - "order":2, - "precision":10, + "order":3, + "precision":1, "unit":"%", "title_chn":"湿度", "title_eng":"RH (%)", - "display":1 , + "display":1, "skip":0 }, { - "comment":"露点", - "order":3, - "precision":1, - "unit":"", - "title_chn":"露点", - "title_eng":"DewPoint", - "display":2, - "skip":0 - }, - { - "comment":"跳过", + "comment":"回/出风状态跳过", "order":4, "precision":1, "unit":"", - "title_chn":"", + "title_chn":"回/出风状态", "title_eng":"", "display":0, "skip":1 }, { - "comment":"跳过", + "comment":"高精度温度", "order":5, - "precision":1, + "precision":100, "unit":"", - "title_chn":"", - "title_eng":"", - "display":0, - "skip":1 + "title_chn":"高精度温度", + "title_eng":"HD T (℃)", + "display":2, + "skip":0 }, { - "comment":"DO", + "comment":"高精度湿度", "order":6, "precision":1, "unit":"", - "title_chn":"DO", - "title_eng":"DO", - "display":2, - "skip":0 - }, - { - "comment":"DI1", - "order":7, - "precision":1, - "unit":"", - "title_chn":"DI1", - "title_eng":"DI1", - "display":2, - "skip":0 - }, - { - "comment":"DI2", - "order":8, - "precision":1, - "unit":"", - "title_chn":"DI2", - "title_eng":"DI2", + "title_chn":"高精度湿度值", + "title_eng":"HD RH (%)", "display":2, "skip":0 } ] }, { - "start_addr":40009, - "quantity":6, + "start_addr":41991, + "quantity":4, "bytes_per_register":2, "language":"en", "device_name_chn":"温湿度告警", @@ -126,38 +106,18 @@ "device_type":6, "data": [ { - "comment":"温度阈值", + "comment":"设备通讯状态", "order":0, - "precision":10, - "unit":"", - "title_chn":"温度阈值", - "title_eng":"Temp_threshold", - "display":0, - "skip":0 - }, - { - "comment":"温度偏移", - "order":1, "precision":1, "unit":"", - "title_chn":"温度偏移", - "title_eng":"Temp_offset", - "display":0, + "title_chn":"设备通讯状态", + "title_eng":"Online1", + "display":1, "skip":0 }, - { - "comment":"跳过", - "order":2, - "precision":1, - "unit":"", - "title_chn":"", - "title_eng":"", - "display":0, - "skip":1 - }, { "comment":"高温告警", - "order":3, + "order":1, "precision":1, "unit":"", "title_chn":"高温告警", @@ -167,7 +127,7 @@ }, { "comment":"高湿告警", - "order":4, + "order":2, "precision":1, "unit":"", "title_chn":"高湿告警", @@ -177,7 +137,7 @@ }, { "comment":"低温告警", - "order":5, + "order":3, "precision":1, "unit":"", "title_chn":"低温告警", @@ -188,13 +148,13 @@ ] }, { - "start_addr":50009, + "start_addr":43520, "quantity":4, "bytes_per_register":2, "language":"en", "device_name_chn":"传感器", "device_name_eng":"Sensor", - "device_type":6, + "device_type":99, "data": [ { "comment":"设备通讯状态", @@ -239,8 +199,8 @@ ] }, { - "start_addr":40009, - "quantity":3, + "start_addr":43524, + "quantity":4, "bytes_per_register":2, "language":"en", "device_name_chn":"传感器告警", @@ -248,33 +208,43 @@ "device_type":6, "data": [ { - "comment":"门禁告警", + "comment":"设备在线", "order":0, "precision":10, "unit":"", + "title_chn":"设备在线", + "title_eng":"Online", + "display":2, + "skip":0 + }, + { + "comment":"门禁告警", + "order":1, + "precision":10, + "unit":"", "title_chn":"门禁告警", "title_eng":"Access Control Alarm", - "display":0, + "display":2, "skip":0 }, { "comment":"水浸告警", - "order":1, + "order":2, "precision":1, "unit":"", "title_chn":"水浸告警", "title_eng":"Water ingress", - "display":0, + "display":2, "skip":0 }, { "comment":"烟雾告警", - "order":2, + "order":3, "precision":1, "unit":"", "title_chn":"烟雾告警", "title_eng":"Smoke", - "display":0, + "display":2, "skip":0 } ]