forked from openhab/openhab-addons
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[hdpowerview] Add support for enabling/disabling automations (openhab…
…#11637) * Add support for enabling/disabling automations. Fixes openhab#11516 Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Fix class description. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Document automation channel and channel groups. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Update scene example in documentation. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Consolidate method for getting channel map. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Extract channel updating from data fetching methods. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Draft implementation of better automation description. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Simplify and optimize building weekday string. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Further simplify building weekday string. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Update scheduled event channels when modified. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Update scene channels when modified. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Update scene group channels when modified. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Fix cache synchronization during initialization. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Reduced code duplication. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Shorten time formatting. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Danish translations for dynamic channels. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Simplify, optimize and fix dynamic channel creation. Channel order is now preserved when updating an existing channel. Scenes and scene collection are sorted correctly. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Provide backwards compatibility for deprecated channels. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Document purpose of createDeprecatedSceneChannels. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Cleaned up poll method for improved readability. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> * Fix potential race condition when initialize() is called while updating channels. Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk> Signed-off-by: Andras Uhrin <andras.uhrin@gmail.com>
- Loading branch information
Showing
11 changed files
with
629 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
132 changes: 132 additions & 0 deletions
132
...src/main/java/org/openhab/binding/hdpowerview/internal/api/responses/ScheduledEvents.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| /** | ||
| * Copyright (c) 2010-2021 Contributors to the openHAB project | ||
| * | ||
| * See the NOTICE file(s) distributed with this work for additional | ||
| * information. | ||
| * | ||
| * This program and the accompanying materials are made available under the | ||
| * terms of the Eclipse Public License 2.0 which is available at | ||
| * http://www.eclipse.org/legal/epl-2.0 | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| */ | ||
| package org.openhab.binding.hdpowerview.internal.api.responses; | ||
|
|
||
| import java.time.DayOfWeek; | ||
| import java.util.EnumSet; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.jdt.annotation.NonNullByDefault; | ||
| import org.eclipse.jdt.annotation.Nullable; | ||
|
|
||
| /** | ||
| * State of all Scheduled Events in an HD PowerView hub | ||
| * | ||
| * @author Jacob Laursen - Initial contribution | ||
| */ | ||
| @NonNullByDefault | ||
| public class ScheduledEvents { | ||
|
|
||
| public static final EnumSet<DayOfWeek> WEEKDAYS = EnumSet.of(DayOfWeek.MONDAY, DayOfWeek.TUESDAY, | ||
| DayOfWeek.WEDNESDAY, DayOfWeek.THURSDAY, DayOfWeek.FRIDAY); | ||
|
|
||
| public static final EnumSet<DayOfWeek> WEEKENDS = EnumSet.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY); | ||
|
|
||
| public static final int SCHEDULED_EVENT_TYPE_TIME = 0; | ||
| public static final int SCHEDULED_EVENT_TYPE_SUNRISE = 1; | ||
| public static final int SCHEDULED_EVENT_TYPE_SUNSET = 2; | ||
|
|
||
| public @Nullable List<ScheduledEvent> scheduledEventData; | ||
| public @Nullable List<Integer> scheduledEventIds; | ||
|
|
||
| /* | ||
| * the following SuppressWarnings annotation is because the Eclipse compiler | ||
| * does NOT expect a NonNullByDefault annotation on the inner class, since it is | ||
| * implicitly inherited from the outer class, whereas the Maven compiler always | ||
| * requires an explicit NonNullByDefault annotation on all classes | ||
| */ | ||
| @SuppressWarnings("null") | ||
| @NonNullByDefault | ||
| public static class ScheduledEvent { | ||
| public int id; | ||
| public boolean enabled; | ||
| public int sceneId; | ||
| public int sceneCollectionId; | ||
| public boolean daySunday; | ||
| public boolean dayMonday; | ||
| public boolean dayTuesday; | ||
| public boolean dayWednesday; | ||
| public boolean dayThursday; | ||
| public boolean dayFriday; | ||
| public boolean daySaturday; | ||
| public int eventType; | ||
| public int hour; | ||
| public int minute; | ||
|
|
||
| @Override | ||
| public boolean equals(@Nullable Object o) { | ||
| if (o == this) { | ||
| return true; | ||
| } | ||
| if (!(o instanceof ScheduledEvent)) { | ||
| return false; | ||
| } | ||
| ScheduledEvent other = (ScheduledEvent) o; | ||
|
|
||
| return this.id == other.id && this.enabled == other.enabled && this.sceneId == other.sceneId | ||
| && this.sceneCollectionId == other.sceneCollectionId && this.daySunday == other.daySunday | ||
| && this.dayMonday == other.dayMonday && this.dayTuesday == other.dayTuesday | ||
| && this.dayWednesday == other.dayWednesday && this.dayThursday == other.dayThursday | ||
| && this.dayFriday == other.dayFriday && this.daySaturday == other.daySaturday | ||
| && this.eventType == other.eventType && this.hour == other.hour && this.minute == other.minute; | ||
| } | ||
|
|
||
| @Override | ||
| public final int hashCode() { | ||
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + id; | ||
| result = prime * result + (enabled ? 1 : 0); | ||
| result = prime * result + sceneId; | ||
| result = prime * result + sceneCollectionId; | ||
| result = prime * result + (daySunday ? 1 : 0); | ||
| result = prime * result + (dayMonday ? 1 : 0); | ||
| result = prime * result + (dayTuesday ? 1 : 0); | ||
| result = prime * result + (dayWednesday ? 1 : 0); | ||
| result = prime * result + (dayThursday ? 1 : 0); | ||
| result = prime * result + (dayFriday ? 1 : 0); | ||
| result = prime * result + (daySaturday ? 1 : 0); | ||
| result = prime * result + eventType; | ||
| result = prime * result + hour; | ||
| result = prime * result + minute; | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| public EnumSet<DayOfWeek> getDays() { | ||
| EnumSet<DayOfWeek> days = EnumSet.noneOf(DayOfWeek.class); | ||
| if (daySunday) { | ||
| days.add(DayOfWeek.SUNDAY); | ||
| } | ||
| if (dayMonday) { | ||
| days.add(DayOfWeek.MONDAY); | ||
| } | ||
| if (dayTuesday) { | ||
| days.add(DayOfWeek.TUESDAY); | ||
| } | ||
| if (dayWednesday) { | ||
| days.add(DayOfWeek.WEDNESDAY); | ||
| } | ||
| if (dayThursday) { | ||
| days.add(DayOfWeek.THURSDAY); | ||
| } | ||
| if (dayFriday) { | ||
| days.add(DayOfWeek.FRIDAY); | ||
| } | ||
| if (daySaturday) { | ||
| days.add(DayOfWeek.SATURDAY); | ||
| } | ||
| return days; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.