Fix HC3 compatibility further (home-assistant#38931)

* Update __init__.py Further fixes for HC3 compatibility. * Update homeassistant/components/fibaro/__init__.py Co-authored-by: Martin Hjelmare <marhje52@gmail.com> Co-authored-by: Martin Hjelmare <marhje52@gmail.com>
weissm · Aug 28, 2020 · eafbe72 · eafbe72
1 parent d929a84
commit eafbe72
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/homeassistant/components/fibaro/__init__.py b/homeassistant/components/fibaro/__init__.py
@@ -235,10 +235,10 @@ def _read_scenes(self):
         scenes = self._client.scenes.list()
         self._scene_map = {}
         for device in scenes:
-            if "visible" in device and not device.visible:
+            if "name" not in device or "id" not in device:
                 continue
             device.fibaro_controller = self
-            if device.roomID == 0:
+            if "roomID" not in device or device.roomID == 0:
                 room_name = "Unknown"
             else:
                 room_name = self._room_map[device.roomID].name
@@ -250,6 +250,7 @@ def _read_scenes(self):
             device.unique_id_str = f"{self.hub_serial}.scene.{device.id}"
             self._scene_map[device.id] = device
             self.fibaro_devices["scene"].append(device)
+            _LOGGER.debug("%s scene -> %s", device.ha_id, device)
 
     def _read_devices(self):
         """Read and process the device list."""
@@ -259,8 +260,10 @@ def _read_devices(self):
         last_climate_parent = None
         for device in devices:
             try:
+                if "name" not in device or "id" not in device:
+                    continue
                 device.fibaro_controller = self
-                if device.roomID == 0:
+                if "roomID" not in device or device.roomID == 0:
                     room_name = "Unknown"
                 else:
                     room_name = self._room_map[device.roomID].name