diff --git a/bundles/org.openhab.binding.netatmo/README.md b/bundles/org.openhab.binding.netatmo/README.md index 88c5ce6ba9c..5a956258727 100644 --- a/bundles/org.openhab.binding.netatmo/README.md +++ b/bundles/org.openhab.binding.netatmo/README.md @@ -480,7 +480,14 @@ All channels are read only. | security | unknown-person-count | Number | Total number of unknown persons that are at home | | security | unknown-person-picture | Image | Snapshot of unknown person that is at home | -**Supported trigger channels for the Security Home thing:** +**Supported channels for the Energy Home thing:** + +| Channel Group | Channel Id | Item Type | Read/Write | Description | +| ------------- | ---------------------- | ----------- |----------- | --------------------------------------------------------- | +| energy | setpoint-duration | Number:Time | Read-only | Default duration of manual setpoint changes | +| energy | planning | String | Read-write | Planning currently applied when following weekly schedule | +| energy | mode | String | Read-write | Chosen thermostat mode (home, frost guard, manual, max) | +| energy | end | DateTime | Read-only | End time of the currently applied thermostat mode | **Supported trigger channels for the Security Home, Presence and Doorbell thing:** diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java index 1cdfd5d5042..a006cea7d4a 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java @@ -147,6 +147,10 @@ public class EnergyCapability extends RestCapability { } api.setThermMode(energyId, targetMode.apiDescriptor); break; + case CHANNEL_SETPOINT_DURATION: + logger.info("'{}' is a read-only channel that must be updated in the Netatmo App", + CHANNEL_SETPOINT_DURATION); + break; } handler.expireData(); } catch (NetatmoException e) { diff --git a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/HomeCapability.java b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/HomeCapability.java index 66c9f3377d4..5df93853d8e 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/HomeCapability.java +++ b/bundles/org.openhab.binding.netatmo/src/main/java/org/openhab/binding/netatmo/internal/handler/capability/HomeCapability.java @@ -113,10 +113,10 @@ public class HomeCapability extends CacheCapability { List result = new ArrayList<>(); homeIds.stream().filter(id -> !id.isEmpty()).forEach(id -> { try { - if (firstLaunch) { - HomeData homeData = api.getHomeData(id); - if (homeData != null) { - result.add(homeData); + HomeData homeData = api.getHomeData(id); + if (homeData != null) { + result.add(homeData); + if (featureAreas.isEmpty()) { featureAreas.addAll(homeData.getFeatures()); } } diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties index 820a91b98e7..32c9a5185bb 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties +++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties @@ -16,7 +16,7 @@ channel-group-type.netatmo.battery-extended.label = Battery channel-group-type.netatmo.battery.label = Battery channel-group-type.netatmo.energy.label = Home Energy channel-group-type.netatmo.energy.channel.end.label = Mode End -channel-group-type.netatmo.energy.channel.end.description = End time of the currently applied setpoint. +channel-group-type.netatmo.energy.channel.end.description = End time of the currently applied thermostat mode. channel-group-type.netatmo.humidity.label = Humidity channel-group-type.netatmo.last-event-alarm.label = Last Event channel-group-type.netatmo.last-event-alarm.channel.time.label = Event Timestamp diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/channels.xml b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/channels.xml index 72e5303a03f..957b3741507 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/channels.xml +++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/channels.xml @@ -135,7 +135,8 @@ Default duration of manual setpoint changes. Time - + + veto diff --git a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/energy.xml b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/energy.xml index 98597d4e5c7..c938fa5c99d 100644 --- a/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/energy.xml +++ b/bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/energy.xml @@ -51,7 +51,7 @@ - End time of the currently applied setpoint. + End time of the currently applied thermostat mode.