thomas/hass-config
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More minor fixes

Browse Source
This commit is contained in:
Thomas Lovén
2019-01-01 23:50:00 +01:00
parent acabc57019
commit c0d9f01e29
3 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
appdaemon/apps/timeofday.py
View File

@@ -11,6 +11,8 @@ class TimeOfDay(Timers, Entities):
self.run_in(self._setup_inputs, 1)
self.updating = False
def _setup_inputs(self, kwargs):
inputs = [
'morning',
@@ -29,24 +31,20 @@ class TimeOfDay(Timers, Entities):
del e['name']
del e['default']
self.register_entity(i, name, True, default, e)
for i in inputs:
self.e[i].listen(self._update, {'trigger': 'setting', 'entity': i})
self._update(None, None, {'trigger': 'init'})
def _update(self, old=None, new=None, kwarg=None):
if self.updating:
return
if kwarg is None:
kwarg = old
trigger = kwarg.get('trigger', None)
# Tell listeners if Time Of Day or Dark has changed
if kwarg.get('entity', None) == 'tod':
self.fire_event('TOD_TOD', old = old, new = new)
return
if kwarg.get('entity', None) == 'dark':
self.fire_event('TOD_DARK', old = old, new = new)
return
self.log(f"TOD - updated by {trigger}")
# Set up triggers for each TOD
@@ -60,20 +58,20 @@ class TimeOfDay(Timers, Entities):
)
# Set up triggers for sunrise and sunset
sunrise = float(self.e['sunrise'].state)
sunrise = timedelta(minutes=sunrise)
sunrise = (self.sunrise() + sunrise).time()
if trigger != 'sunrise':
sunrise = float(self.e['sunrise'].state)
sunrise = timedelta(minutes=sunrise)
sunrise = (self.sunrise() + sunrise).time()
self.run_once(
'sunrise',
self._update,
sunrise,
trigger='sunrise'
)
sunset = float(self.e['sunset'].state)
sunset = timedelta(minutes=sunset)
sunset = (self.sunset() + sunset).time()
if trigger != 'sunset':
sunset = float(self.e['sunset'].state)
sunset = timedelta(minutes=sunset)
sunset = (self.sunset() + sunset).time()
self.run_once(
'sunset',
self._update,
@@ -104,14 +102,23 @@ class TimeOfDay(Timers, Entities):
self.log(f"TOD - Time of day is {tod}, sun {'has set' if dark else 'is up'}")
# Update outputs
self.updating = True
self.e['dark'].state = dark
self.e['dark'].push()
self.e['tod'].state = tod
self.e['tod'].push()
self.e['sunrise'].attr['time'] = sunrise.strftime("%H:%M:%S")
self.e['sunrise'].push()
self.e['sunset'].attr['time'] = sunset.strftime("%H:%M:%S")
self.e['sunset'].push()
self.updating = False
# Tell listeners if Time Of Day or Dark has changed
self.fire_event('TOD_TOD', old = old, new = new)
@property
def tod(self):
return self.e['tod'].state
@property
def dark(self):
return self.e['dark'].state
return self.e['dark'].state == "on"