john/room_control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved toggle logic

Browse Source
This commit is contained in:
John Lancaster
2023-12-08 08:22:57 -06:00
parent e0caaedc15
commit cf9f0f3244
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
button.py
View File

@@ -38,6 +38,13 @@ class Button(Mqtt):
async def handle_action(self, action: str): async def handle_action(self, action: str):
if action == 'single': if action == 'single':
self.log(f' {action.upper()} '.center(50, '=')) self.log(f' {action.upper()} '.center(50, '='))
await self.app.toggle(kwargs={'cause': 'button single click'}) state = await self.get_state(self.args['ref_entity'])
kwargs = {
'kwargs': {'cause': f'button single click: toggle while {state}'}
}
if state == 'on':
self.app.deactivate(**kwargs)
else:
await self.app.activate(**kwargs)
else: else:
pass pass

2
motion.py
View File

@@ -101,7 +101,7 @@ class Motion(Hass):
async def cancel_motion_callback(self): async def cancel_motion_callback(self):
callbacks = await self.get_sensor_callbacks() callbacks = await self.get_sensor_callbacks()
self.log(f'Found {len(callbacks)} callbacks for {self.sensor.entity_id}') # self.log(f'Found {len(callbacks)} callbacks for {self.sensor.entity_id}')
for handle, info in callbacks.items(): for handle, info in callbacks.items():
entity = info["entity"] entity = info["entity"]
kwargs = info['kwargs'] kwargs = info['kwargs']

27
room_control.py
View File

@@ -62,15 +62,16 @@ class RoomController(Hass, Mqtt):
# schedule the transitions # schedule the transitions
for state in self.states: for state in self.states:
dt = str(state['time'])[:8] t: time = state['time']
self.log(f'Scheduling transition at: {dt}')
try: try:
await self.run_at(callback=self.activate_any_on, start=dt, cause='scheduled transition') await self.run_at(callback=self.activate_any_on, start=t.strftime('%H:%M:%S'), cause='scheduled transition')
except ValueError: except ValueError:
# happens when the callback time is in the past # happens when the callback time is in the past
pass pass
except Exception as e: except Exception as e:
self.log(f'Failed with {type(e)}: {e}') self.log(f'Failed with {type(e)}: {e}')
else:
self.log(f'Scheduled transition at: {t.strftime("%I:%M:%S %p")}')
async def parse_states(self): async def parse_states(self):
async def gen(): async def gen():
@@ -98,7 +99,7 @@ class RoomController(Hass, Mqtt):
yield state yield state
states = [s async for s in gen()] states = [s async for s in gen()]
states = sorted(states, key=lambda s: s['time'], reverse=True) # states = sorted(states, key=lambda s: s['time'], reverse=True)
return states return states
async def current_state(self, time: time = None): async def current_state(self, time: time = None):
@@ -114,10 +115,13 @@ class RoomController(Hass, Mqtt):
time = time or (await self.get_now()).time() time = time or (await self.get_now()).time()
for state in self.states: for state in self.states:
if state['time'] <= time: if state['time'] <= time:
# self.log(f'Selected state from {state["time"].strftime("%I:%M:%S%p")}') res = state
return state
else: else:
return self.states[-1] self.log(f'Defaulting to first state')
res = self.states[0]
self.log(f'Selected state from {res["time"].strftime("%I:%M:%S %p")}')
return res
async def current_scene(self, time: time = None): async def current_scene(self, time: time = None):
if (state := (await self.current_state(time=time))) is not None: if (state := (await self.current_state(time=time))) is not None:
@@ -236,12 +240,3 @@ class RoomController(Hass, Mqtt):
for e in self.app_entities: for e in self.app_entities:
self.turn_off(e) self.turn_off(e)
self.log(f'Turned off {e}') self.log(f'Turned off {e}')
@utils.sync_wrapper
async def toggle(self, *args, **kwargs):
state = await self.get_state(self.args['ref_entity'])
kwargs['kwargs']['cause'] += f': toggle while {state}'
if state == 'on':
self.deactivate(*args, **kwargs)
else:
await self.activate(*args, **kwargs)