jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-25 06:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update xknx to 0.15.0 (#40649)

Browse Source 
* Update xknx to 0.15.0

closes #40526

* Review: Remove log_directory for now

* Review: typo fix
This commit is contained in:
Marvin Wichmann 2020-09-30 10:04:56 +02:00 committed by GitHub
parent e38ae1b188
commit f5429dc175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
homeassistant/components/knx/__init__.py
View File

@ -191,20 +191,17 @@ class KNXModule:
"""Initialize of KNX object.""" """Initialize of KNX object."""
self.xknx = XKNX( self.xknx = XKNX(
config=self.config_file(), config=self.config_file(),
loop=self.hass.loop,
own_address=self.config[DOMAIN][CONF_KNX_INDIVIDUAL_ADDRESS], own_address=self.config[DOMAIN][CONF_KNX_INDIVIDUAL_ADDRESS],
rate_limit=self.config[DOMAIN][CONF_KNX_RATE_LIMIT], rate_limit=self.config[DOMAIN][CONF_KNX_RATE_LIMIT],
multicast_group=self.config[DOMAIN][CONF_KNX_MCAST_GRP], multicast_group=self.config[DOMAIN][CONF_KNX_MCAST_GRP],
multicast_port=self.config[DOMAIN][CONF_KNX_MCAST_PORT], multicast_port=self.config[DOMAIN][CONF_KNX_MCAST_PORT],
connection_config=self.connection_config(),
state_updater=self.config[DOMAIN][CONF_KNX_STATE_UPDATER],
) )
async def start(self): async def start(self):
"""Start KNX object. Connect to tunneling or Routing device.""" """Start KNX object. Connect to tunneling or Routing device."""
connection_config = self.connection_config() await self.xknx.start()
await self.xknx.start(
state_updater=self.config[DOMAIN][CONF_KNX_STATE_UPDATER],
connection_config=connection_config,
)
self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.stop) self.hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, self.stop)
self.connected = True self.connected = True
@ -227,9 +224,8 @@ class KNXModule:
return self.connection_config_tunneling() return self.connection_config_tunneling()
if CONF_KNX_ROUTING in self.config[DOMAIN]: if CONF_KNX_ROUTING in self.config[DOMAIN]:
return self.connection_config_routing() return self.connection_config_routing()
# return None to let xknx use config from xknx.yaml connection block if given # config from xknx.yaml always has priority later on
# otherwise it will use default ConnectionConfig (Automatic) return ConnectionConfig()
return None
def connection_config_routing(self): def connection_config_routing(self):
"""Return the connection_config if routing is configured.""" """Return the connection_config if routing is configured."""

2
homeassistant/components/knx/manifest.json
View File

@ -2,7 +2,7 @@
"domain": "knx", "domain": "knx",
"name": "KNX", "name": "KNX",
"documentation": "https://www.home-assistant.io/integrations/knx", "documentation": "https://www.home-assistant.io/integrations/knx",
"requirements": ["xknx==0.14.4"], "requirements": ["xknx==0.15.0"],
"codeowners": ["@Julius2342", "@farmio", "@marvin-w"], "codeowners": ["@Julius2342", "@farmio", "@marvin-w"],
"quality_scale": "silver" "quality_scale": "silver"
} }

2
requirements_all.txt
View File

@ -2277,7 +2277,7 @@ xboxapi==2.0.1
xfinity-gateway==0.0.4 xfinity-gateway==0.0.4
# homeassistant.components.knx # homeassistant.components.knx
xknx==0.14.4 xknx==0.15.0
# homeassistant.components.bluesound # homeassistant.components.bluesound
# homeassistant.components.rest # homeassistant.components.rest