diff --git a/applications/EmsShower/addrCalc.exe b/applications/EmsShower/addrCalc.exe new file mode 100644 index 0000000..30e53a7 Binary files /dev/null and b/applications/EmsShower/addrCalc.exe differ 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 } ]