Skip to content
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

Bugfix trigger state with multible entities #10857

Merged
merged 17 commits into from
Nov 30, 2017
Merged

Bugfix trigger state with multible entities #10857

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3ac6451
Bugfix trigger state with multible entities
pvizeli Nov 29, 2017
32b4a1e
Fix numeric state
pvizeli Nov 29, 2017
6cb4843
fix lint
pvizeli Nov 29, 2017
ec9f6c1
fix dict
pvizeli Nov 29, 2017
298c144
fix unsub
pvizeli Nov 29, 2017
53d335c
fix logic
pvizeli Nov 29, 2017
97408a4
fix name
pvizeli Nov 29, 2017
c6bcaf8
fix new logic
pvizeli Nov 29, 2017
7878872
add test for state
pvizeli Nov 29, 2017
f3f6eb3
add numeric state test for unsub
pvizeli Nov 29, 2017
d823170
add test for multible entities
pvizeli Nov 29, 2017
694d570
Update numeric_state.py
pvizeli Nov 29, 2017
b0cf654
Update numeric_state.py
pvizeli Nov 29, 2017
73d190d
Update state.py
pvizeli Nov 29, 2017
780281e
Fix logic for triple match
amelchio Nov 29, 2017
c4fc4c8
Add clear to numeric state
pvizeli Nov 30, 2017
64e347d
clear for state trigger
pvizeli Nov 30, 2017
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
Prev Previous commit
Next Next commit
fix name
  • Loading branch information
@pvizeli
pvizeli authored Nov 29, 2017
commit 97408a4c2a92cea3e2e6c74abcd051ad56529397
8 changes: 4 additions & 4 deletions homeassistant/components/automation/numeric_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def async_trigger(hass, config, action):
time_delta = config.get(CONF_FOR)
value_template = config.get(CONF_VALUE_TEMPLATE)
unsub_track_same = {}
entity_triggered = set()
entities_triggered = set()

if value_template is not None:
value_template.hass = hass
Expand Down Expand Up @@ -79,16 +79,16 @@ def call_action():

matching = check_numeric_state(entity, from_s, to_s)

if matching entity not in entity_triggered:
if matching and entity not in entities_triggered:
if time_delta:
unsub_track_same[entity] = async_track_same_state(
hass, time_delta, call_action, entity_ids=entity_id,
async_check_same_func=check_numeric_state)
else:
call_action()
entity_triggered.add(entity)
entities_triggered.add(entity)

entity_triggered.discard(entity)
entities_triggered.discard(entity)

unsub = async_track_state_change(
hass, entity_id, state_automation_listener)
Expand Down