From b23254fc3a7738643bc00318b3f1b5956ca89f37 Mon Sep 17 00:00:00 2001 From: Jacob Laursen Date: Wed, 9 Feb 2022 20:26:57 +0100 Subject: [PATCH] Fix unreachable lights and sensors being marked as GONE. (#12245) Fixes #12244 Signed-off-by: Jacob Laursen --- .../binding/deconz/internal/handler/LightThingHandler.java | 2 +- .../deconz/internal/handler/SensorBaseThingHandler.java | 2 +- .../src/main/resources/OH-INF/i18n/deconz.properties | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java index 4b224d3ea..3f1d92f95 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/LightThingHandler.java @@ -464,7 +464,7 @@ public class LightThingHandler extends DeconzBaseThingHandler { updateStatus(ThingStatus.ONLINE); thing.getChannels().stream().map(c -> c.getUID().getId()).forEach(c -> valueUpdated(c, lightState)); } else { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.GONE, "Not reachable"); + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.light-not-reachable"); thing.getChannels().stream().map(c -> c.getUID()).forEach(c -> updateState(c, UnDefType.UNDEF)); } } diff --git a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java index 00e58a06f..58765a0aa 100644 --- a/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java +++ b/bundles/org.openhab.binding.deconz/src/main/java/org/openhab/binding/deconz/internal/handler/SensorBaseThingHandler.java @@ -116,7 +116,7 @@ public abstract class SensorBaseThingHandler extends DeconzBaseThingHandler { // Add some information about the sensor if (!sensorConfig.reachable) { - updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.GONE, "Not reachable"); + updateStatus(ThingStatus.OFFLINE, ThingStatusDetail.NONE, "@text/offline.sensor-not-reachable"); return; } diff --git a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties index 5433e4710..b20e6691b 100644 --- a/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties +++ b/bundles/org.openhab.binding.deconz/src/main/resources/OH-INF/i18n/deconz.properties @@ -196,3 +196,8 @@ channel-type.deconz.voltage.label = Voltage channel-type.deconz.voltage.description = Current voltage channel-type.deconz.waterleakage.label = Water Leakage channel-type.deconz.waterleakage.description = Water leakage detected + +# thing status descriptions + +offline.light-not-reachable = Not reachable +offline.sensor-not-reachable = Not reachable