remote/adaptive-lighting
1
0
Fork 0
mirror of https://github.com/basnijholt/adaptive-lighting.git synced 2026-09-11 22:34:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixes from previous commit

Browse source
This commit is contained in:
Bas Nijholt 2020-09-01 18:49:16 +02:00
commit ce19976c5e
2 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
custom_components/circadian_lighting/__init__.py
View file

@ -158,12 +158,11 @@ class CircadianLighting:
self._transition = transition
self._timezone = self.get_timezone()
self._percent = None
self._colortemp = None
self._rgb_color = None
self._xy_color = None
self._hs_color = None
self.update()
self._percent = self.calc_percent()
self._colortemp = self.calc_colortemp()
self._rgb_color = self.calc_rgb()
self._xy_color = self.calc_xy()
self._hs_color = self.calc_hs()
if self._manual_time["sunrise"] is not None:
async_track_time_change(

25
custom_components/circadian_lighting/switch.py
View file

@ -2,7 +2,6 @@
Circadian Lighting Switch for Home-Assistant.
"""
import functools
import logging
import voluptuous as vol
@ -204,7 +203,9 @@ class CircadianSwitch(SwitchEntity, RestoreEntity):
)
# Add listeners
async_track_state_change(self.hass, self._lights, self.light_state_changed)
async_track_state_change(
self.hass, self._lights, self.light_state_changed, to_state="on"
)
if self._sleep_entity is not None:
async_track_state_change(
@ -212,13 +213,10 @@ class CircadianSwitch(SwitchEntity, RestoreEntity):
)
if self._disable_entity is not None:
disable_state_changed = functools.partial(
self._update_switch, transition=self._initial_transition, force=True
)
async_track_state_change(
self.hass,
self._disable_entity,
disable_state_changed,
self.disable_state_changed,
from_state=self._disable_state,
)
@ -245,7 +243,7 @@ class CircadianSwitch(SwitchEntity, RestoreEntity):
def turn_on(self, **kwargs):
"""Turn on circadian lighting."""
self._state = True
self._update_switch(transition=self._initial_transition, force=True)
self._force_update_switch()
def turn_off(self, **kwargs):
"""Turn off circadian lighting."""
@ -296,6 +294,11 @@ class CircadianSwitch(SwitchEntity, RestoreEntity):
self._brightness = self.calc_brightness()
self._adjust_lights(lights or self._lights, transition)
def _force_update_switch(self, lights=None):
return self._update_switch(
lights, transition=self._initial_transition, force=True
)
def _is_disabled(self):
return (
self._disable_entity is not None
@ -342,8 +345,12 @@ class CircadianSwitch(SwitchEntity, RestoreEntity):
def light_state_changed(self, entity_id, from_state, to_state):
if to_state.state == "on" and from_state.state != "on":
self._update_switch([entity_id], self._initial_transition, force=True)
self._force_update_switch(lights=[entity_id])
def sleep_state_changed(self, entity_id, from_state, to_state):
if to_state.state in self._sleep_state or from_state.state in self._sleep_state:
self._update_switch(transition=self._initial_transition, force=True)
self._force_update_switch()
def disable_state_changed(self, entity_id, from_state, to_state):
if from_state.state in self._disable_state:
self._force_update_switch()