Skip to content

Fix bug with monitored_conditions in Ambient PWS #20837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabaff merged 4 commits into from
Feb 11, 2019
Merged

Fix bug with monitored_conditions in Ambient PWS #20837

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ac6b97
Make monitored_conditions more specific in Ambient PWS
bachya Feb 7, 2019
65849c7
Revert messing around with storing monitored_conditions elsewhere
bachya Feb 7, 2019
8e7b0ce
Come on, Aaron
bachya Feb 7, 2019
33dddf8
Fix bug with monitored_conditions in Ambient PWS
bachya Feb 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions homeassistant/components/ambient_station/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
REQUIREMENTS = ['aioambient==0.1.0']
_LOGGER = logging.getLogger(__name__)

DATA_CONFIG = 'config'

DEFAULT_SOCKET_MIN_RETRY = 15

TYPE_24HOURRAININ = '24hourrainin'
Expand Down Expand Up @@ -114,12 +116,20 @@ async def async_setup(hass, config):

conf = config[DOMAIN]

# Store config for use during entry setup:
hass.data[DOMAIN][DATA_CONFIG] = conf

if conf[CONF_APP_KEY] in configured_instances(hass):
return True

hass.async_create_task(
hass.config_entries.flow.async_init(
DOMAIN, context={'source': SOURCE_IMPORT}, data=conf))
DOMAIN,
context={'source': SOURCE_IMPORT},
data={
CONF_API_KEY: conf[CONF_API_KEY],
CONF_APP_KEY: conf[CONF_APP_KEY]
}))

return True

Expand All @@ -137,7 +147,7 @@ async def async_setup_entry(hass, config_entry):
Client(
config_entry.data[CONF_API_KEY],
config_entry.data[CONF_APP_KEY], session),
config_entry.data.get(CONF_MONITORED_CONDITIONS, []))
hass.data[DOMAIN][DATA_CONFIG].get(CONF_MONITORED_CONDITIONS, []))
hass.loop.create_task(ambient.ws_connect())
hass.data[DOMAIN][DATA_CLIENT][config_entry.entry_id] = ambient
except WebsocketConnectionError as err:
Expand Down