Fix scene group support for Hub v1.

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
openhab · Dec 26, 2021 · 3924ec3 · 3924ec3
1 parent db2ce7a
commit 3924ec3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/...main/java/org/openhab/binding/hdpowerview/internal/builders/AutomationChannelBuilder.java b/...main/java/org/openhab/binding/hdpowerview/internal/builders/AutomationChannelBuilder.java
@@ -165,8 +165,7 @@ public List<Channel> build() {
             if (scene != null) {
                 return scene.getName();
             }
-            logger.warn("Scene '{}' was not found for scheduled event '{}'", scheduledEvent.sceneId,
-                    scheduledEvent.id);
+            logger.warn("Scene '{}' was not found for scheduled event '{}'", scheduledEvent.sceneId, scheduledEvent.id);
             return null;
         } else if (scheduledEvent.sceneCollectionId > 0) {
             SceneCollection sceneCollection = sceneCollections.get(scheduledEvent.sceneCollectionId);

diff --git a/...src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java b/...src/main/java/org/openhab/binding/hdpowerview/internal/handler/HDPowerViewHubHandler.java
@@ -311,14 +311,6 @@ private void updateFirmwareProperties(MainProcessor mainProcessor) {
         updateProperties(properties);
     }
 
-    private Boolean areSceneCollectionsSupportedByHub() {
-        MainProcessor mainProcessor = firmwareMainProcessor;
-        if (mainProcessor == null) {
-            return false;
-        }
-        return mainProcessor.revision >= 2;
-    }
-
     private void pollShades() throws JsonParseException, HubProcessingException, HubMaintenanceException {
         HDPowerViewWebTargets webTargets = this.webTargets;
         if (webTargets == null) {
@@ -453,10 +445,6 @@ private void createDeprecatedSceneChannels(List<Scene> scenes) {
 
     private List<SceneCollection> fetchSceneCollections()
             throws JsonParseException, HubProcessingException, HubMaintenanceException {
-        if (!areSceneCollectionsSupportedByHub()) {
-            return new ArrayList<SceneCollection>();
-        }
-
         HDPowerViewWebTargets webTargets = this.webTargets;
         if (webTargets == null) {
             throw new ProcessingException("Web targets not initialized");