From afba1c8b9c014b854407f72afdca8e3a0d041fae Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Fri, 25 Jul 2025 16:13:24 +0200 Subject: [PATCH] Fix LoRaWan regression --- .../lorawan/decoders/vendors/dragino/D20.be | 14 +++++++------- .../lorawan/decoders/vendors/dragino/DDS75L.be | 10 +++++----- .../lorawan/decoders/vendors/dragino/LDS02.be | 4 ++-- .../lorawan/decoders/vendors/dragino/LHT52.be | 14 +++++++------- .../lorawan/decoders/vendors/dragino/LHT65.be | 18 +++++++++--------- .../decoders/vendors/dragino/PS-L-I5.be | 10 +++++----- .../lorawan/decoders/vendors/dragino/SE01-L.be | 17 ++++++++--------- .../lorawan/decoders/vendors/merryiot/DW10.be | 4 ++-- 8 files changed, 45 insertions(+), 46 deletions(-) diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/D20.be b/tasmota/berry/lorawan/decoders/vendors/dragino/D20.be index 76e3a332f..5d48a8df1 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/D20.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/D20.be @@ -22,13 +22,13 @@ class LwDecoDrgD20 var tempC3 = 1000 if global.DrgD20Nodes.find(Node) - last_seen = global.DrgD20Nodes.item(Node)[1] - battery_last_seen = global.DrgD20Nodes.item(Node)[2] - battery = global.DrgD20Nodes.item(Node)[3] - rssi = global.DrgD20Nodes.item(Node)[4] - tempC1 = global.DrgD20Nodes.item(Node)[5] - tempC2 = global.DrgD20Nodes.item(Node)[6] - tempC3 = global.DrgD20Nodes.item(Node)[7] + last_seen = global.DrgD20Nodes.item(Node)[2] + battery_last_seen = global.DrgD20Nodes.item(Node)[3] + battery = global.DrgD20Nodes.item(Node)[4] + rssi = global.DrgD20Nodes.item(Node)[5] + tempC1 = global.DrgD20Nodes.item(Node)[6] + tempC2 = global.DrgD20Nodes.item(Node)[7] + tempC3 = global.DrgD20Nodes.item(Node)[8] end ## SENSOR DATA ## diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/DDS75L.be b/tasmota/berry/lorawan/decoders/vendors/dragino/DDS75L.be index 37abf381a..119ac4a37 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/DDS75L.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/DDS75L.be @@ -20,11 +20,11 @@ class LwDecoDDS75LB var distance = 0 if global.dds75lbNodes.find(Node) - last_seen = global.dds75lbNodes.item(Node)[1] - battery_last_seen = global.dds75lbNodes.item(Node)[2] - battery = global.dds75lbNodes.item(Node)[3] - rssi = global.dds75lbNodes.item(Node)[4] - distance = global.dds75lbNodes.item(Node)[5] + last_seen = global.dds75lbNodes.item(Node)[2] + battery_last_seen = global.dds75lbNodes.item(Node)[3] + battery = global.dds75lbNodes.item(Node)[4] + rssi = global.dds75lbNodes.item(Node)[5] + distance = global.dds75lbNodes.item(Node)[6] end ## SENSOR DATA ## diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/LDS02.be b/tasmota/berry/lorawan/decoders/vendors/dragino/LDS02.be index 3c0fa1181..2e61518db 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/LDS02.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/LDS02.be @@ -20,8 +20,8 @@ class LwDecoLDS02 var door_open var door_open_last_seen = 1451602800 if global.lds02Nodes.find(Node) - door_open = global.lds02Nodes.item(Node)[5] - door_open_last_seen = global.lds02Nodes.item(Node)[6] + door_open = global.lds02Nodes.item(Node)[6] + door_open_last_seen = global.lds02Nodes.item(Node)[7] end ## SENSOR DATA ## if 10 == FPort && Bytes.size() == 10 diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/LHT52.be b/tasmota/berry/lorawan/decoders/vendors/dragino/LHT52.be index 3dfa6b73a..739a3b05a 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/LHT52.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/LHT52.be @@ -21,13 +21,13 @@ class LwDecoLHT52 var humidity var temp_ext = 1000 if global.lht52Nodes.find(Node) - last_seen = global.lht52Nodes.item(Node)[1] - battery_last_seen = global.lht52Nodes.item(Node)[2] - battery = global.lht52Nodes.item(Node)[3] - rssi = global.lht52Nodes.item(Node)[4] - temp_int = global.lht52Nodes.item(Node)[5] - humidity = global.lht52Nodes.item(Node)[6] - temp_ext = global.lht52Nodes.item(Node)[7] + last_seen = global.lht52Nodes.item(Node)[2] + battery_last_seen = global.lht52Nodes.item(Node)[3] + battery = global.lht52Nodes.item(Node)[4] + rssi = global.lht52Nodes.item(Node)[5] + temp_int = global.lht52Nodes.item(Node)[6] + humidity = global.lht52Nodes.item(Node)[7] + temp_ext = global.lht52Nodes.item(Node)[8] end ## SENSOR DATA ## if 2 == FPort && Bytes.size() == 11 diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/LHT65.be b/tasmota/berry/lorawan/decoders/vendors/dragino/LHT65.be index 3c01cf311..61e9bddcb 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/LHT65.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/LHT65.be @@ -23,15 +23,15 @@ class LwDecoLHT65 var door_open = 1000 var door_open_last_seen = 1451602800 if global.lht65Nodes.find(Node) - last_seen = global.lht65Nodes.item(Node)[1] - battery_last_seen = global.lht65Nodes.item(Node)[2] - battery = global.lht65Nodes.item(Node)[3] - RSSI = global.lht65Nodes.item(Node)[4] - temp_int = global.lht65Nodes.item(Node)[5] - humidity = global.lht65Nodes.item(Node)[6] - temp_ext = global.lht65Nodes.item(Node)[7] - door_open = global.lht65Nodes.item(Node)[8] - door_open_last_seen = global.lht65Nodes.item(Node)[9] + last_seen = global.lht65Nodes.item(Node)[2] + battery_last_seen = global.lht65Nodes.item(Node)[3] + battery = global.lht65Nodes.item(Node)[4] + RSSI = global.lht65Nodes.item(Node)[5] + temp_int = global.lht65Nodes.item(Node)[6] + humidity = global.lht65Nodes.item(Node)[7] + temp_ext = global.lht65Nodes.item(Node)[8] + door_open = global.lht65Nodes.item(Node)[9] + door_open_last_seen = global.lht65Nodes.item(Node)[10] end var Ext = Bytes[6] & 0x0F #External sensor type diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/PS-L-I5.be b/tasmota/berry/lorawan/decoders/vendors/dragino/PS-L-I5.be index 122cc7eb5..996b29c4f 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/PS-L-I5.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/PS-L-I5.be @@ -25,11 +25,11 @@ class LwDecoPSLI5 var modelRangeCm = 500 # 4mA=0cm, 20mA=500cm if global.psli5Nodes.find(Node) - last_seen = global.psli5Nodes.item(Node)[1] - battery_last_seen = global.psli5Nodes.item(Node)[2] - battery = global.psli5Nodes.item(Node)[3] - rssi = global.psli5Nodes.item(Node)[4] - Water_deep_cm = global.psli5Nodes.item(Node)[5] + last_seen = global.psli5Nodes.item(Node)[2] + battery_last_seen = global.psli5Nodes.item(Node)[3] + battery = global.psli5Nodes.item(Node)[4] + rssi = global.psli5Nodes.item(Node)[5] + Water_deep_cm = global.psli5Nodes.item(Node)[6] end diff --git a/tasmota/berry/lorawan/decoders/vendors/dragino/SE01-L.be b/tasmota/berry/lorawan/decoders/vendors/dragino/SE01-L.be index 23fa872ba..cdb95b2ca 100644 --- a/tasmota/berry/lorawan/decoders/vendors/dragino/SE01-L.be +++ b/tasmota/berry/lorawan/decoders/vendors/dragino/SE01-L.be @@ -29,15 +29,14 @@ class LwDecoSE01L var s_flag # 0: No sensor was identified, 1: The sensor has been identified if global.se01LNodes.find(Node) - last_seen = global.se01LNodes.item(Node)[1] - battery_last_seen = global.se01LNodes.item(Node)[2] - battery = global.se01LNodes.item(Node)[3] - rssi = global.se01LNodes.item(Node)[4] - - temp = global.se01LNodes.item(Node)[5] - conductivity = global.se01LNodes.item(Node)[6] - moisture = global.se01LNodes.item(Node)[7] - dielectric = global.se01LNodes.item(Node)[8] + last_seen = global.se01LNodes.item(Node)[2] + battery_last_seen = global.se01LNodes.item(Node)[3] + battery = global.se01LNodes.item(Node)[4] + rssi = global.se01LNodes.item(Node)[5] + temp = global.se01LNodes.item(Node)[6] + conductivity = global.se01LNodes.item(Node)[7] + moisture = global.se01LNodes.item(Node)[8] + dielectric = global.se01LNodes.item(Node)[9] end ## SENSOR DATA ## diff --git a/tasmota/berry/lorawan/decoders/vendors/merryiot/DW10.be b/tasmota/berry/lorawan/decoders/vendors/merryiot/DW10.be index a41887d1d..31b222e7e 100644 --- a/tasmota/berry/lorawan/decoders/vendors/merryiot/DW10.be +++ b/tasmota/berry/lorawan/decoders/vendors/merryiot/DW10.be @@ -23,8 +23,8 @@ class LwDecoDW10 var temperature var humidity if global.dw10Nodes.find(Node) - door_open = global.dw10Nodes.item(Node)[5] - door_open_last_seen = global.dw10Nodes.item(Node)[6] + door_open = global.dw10Nodes.item(Node)[6] + door_open_last_seen = global.dw10Nodes.item(Node)[7] end ## SENSOR DATA ## if 120 == FPort && Bytes.size() == 9