Merge HA plugin (#444)

XKNX · Oct 1, 2020 · 5528527 · 5528527
1 parent 22c87f5
commit 5528527
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/home-assistant-plugin/custom_components/xknx/__init__.py b/home-assistant-plugin/custom_components/xknx/__init__.py
@@ -224,9 +224,8 @@ def connection_config(self):
             return self.connection_config_tunneling()
         if CONF_XKNX_ROUTING in self.config[DOMAIN]:
             return self.connection_config_routing()
-        # return None to let xknx use config from xknx.yaml connection block if given
-        #   otherwise it will use default ConnectionConfig (Automatic)
-        return None
+        # config from xknx.yaml always has priority later on
+        return ConnectionConfig()
 
     def connection_config_routing(self):
         """Return the connection_config if routing is configured."""

diff --git a/home-assistant-plugin/custom_components/xknx/manifest.json b/home-assistant-plugin/custom_components/xknx/manifest.json
@@ -3,5 +3,6 @@
   "name": "KNX",
   "documentation": "https://www.home-assistant.io/integrations/knx",
   "requirements": [],
-  "codeowners": ["@Julius2342", "@farmio", "@marvin-w"]
+  "codeowners": ["@Julius2342", "@farmio", "@marvin-w"],
+  "quality_scale": "silver"
 }