Merge pull request openhab#67 from digitaldan/omni-remove-console-dis…

…covery removes console discovery, fixes openhab#62
digitaldan · Jul 7, 2017 · 0d7474a · 0d7474a
2 parents a0dfd42 + baaa825
commit 0d7474a
Showing 1 changed file with 0 additions and 29 deletions.
diff --git a/...nilink/src/main/java/org/openhab/binding/omnilink/discovery/OmnilinkDiscoveryService.java b/...nilink/src/main/java/org/openhab/binding/omnilink/discovery/OmnilinkDiscoveryService.java
@@ -26,7 +26,6 @@
 import com.digitaldan.jomnilinkII.MessageTypes.properties.AreaProperties;
 import com.digitaldan.jomnilinkII.MessageTypes.properties.AudioZoneProperties;
 import com.digitaldan.jomnilinkII.MessageTypes.properties.ButtonProperties;
-import com.digitaldan.jomnilinkII.MessageTypes.properties.ConsoleProperties;
 import com.digitaldan.jomnilinkII.MessageTypes.properties.ThermostatProperties;
 import com.digitaldan.jomnilinkII.MessageTypes.properties.UnitProperties;
 import com.digitaldan.jomnilinkII.MessageTypes.properties.ZoneProperties;
@@ -72,8 +71,6 @@ protected void startScan() {
             discoverButtons();
             discoverThermostats();
             discoverAudioZones();
-            // generate consoles is throwing and error
-            // generateConsoles();
         } catch (OmniInvalidResponseException | OmniUnknownMessageTypeException | BridgeOfflineException e) {
             logger.debug("Received error during discovery", e);
         }
@@ -118,32 +115,6 @@ private void discoverButtons()
         }
     }
 
-    private void generateConsoles()
-            throws OmniInvalidResponseException, OmniUnknownMessageTypeException, BridgeOfflineException {
-
-        for (AreaProperties areaProperties : areas) {
-            int areaFilter = bitFilterForArea(areaProperties);
-
-            ObjectPropertyRequest<ConsoleProperties> objectPropertyRequest = ObjectPropertyRequest
-                    .builder(bridgeHandler, ObjectPropertyRequests.CONSOLE).areaFilter(areaFilter).build();
-
-            for (ConsoleProperties consoleProperties : objectPropertyRequest) {
-
-                int objnum = consoleProperties.getNumber();
-                Map<String, Object> properties = new HashMap<>();
-                ThingUID thingUID = new ThingUID(OmnilinkBindingConstants.THING_TYPE_CONSOLE,
-                        bridgeHandler.getThing().getUID(), Integer.toString(objnum));
-                properties.put(OmnilinkBindingConstants.THING_PROPERTIES_NUMBER, objnum);
-                properties.put(OmnilinkBindingConstants.THING_PROPERTIES_AREA, areaProperties.getNumber());
-
-                DiscoveryResult discoveryResult = DiscoveryResultBuilder.create(thingUID).withProperties(properties)
-                        .withBridge(this.bridgeHandler.getThing().getUID()).withLabel(consoleProperties.getName())
-                        .build();
-                thingDiscovered(discoveryResult);
-            }
-        }
-    }
-
     private void discoverAudioZones()
             throws OmniInvalidResponseException, OmniUnknownMessageTypeException, BridgeOfflineException {