Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[netatmo] Consider setpoint duration when manual changing the setpoint temperature #17662

Merged
merged 3 commits into from
Nov 6, 2024
Merged

[netatmo] Consider setpoint duration when manual changing the setpoint temperature #17662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f97ca8
setpointDefaultDuration was not always considered
clinique Oct 29, 2024
81fae39
Correcting error message
clinique Oct 29, 2024
fc98f43
Correcting tabs
clinique Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion bundles/org.openhab.binding.netatmo/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:**

Expand Down
4 changes: 4 additions & 0 deletions ...c/main/java/org/openhab/binding/netatmo/internal/handler/capability/EnergyCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ public void handleCommand(String channelName, Command command) {
}
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) {
Expand Down
8 changes: 4 additions & 4 deletions ...src/main/java/org/openhab/binding/netatmo/internal/handler/capability/HomeCapability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ protected List<NAObject> getFreshData(HomeApi api) {
List<NAObject> 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());
}
}
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/i18n/netatmo.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/channels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,8 @@
<label>Setpoint Duration</label>
<description>Default duration of manual setpoint changes.</description>
<category>Time</category>
<state pattern="%d %unit%" min="5" max="720" step="5"/>
<state pattern="%d %unit%" min="5" max="720" step="5" readOnly="true"/>
<autoUpdatePolicy>veto</autoUpdatePolicy>
</channel-type>

<channel-type id="floodlight-mode">
Expand Down
2 changes: 1 addition & 1 deletion bundles/org.openhab.binding.netatmo/src/main/resources/OH-INF/thing/energy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<channel id="mode" typeId="energy-mode"/>
<channel id="end" typeId="timestamp">
<label>Mode End</label>
<description>End time of the currently applied setpoint.</description>
<description>End time of the currently applied thermostat mode.</description>
</channel>
</channels>
</channel-group-type>
Expand Down