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

moved ref_entity

Browse Source
This commit is contained in:
John Lancaster
2023-11-25 01:12:20 -06:00
parent 643fd90ff0
commit 570fc40946
2 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
motion.py
View File

@@ -15,6 +15,14 @@ class Motion(Hass):
def sensor_state(self) -> bool: def sensor_state(self) -> bool:
return self.sensor.state == 'on' return self.sensor.state == 'on'
@property
def ref_entity(self) -> Entity:
return self.get_entity(self.args['ref_entity'])
@property
def ref_entity_state(self) -> bool:
return self.ref_entity.get_state() == 'on'
@property @property
def off_duration(self) -> timedelta: def off_duration(self) -> timedelta:
return self.app.off_duration return self.app.off_duration
@@ -23,8 +31,8 @@ class Motion(Hass):
self.app: RoomController = self.get_app(self.args['app']) self.app: RoomController = self.get_app(self.args['app'])
self.log(f'Connected to app {self.app.name}') self.log(f'Connected to app {self.app.name}')
self.listen_state(self.callback_light_on, self.args['entity'], new='on') self.listen_state(self.callback_light_on, self.ref_entity.entity_id, new='on')
self.listen_state(self.callback_light_off, self.args['entity'], new='off') self.listen_state(self.callback_light_off, self.ref_entity.entity_id, new='off')
self.sync_state() self.sync_state()
@@ -33,7 +41,7 @@ class Motion(Hass):
Essentially mimics the `state_change` callback based on the current state of the light. Essentially mimics the `state_change` callback based on the current state of the light.
""" """
if self.app.entity_state: if self.ref_entity_state:
self.callback_light_on() self.callback_light_on()
else: else:
self.callback_light_off() self.callback_light_off()

76
room_control.py
View File

@@ -27,47 +27,47 @@ class RoomController(Hass, Mqtt):
self.log(f'Setting up input button: {self.friendly_name(ha_button)}') self.log(f'Setting up input button: {self.friendly_name(ha_button)}')
self.listen_state(callback=self.activate_any_on, entity_id=ha_button) self.listen_state(callback=self.activate_any_on, entity_id=ha_button)
@property # @property
def entity(self) -> str: # def entity(self) -> str:
return self.args['entity'] # return self.args['entity']
@property # @property
def entity_state(self) -> bool: # def entity_state(self) -> bool:
return self.get_state(self.entity) == 'on' # return self.get_state(self.entity) == 'on'
@entity_state.setter # @entity_state.setter
def entity_state(self, new): # def entity_state(self, new):
if isinstance(new, str): # if isinstance(new, str):
if new == 'on': # if new == 'on':
self.turn_on(self.entity) # self.turn_on(self.entity)
elif new == 'off': # elif new == 'off':
self.turn_on(self.entity) # self.turn_on(self.entity)
else: # else:
raise ValueError(f'Invalid value for entity state: {new}') # raise ValueError(f'Invalid value for entity state: {new}')
elif isinstance(new, bool): # elif isinstance(new, bool):
if new: # if new:
self.turn_on(self.entity) # self.turn_on(self.entity)
self.log(f'Turned on {self.friendly_name(self.entity)}') # self.log(f'Turned on {self.friendly_name(self.entity)}')
else: # else:
self.turn_off(self.entity) # self.turn_off(self.entity)
self.log(f'Turned off {self.friendly_name(self.entity)}') # self.log(f'Turned off {self.friendly_name(self.entity)}')
elif isinstance(new, dict): # elif isinstance(new, dict):
if any(isinstance(val, dict) for val in new.values()): # if any(isinstance(val, dict) for val in new.values()):
# self.log(f'Setting scene with nested dict: {new}') # # self.log(f'Setting scene with nested dict: {new}')
for entity, state in new.items(): # for entity, state in new.items():
if state.pop('state', 'on') == 'on': # if state.pop('state', 'on') == 'on':
# self.log(f'Setting {entity} state with: {state}') # # self.log(f'Setting {entity} state with: {state}')
self.turn_on(entity_id=entity, **state) # self.turn_on(entity_id=entity, **state)
else: # else:
self.turn_off(entity) # self.turn_off(entity)
else: # else:
if new.pop('state', 'on') == 'on': # if new.pop('state', 'on') == 'on':
self.turn_on(self.entity, **new) # self.turn_on(self.entity, **new)
else: # else:
self.turn_off(self.entity) # self.turn_off(self.entity)
else: # else:
raise TypeError(f'Invalid type: {type(new)}: {new}') # raise TypeError(f'Invalid type: {type(new)}: {new}')
def parse_states(self): def parse_states(self):
def gen(): def gen():