diff --git a/tasmota/berry/extensions/LoRaWan_Decoders.tapp b/tasmota/berry/extensions/LoRaWan_Decoders.tapp index 8cefd1b15..ad188a1d6 100644 Binary files a/tasmota/berry/extensions/LoRaWan_Decoders.tapp and b/tasmota/berry/extensions/LoRaWan_Decoders.tapp differ diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/DW10.be b/tasmota/berry/extensions/LoRaWan_Decoders/DW10.be index 4f93846f7..19c204b59 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/DW10.be +++ b/tasmota/berry/extensions/LoRaWan_Decoders/DW10.be @@ -97,7 +97,7 @@ class LwDecoDW10 msg += "┆" # | msg += string.format(" ☀️ %.1f°C", temperature) # Sunshine - Temperature msg += string.format(" 💧 %.1f%%", humidity) # Raindrop - Humidity - msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door + msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door fmt.dhm(door_open_last_seen)) msg += "{e}" # = end diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/LDS02.be b/tasmota/berry/extensions/LoRaWan_Decoders/LDS02.be index a024bc4a2..50a84875b 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/LDS02.be +++ b/tasmota/berry/extensions/LoRaWan_Decoders/LDS02.be @@ -82,7 +82,7 @@ class LwDecoLDS02 var door_open = sensor[6] var door_open_last_seen = sensor[7] msg += "┆" # | - msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door + msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door fmt.dhm(door_open_last_seen)) msg += "{e}" # = end diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/LHT65.be b/tasmota/berry/extensions/LoRaWan_Decoders/LHT65.be index 4c90dcf70..e9318f620 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/LHT65.be +++ b/tasmota/berry/extensions/LoRaWan_Decoders/LHT65.be @@ -195,7 +195,7 @@ class LwDecoLHT65 msg += string.format(" ☀️ ext %.1f°C", temp_ext) # Sunshine - Temperature external end if door_open < 1000 - msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door + msg += string.format(" %s %s", (door_open) ? "🔓" : "🔒", # Open or Closed lock - Door fmt.dhm(door_open_last_seen)) end msg += "{e}" # = diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/changelog.md b/tasmota/berry/extensions/LoRaWan_Decoders/changelog.md index 93ee8a611..e0d30ae71 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/changelog.md +++ b/tasmota/berry/extensions/LoRaWan_Decoders/changelog.md @@ -1,5 +1,10 @@ # Changelog +[v26.4.6.0] +### Fixed +- GUI cache timer overflow +- Lock/Unlock icons + [v25.1.19.0] ### Changed - LoRaWan End Device configuration Decoder File drop down box based on decoder files within `LoRaWan_Decoders.tapp` using function `path.listdir(<.tapp file>)` from Tasmota v15.2.0.3 before using the filelist (Theo Arends) diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/filelist b/tasmota/berry/extensions/LoRaWan_Decoders/filelist index 690c8e637..c72ff84b7 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/filelist +++ b/tasmota/berry/extensions/LoRaWan_Decoders/filelist @@ -1,18 +1,18 @@ +autoexec.be +changelog.md D20.be DDS75L.be DW10.be +filelist LDS02.be LHT52.be LHT65.be +lorawan_decoders.be +manifest.json PS-L-I5.be SE01-L.be SN50v3L.be +walker.be WS202.be WS301.be WS522.be -autoexec.be -changelog.md -filelist -lorawan_decoders.be -manifest.json -walker.be diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/lorawan_decoders.be b/tasmota/berry/extensions/LoRaWan_Decoders/lorawan_decoders.be index f664237fb..8859df526 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/lorawan_decoders.be +++ b/tasmota/berry/extensions/LoRaWan_Decoders/lorawan_decoders.be @@ -615,9 +615,7 @@ class lorawan_decoders Called every WebRefresh time ------------------------------------------------------------# def web_sensor() - var current_time = tasmota.millis() - - if current_time < self.cache_timeout + if !tasmota.time_reached(self.cache_timeout) tasmota.web_send_decimal(self.web_msg_cache) return end @@ -644,7 +642,7 @@ class lorawan_decoders msg) self.web_msg_cache = full_msg - self.cache_timeout = current_time + 5000 + self.cache_timeout = tasmota.millis() + 5000 tasmota.web_send_decimal(full_msg) end end diff --git a/tasmota/berry/extensions/LoRaWan_Decoders/manifest.json b/tasmota/berry/extensions/LoRaWan_Decoders/manifest.json index 93047ae90..847dce154 100644 --- a/tasmota/berry/extensions/LoRaWan_Decoders/manifest.json +++ b/tasmota/berry/extensions/LoRaWan_Decoders/manifest.json @@ -1,6 +1,6 @@ { "name": "LoRaWan Decoders", - "version": "0x1A011300", + "version": "0x1A040600", "description": "Decode LoRaWan devices", "author": "Theo Arends", "min_tasmota": "0x0E060001",