-
-
Notifications
You must be signed in to change notification settings - Fork 32.3k
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.
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
Async support with resource observation. #7815
Merged
Merged
Changes from 1 commit
Commits
Show all changes
83 commits
Select commit
Hold shift + click to select a range
fb921f3
[light.tradfri] Initial support for observe
lwis 140cd0b
Merge upstream
lwis 416559b
Update for pytradfri 2.0
lwis 976527c
Fix imports
lwis ebc408a
Fix missing call
lwis 304857f
Don't yield from add devices
lwis 264b43c
Fix imports
lwis b83ce62
Minor fixes to async code.
lwis 836bb63
Imports, formatting
lwis 93bdbd0
Docker updates, some minor async code changes.
lwis 6a13613
Lint
lwis b1e1fc2
Lint
lwis 089c65e
Merge remote-tracking branch 'origin' into tradfri-observe
lwis b6ed0ed
Update pytradfri
lwis acf27bc
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis dd6d5b6
Minor updates for release version
lwis 27ff361
Build fixes
lwis e432e7f
Retry observation if failed
lwis 748a7cf
Revert
lwis 0158959
Additional logging, fix returns
lwis 597464d
Fix rename
lwis 949ace2
Merge branch 'dev' into tradfri-observe
lwis 10887e2
Bump version
lwis 2e7e6c1
Bump version
lwis 2d6b3df
Support transitions
lwis d4255c2
Lint
lwis 44f70f8
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 0a3f3d5
Fix transitions
lwis 462c641
Update Dockerfile
balloob 7858e0c
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis c726069
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis a45c7dc
Set temp first
lwis 8899efb
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 1052a78
Merge upstream
lwis dec727d
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 0c841c3
Observation error handling
lwis 5906591
Lint
lwis 814f420
Lint
lwis a2ac6a9
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis c9ce479
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 14af049
Lint
lwis b6bc24d
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis f4e1df5
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 61797d3
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis b2ba3e7
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 82d9aef
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis bf68cfd
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 7c9ff4b
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis fae1ff5
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 06e594e
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 952dbc0
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis a243655
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis cfcf227
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 90e513c
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 6e30db9
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 5db61e4
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 0cbb660
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 03647e0
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 8b3ca01
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis aef1005
Merge upstream changes
lwis 76b1913
Fix bugs
lwis 719c1f1
Fix bugs
lwis fb168b4
Fix bugs
lwis 4197a91
Lint
lwis 0b33ebc
Add sensor
lwis 98f4cc1
Add sensor
lwis cc327a0
Move sensor attrs
lwis 152f279
Filter devices better
lwis 72b6c59
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 06d3e72
Lint
lwis 537f3df
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis b6749eb
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis c839e66
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 7189363
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 1813db0
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 047d1b1
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis c7f4373
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis e86ea21
Address comments
lwis 32ae7c1
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis 3eba9aa
Pin aiocoap
lwis 4141908
Merge remote-tracking branch 'origin/dev' into tradfri-observe
lwis bc589c8
Fix bug if no devices
lwis f77fd09
Requirements
lwis File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Imports, formatting
- Loading branch information
commit 836bb635314b27216a7d3ab85ab99eb10453709b
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,12 +8,6 @@ | |
import logging | ||
|
||
from homeassistant.core import callback | ||
|
||
try: | ||
from asyncio import ensure_future | ||
except ImportError: | ||
from asyncio import async as ensure_future | ||
|
||
from homeassistant.components.light import ( | ||
ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_RGB_COLOR, SUPPORT_BRIGHTNESS, | ||
SUPPORT_COLOR_TEMP, SUPPORT_RGB_COLOR, Light) | ||
|
@@ -120,12 +114,10 @@ def _async_start_observe(self, err=None): | |
if err: | ||
_LOGGER.info("Observation failed for {}".format(self._name), err) | ||
|
||
observe_command = self._group.observe(callback= | ||
self._async_observe_update, | ||
err_callback= | ||
self._async_start_observe, | ||
duration=0) | ||
observe_task = self._api(observe_command) | ||
cmd = self._group.observe(callback=self._async_observe_update, | ||
err_callback=self._async_start_observe, | ||
duration=0) | ||
observe_task = self._api(cmd) | ||
self.hass.async_add_job(observe_task) | ||
|
||
@callback | ||
|
@@ -137,7 +129,7 @@ def _async_refresh(self, group): | |
@callback | ||
def _async_observe_update(self, tradfri_device): | ||
"""Receive new state data for this light.""" | ||
self._refresh(tradfri_device) | ||
self._async_refresh(tradfri_device) | ||
|
||
self.hass.async_add_job(self.async_update_ha_state()) | ||
|
||
|
@@ -250,12 +242,10 @@ def _async_start_observe(self, err=None): | |
if err: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. undefined name 'err' |
||
_LOGGER.info("Observation failed for {}".format(self._name), err) | ||
|
||
observe_command = self._light.observe(callback= | ||
self._async_observe_update, | ||
err_callback= | ||
self._async_start_observe, | ||
duration=0) | ||
observe_task = self._api(observe_command) | ||
cmd = self._light.observe(callback=self._async_observe_update, | ||
err_callback=self._async_start_observe, | ||
duration=0) | ||
observe_task = self._api(cmd) | ||
self.hass.async_add_job(observe_task) | ||
|
||
@callback | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will the error callback also be called when the time expires?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't believe so