diff --git a/.gitignore b/.gitignore index 1b81205..0bd58ed 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ backup_config.yaml .storage/ .cloud/ .automatic/ +glances/ .tts.token* *.tts.token customize.yaml diff --git a/README.md b/README.md index 1d873f5..6038650 100644 --- a/README.md +++ b/README.md @@ -47,17 +47,17 @@ This is how to actuall do it! ```yaml - platform: template value_template: > - {{ is_state('binary_sensor.girls_room_multisensor_home_security_motion_detection','off') and states('sensor.girls_room_last_motion') | int <= 300 and states('sensor.system_uptime') | int >= 5 }} + {{ is_state('binary_sensor.girls_room_multisensor_motion_detection','off') and states('sensor.girls_room_last_motion') | int <= 300 and states('sensor.system_uptime') | int >= 5 }} prob_given_true: 0.8 - platform: template value_template: > - {{ is_state('binary_sensor.girls_room_multisensor_home_security_motion_detection','off') and states('sensor.girls_room_last_motion') | int > 300 and states('sensor.girls_room_last_motion') | int <= 600 and states('sensor.system_uptime') | int >= 5 }} + {{ is_state('binary_sensor.girls_room_multisensor_motion_detection','off') and states('sensor.girls_room_last_motion') | int > 300 and states('sensor.girls_room_last_motion') | int <= 600 and states('sensor.system_uptime') | int >= 5 }} prob_given_true: 0.6 - platform: template value_template: > - {{ is_state('binary_sensor.girls_room_multisensor_home_security_motion_detection','off') and states('sensor.girls_room_last_motion') | int > 600 and states('sensor.girls_room_last_motion') | int <= 900 and states('sensor.system_uptime') | int >= 10 }} + {{ is_state('binary_sensor.girls_room_multisensor_motion_detection','off') and states('sensor.girls_room_last_motion') | int > 600 and states('sensor.girls_room_last_motion') | int <= 900 and states('sensor.system_uptime') | int >= 10 }} prob_given_true: 0.4 ``` diff --git a/automations/cameras/frigate_recordings.yaml b/automations/cameras/frigate_recordings.yaml index 240fc67..d935e9c 100644 --- a/automations/cameras/frigate_recordings.yaml +++ b/automations/cameras/frigate_recordings.yaml @@ -40,8 +40,8 @@ action: - switch.frigate_cam07_recordings - switch.frigate_cam08_recordings - switch.frigate_cam12_recordings - - switch.frigate_cam13_recordings - - switch.frigate_cam14_recordings + # - switch.frigate_cam13_recordings + # - switch.frigate_cam14_recordings - switch.frigate_cam18_recordings - switch.frigate_cam19_recordings @@ -61,7 +61,7 @@ action: - switch.frigate_cam07_recordings - switch.frigate_cam08_recordings - switch.frigate_cam12_recordings - - switch.frigate_cam13_recordings + # - switch.frigate_cam13_recordings - conditions: - condition: state entity_id: input_boolean.indoor_recordings @@ -77,7 +77,7 @@ action: - switch.frigate_cam07_recordings - switch.frigate_cam08_recordings - switch.frigate_cam12_recordings - - switch.frigate_cam13_recordings + # - switch.frigate_cam13_recordings - choose: - conditions: @@ -90,7 +90,7 @@ action: target: entity_id: - switch.frigate_cam04_recordings - - switch.frigate_cam14_recordings + # - switch.frigate_cam14_recordings - switch.frigate_cam18_recordings - switch.frigate_cam19_recordings - conditions: @@ -103,6 +103,6 @@ action: target: entity_id: - switch.frigate_cam04_recordings - - switch.frigate_cam14_recordings + # - switch.frigate_cam14_recordings - switch.frigate_cam18_recordings - switch.frigate_cam19_recordings diff --git a/automations/cameras/frigate_snapshots.yaml b/automations/cameras/frigate_snapshots.yaml index 17db64c..44c2922 100644 --- a/automations/cameras/frigate_snapshots.yaml +++ b/automations/cameras/frigate_snapshots.yaml @@ -40,8 +40,8 @@ action: - switch.frigate_cam07_snapshots - switch.frigate_cam08_snapshots - switch.frigate_cam12_snapshots - - switch.frigate_cam13_snapshots - - switch.frigate_cam14_snapshots + # - switch.frigate_cam13_snapshots + # - switch.frigate_cam14_snapshots - switch.frigate_cam18_snapshots - switch.frigate_cam19_snapshots @@ -61,7 +61,7 @@ action: - switch.frigate_cam07_snapshots - switch.frigate_cam08_snapshots - switch.frigate_cam12_snapshots - - switch.frigate_cam13_snapshots + # - switch.frigate_cam13_snapshots - conditions: - condition: state entity_id: input_boolean.indoor_snapshots @@ -77,7 +77,7 @@ action: - switch.frigate_cam07_snapshots - switch.frigate_cam08_snapshots - switch.frigate_cam12_snapshots - - switch.frigate_cam13_snapshots + # - switch.frigate_cam13_snapshots - choose: - conditions: @@ -90,7 +90,7 @@ action: target: entity_id: - switch.frigate_cam04_snapshots - - switch.frigate_cam14_snapshots + # - switch.frigate_cam14_snapshots - switch.frigate_cam18_snapshots - switch.frigate_cam19_snapshots - conditions: @@ -103,6 +103,6 @@ action: target: entity_id: - switch.frigate_cam04_snapshots - - switch.frigate_cam14_snapshots + # - switch.frigate_cam14_snapshots - switch.frigate_cam18_snapshots - switch.frigate_cam19_snapshots diff --git a/automations/frigate/frigate_person_front_porch.yaml b/automations/frigate/frigate_person_front_porch.yaml index 5c5f7a2..62c122c 100644 --- a/automations/frigate/frigate_person_front_porch.yaml +++ b/automations/frigate/frigate_person_front_porch.yaml @@ -39,7 +39,7 @@ condition: - '{{ is_state("binary_sensor.front_door_contact","off") }}' - '{{ is_state("binary_sensor.patio_door_contact","off") }}' - '{{ is_state("binary_sensor.front_porch_motion","off") }}' - - '{{ is_state("binary_sensor.garage_motion_switch_home_security_motion_detection","off") }}' + - '{{ is_state("binary_sensor.garage_motion_switch_motion_detection","off") }}' - "{{ is_state('input_boolean.outdoor_snapshots','on') }}" action: - choose: diff --git a/automations/people/adults_away_something_open.yaml b/automations/people/adults_away_something_open.yaml index 88d5b9e..01f651e 100644 --- a/automations/people/adults_away_something_open.yaml +++ b/automations/people/adults_away_something_open.yaml @@ -20,7 +20,7 @@ action: data: message: >- {% if as_timestamp(states.input_boolean.kristy_home.last_updated) > as_timestamp(states.input_boolean.clint_home.last_updated) %} - The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} + The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} {% else %} - The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} + The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} {% endif %} diff --git a/automations/people/bedtime_something_open.yaml b/automations/people/bedtime_something_open.yaml index 47e0f75..14276ea 100644 --- a/automations/people/bedtime_something_open.yaml +++ b/automations/people/bedtime_something_open.yaml @@ -32,4 +32,4 @@ action: media_player_entity_id: media_player.ma_home_assistant_voice_097b44_media_player message: >- The following are open: - {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} + {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('binary_sensor.exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} diff --git a/automations/people/nearly_home.yaml b/automations/people/nearly_home.yaml index d3cb9d0..0af290f 100644 --- a/automations/people/nearly_home.yaml +++ b/automations/people/nearly_home.yaml @@ -13,7 +13,7 @@ condition: state: "off" for: "00:10:00" - condition: numeric_state - entity_id: sensor.deck_light_level + entity_id: sensor.deck_hue_motion_sensor_illuminance below: 25 - condition: numeric_state entity_id: sensor.sun_elevation diff --git a/automations/people/returned_home.yaml b/automations/people/returned_home.yaml index b9916cb..eb8b0ea 100644 --- a/automations/people/returned_home.yaml +++ b/automations/people/returned_home.yaml @@ -38,7 +38,7 @@ condition: state: "on" # It's getting dark - condition: numeric_state - entity_id: sensor.bar_light_level + entity_id: sensor.bar_hue_motion_sensor_illuminance below: 15 # Somebody is nearly home, or just arrived - condition: or diff --git a/automations/rooms/boys_room/boys_room_out_of_bed.yaml b/automations/rooms/boys_room/boys_room_out_of_bed.yaml index 456055b..74c3937 100644 --- a/automations/rooms/boys_room/boys_room_out_of_bed.yaml +++ b/automations/rooms/boys_room/boys_room_out_of_bed.yaml @@ -95,13 +95,31 @@ action: entity_id: binary_sensor.computer_area_occupied state: "on" sequence: - - action: webrtc.dash_cast - data: + - action: media_player.play_media + target: entity_id: media_player.computer_area_hub - url: cam01_sub_opus - force: true - extra: - mode: webrtc + data: + media: + media_content_id: media-source://camera/camera.frigate_cam01 + media_content_type: image/jpeg + metadata: + title: Frigate Cam01 + thumbnail: /api/camera_proxy/camera.frigate_cam01 + media_class: video + children_media_class: null + navigateIds: + - {} + - media_content_type: app + media_content_id: media-source://camera + browse_entity_id: media_player.computer_area_hub + + # - action: webrtc.dash_cast + # data: + # entity_id: media_player.computer_area_hub + # url: cam01_sub + # force: true + # extra: + # mode: webrtc - choose: - conditions: @@ -109,13 +127,31 @@ action: entity_id: binary_sensor.front_room_occupied state: "on" sequence: - - action: webrtc.dash_cast - data: + - action: media_player.play_media + target: entity_id: media_player.front_room_hub - url: cam01_sub_opus - force: true - extra: - mode: webrtc + data: + media: + media_content_id: media-source://camera/camera.frigate_cam01 + media_content_type: image/jpeg + metadata: + title: Frigate Cam01 + thumbnail: /api/camera_proxy/camera.frigate_cam01 + media_class: video + children_media_class: null + navigateIds: + - {} + - media_content_type: app + media_content_id: media-source://camera + browse_entity_id: media_player.front_room_hub + + # - action: webrtc.dash_cast + # data: + # entity_id: media_player.front_room_hub + # url: cam01_sub + # force: true + # extra: + # mode: webrtc - delay: "00:10:00" diff --git a/automations/rooms/computer_area/computer_area_lights_to_on.yaml b/automations/rooms/computer_area/computer_area_lights_to_on.yaml index 1409ea9..1f742ca 100644 --- a/automations/rooms/computer_area/computer_area_lights_to_on.yaml +++ b/automations/rooms/computer_area/computer_area_lights_to_on.yaml @@ -26,7 +26,7 @@ trigger: # - platform: state # id: motion - # entity_id: group.computer_area_motion + # entity_id: binary_sensor.computer_area_motion # to: "on" condition: diff --git a/automations/rooms/dining_room/dining_room_lights_to_on.yaml b/automations/rooms/dining_room/dining_room_lights_to_on.yaml index 3aee68d..750829a 100644 --- a/automations/rooms/dining_room/dining_room_lights_to_on.yaml +++ b/automations/rooms/dining_room/dining_room_lights_to_on.yaml @@ -24,7 +24,7 @@ trigger: # - platform: state # id: motion - # entity_id: group.dining_room_motion + # entity_id: binary_sensor.dining_room_motion # to: "on" condition: diff --git a/automations/rooms/front_room/front_room_lights_to_on.yaml b/automations/rooms/front_room/front_room_lights_to_on.yaml index 283b4f5..3a0d9a0 100644 --- a/automations/rooms/front_room/front_room_lights_to_on.yaml +++ b/automations/rooms/front_room/front_room_lights_to_on.yaml @@ -20,7 +20,7 @@ trigger: # - platform: state # id: motion - # entity_id: group.front_room_motion + # entity_id: binary_sensor.front_room_motion # to: "on" - platform: state @@ -119,7 +119,7 @@ action: condition: state entity_id: light.front_room_hue state: "on" - - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" + - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" sequence: - action: scene.turn_on data: @@ -137,7 +137,7 @@ action: condition: state entity_id: light.front_room_hue state: "off" - - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" + - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" sequence: - action: scene.turn_on target: @@ -149,7 +149,7 @@ action: condition: state entity_id: light.front_room_hue state: "on" - - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" + - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" sequence: - action: scene.turn_on data: @@ -163,7 +163,7 @@ action: condition: state entity_id: light.front_room_hue state: "off" - - "{{ states('sensor.front_room_light_level') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" + - "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) < states('input_number.front_room_light_level_trigger') | float(default=0) }}" sequence: - action: scene.turn_on target: diff --git a/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml b/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml index 6a36f5b..5042241 100644 --- a/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml +++ b/automations/rooms/furnace_room/furnace_room_water_sensor_on.yaml @@ -3,7 +3,7 @@ id: automation_front_room_water_sensor_on trigger: - platform: state - entity_id: binary_sensor.furnace_room_water_sensor_water_alarm_water_leak_detected + entity_id: binary_sensor.furnace_room_water_sensor_leak to: "on" for: "00:00:10" diff --git a/automations/rooms/furnace_room_lights.yaml b/automations/rooms/furnace_room_lights.yaml index a7b71b7..d92d333 100644 --- a/automations/rooms/furnace_room_lights.yaml +++ b/automations/rooms/furnace_room_lights.yaml @@ -18,7 +18,7 @@ triggers: trigger: state alias: When the furnace room door has been closed for 10 minutes - id: motion_off - entity_id: binary_sensor.furnace_room_motion_switch_home_security_motion_detection + entity_id: binary_sensor.furnace_room_motion_switch_motion_detection to: "off" for: "00:15:00" trigger: state @@ -40,7 +40,7 @@ actions: id: door_closed - condition: state entity_id: >- - binary_sensor.furnace_room_motion_switch_home_security_motion_detection + binary_sensor.furnace_room_motion_switch_motion_detection state: "off" - condition: state entity_id: light.furnace_room diff --git a/automations/rooms/garage/garage_lights_to_on.yaml b/automations/rooms/garage/garage_lights_to_on.yaml index d2b563a..b5958b3 100644 --- a/automations/rooms/garage/garage_lights_to_on.yaml +++ b/automations/rooms/garage/garage_lights_to_on.yaml @@ -18,7 +18,7 @@ trigger: # - platform: state # id: "motion" - # entity_id: group.garage_motion + # entity_id: binary_sensor.garage_motion # from: "off" # to: "on" @@ -56,7 +56,7 @@ trigger: - platform: state id: "workshop_motion" - entity_id: group.workshop_motion + entity_id: binary_sensor.workshop_motion from: "off" to: "on" diff --git a/automations/rooms/girls_room/girls_room_lights_to_on.yaml b/automations/rooms/girls_room/girls_room_lights_to_on.yaml index 0852a5f..d25c325 100644 --- a/automations/rooms/girls_room/girls_room_lights_to_on.yaml +++ b/automations/rooms/girls_room/girls_room_lights_to_on.yaml @@ -70,7 +70,7 @@ condition: state: "on" variables: - switch_name: girls_room_fan_light_switch_light + switch_name: light.girls_room_fan_light_switch_light light_name: girls_room_hue mode_name: input_select.girls_room_mode automatic_profile: input_select.automatic_light_profile @@ -89,7 +89,7 @@ action: sequence: - action: light.turn_on target: - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light - alias: "If the room is set to auto, the lights are on, and the automatic profile is set to Nightlight, change to the Automatic Light Profile scene with a short transition" conditions: @@ -99,7 +99,7 @@ action: state: Auto - alias: "Lights are on" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "on" - alias: "Automatic light profile set to Nightlight" condition: state @@ -120,7 +120,7 @@ action: state: Auto - alias: "Lights are on" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "on" sequence: - action: scene.turn_on @@ -137,7 +137,7 @@ action: state: Auto - alias: "Lights are off" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "off" sequence: - action: scene.turn_on @@ -148,7 +148,7 @@ action: conditions: - alias: "Room not manual or auto and lights are on" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "on" - alias: "Room set to Nightlight" condition: state @@ -165,7 +165,7 @@ action: conditions: - alias: "Room not manual or auto and lights are on" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "on" sequence: - action: scene.turn_on @@ -178,7 +178,7 @@ action: conditions: - alias: "Room not manual or auto and lights are off" condition: state - entity_id: light.girls_room_hue + entity_id: light.girls_room_fan_light_switch_light state: "off" sequence: - action: scene.turn_on diff --git a/automations/rooms/girls_room/girls_room_out_of_bed.yaml b/automations/rooms/girls_room/girls_room_out_of_bed.yaml index c79f609..f1f2a35 100644 --- a/automations/rooms/girls_room/girls_room_out_of_bed.yaml +++ b/automations/rooms/girls_room/girls_room_out_of_bed.yaml @@ -103,7 +103,7 @@ action: - action: webrtc.dash_cast data: entity_id: media_player.computer_area_hub - url: cam08_sub_opus + url: cam08_sub force: true extra: mode: webrtc @@ -117,7 +117,7 @@ action: - action: webrtc.dash_cast data: entity_id: media_player.front_room_hub - url: cam08_sub_opus + url: cam08_sub force: true extra: mode: webrtc diff --git a/automations/rooms/great_room/great_room_lights_to_on.yaml b/automations/rooms/great_room/great_room_lights_to_on.yaml index f2bcf3f..81e68e8 100644 --- a/automations/rooms/great_room/great_room_lights_to_on.yaml +++ b/automations/rooms/great_room/great_room_lights_to_on.yaml @@ -26,7 +26,7 @@ trigger: # - platform: state # id: motion - # entity_id: group.great_room_motion + # entity_id: binary_sensor.great_room_motion # to: "on" condition: diff --git a/automations/rooms/kitchen/kitchen_lights_to_off.yaml b/automations/rooms/kitchen/kitchen_lights_to_off.yaml index f9c4181..ad0c70a 100644 --- a/automations/rooms/kitchen/kitchen_lights_to_off.yaml +++ b/automations/rooms/kitchen/kitchen_lights_to_off.yaml @@ -62,7 +62,7 @@ action: - condition: state entity_id: input_select.kitchen_mode state: "Manual" - - "{{ states('sensor.bar_light_level') | float(default=0) >= states('input_number.kitchen_light_level_trigger') | float(default=0) }}" + - "{{ states('sensor.bar_hue_motion_sensor_illuminance') | float(default=0) >= states('input_number.kitchen_light_level_trigger') | float(default=0) }}" sequence: - action: scene.turn_on data: diff --git a/automations/rooms/kitchen/kitchen_lights_to_on.yaml b/automations/rooms/kitchen/kitchen_lights_to_on.yaml index 6957f98..1812513 100644 --- a/automations/rooms/kitchen/kitchen_lights_to_on.yaml +++ b/automations/rooms/kitchen/kitchen_lights_to_on.yaml @@ -26,7 +26,7 @@ trigger: # - platform: state # id: motion - # entity_id: group.kitchen_motion + # entity_id: binary_sensor.kitchen_motion # to: "on" condition: diff --git a/automations/rooms/mancave_lights.yaml b/automations/rooms/mancave_lights.yaml index 5d77248..67aed42 100644 --- a/automations/rooms/mancave_lights.yaml +++ b/automations/rooms/mancave_lights.yaml @@ -18,7 +18,7 @@ triggers: - trigger: state id: motion_off - entity_id: binary_sensor.mancave_motion_switch_home_security_motion_detection + entity_id: binary_sensor.mancave_motion_switch_motion_detection to: "off" for: "00:15:00" @@ -38,7 +38,7 @@ action: - condition: trigger id: "door_closed" - condition: state - entity_id: binary_sensor.mancave_motion_switch_home_security_motion_detection + entity_id: binary_sensor.mancave_motion_switch_motion_detection state: "off" - condition: state entity_id: light.mancave diff --git a/automations/rooms/master_bathroom/master_bathroom_lights_to_off.yaml b/automations/rooms/master_bathroom/master_bathroom_lights_to_off.yaml index 441d234..b575355 100644 --- a/automations/rooms/master_bathroom/master_bathroom_lights_to_off.yaml +++ b/automations/rooms/master_bathroom/master_bathroom_lights_to_off.yaml @@ -7,7 +7,7 @@ trigger: entity_id: input_select.master_bathroom_mode - platform: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied to: "off" #- platform: time_pattern @@ -26,7 +26,7 @@ condition: entity_id: input_select.master_bathroom_mode state: "Off" - condition: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied state: "off" action: - choose: @@ -40,7 +40,7 @@ action: entity_id: input_select.master_bathroom_mode state: "Off" - condition: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied state: "off" - condition: not conditions: @@ -62,4 +62,4 @@ action: - alias: "Turn off z-wave switch since all lights are off" action: homeassistant.turn_off target: - entity_id: switch.master_bathroom_motion_switch, switch.shower_switch + entity_id: switch.master_bathroom_motion_switch, switch.master_bathroom_switch diff --git a/automations/rooms/master_bathroom/master_bathroom_lights_to_on.yaml b/automations/rooms/master_bathroom/master_bathroom_lights_to_on.yaml index 9704b73..96ceb03 100644 --- a/automations/rooms/master_bathroom/master_bathroom_lights_to_on.yaml +++ b/automations/rooms/master_bathroom/master_bathroom_lights_to_on.yaml @@ -10,7 +10,7 @@ trigger: - input_select.master_bathroom_mode - input_select.automatic_light_profile - platform: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied to: "on" # Only turn on the lights when necessary @@ -19,7 +19,7 @@ condition: conditions: # Either when motion is detected - condition: template - value_template: "{{ trigger.entity_id == 'input_boolean.master_bathroom_occupied' }}" + value_template: "{{ trigger.entity_id == 'input_boolean.bathroom_occupied' }}" # Or when the scene changes while the lights are already on - condition: and conditions: @@ -30,7 +30,7 @@ condition: - condition: template value_template: "{{ trigger.entity_id == 'input_select.automatic_light_profile' }}" - condition: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied state: "on" variables: @@ -44,7 +44,7 @@ action: target: entity_id: - switch.master_bathroom_motion_switch - - switch.shower_switch + - switch.master_bathroom_switch - choose: - alias: "If the room is set to manual, just turn the lights on" conditions: diff --git a/automations/rooms/master_bathroom/master_bathroom_not_occupied.yaml b/automations/rooms/master_bathroom/master_bathroom_not_occupied.yaml index 02c095a..88cb154 100644 --- a/automations/rooms/master_bathroom/master_bathroom_not_occupied.yaml +++ b/automations/rooms/master_bathroom/master_bathroom_not_occupied.yaml @@ -10,7 +10,7 @@ trigger: - platform: state entity_id: - input_boolean.home_occupied - - binary_sensor.master_bathroom_occupied + - binary_sensor.bathroom_occupied to: "off" for: "00:10:00" @@ -26,10 +26,10 @@ condition: - condition: and conditions: - condition: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied state: "on" - condition: state - entity_id: binary_sensor.master_bathroom_occupied + entity_id: binary_sensor.bathroom_occupied state: "off" for: "00:10:00" @@ -41,7 +41,7 @@ action: state: "off" sequence: - action: homeassistant.turn_off - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied - conditions: - condition: not conditions: @@ -50,4 +50,4 @@ action: state: "Manual" sequence: - action: homeassistant.turn_off - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied diff --git a/automations/rooms/master_bathroom/master_bathroom_occupied.yaml b/automations/rooms/master_bathroom/master_bathroom_occupied.yaml index c519d75..40e0e32 100644 --- a/automations/rooms/master_bathroom/master_bathroom_occupied.yaml +++ b/automations/rooms/master_bathroom/master_bathroom_occupied.yaml @@ -5,14 +5,14 @@ mode: restart trigger: - platform: state entity_id: - - binary_sensor.master_bathroom_occupied + - binary_sensor.bathroom_occupied to: "on" condition: - condition: state - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied state: "off" action: - action: input_boolean.turn_on - entity_id: input_boolean.master_bathroom_occupied + entity_id: input_boolean.bathroom_occupied diff --git a/automations/rooms/master_bedroom/master_bedroom_lights_to_off.yaml b/automations/rooms/master_bedroom/master_bedroom_lights_to_off.yaml index bb5b2a0..14f16ef 100644 --- a/automations/rooms/master_bedroom/master_bedroom_lights_to_off.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_lights_to_off.yaml @@ -9,7 +9,7 @@ trigger: entity_id: input_select.master_bedroom_mode - platform: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied to: "off" - platform: state @@ -48,7 +48,7 @@ condition: entity_id: input_select.master_bedroom_mode state: "Off" - condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "off" - condition: state entity_id: input_select.master_bedroom_mode @@ -66,7 +66,7 @@ action: entity_id: input_select.master_bedroom_mode state: "Off" - condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "off" - condition: not conditions: diff --git a/automations/rooms/master_bedroom/master_bedroom_lights_to_on.yaml b/automations/rooms/master_bedroom/master_bedroom_lights_to_on.yaml index 8d5feed..0e60287 100644 --- a/automations/rooms/master_bedroom/master_bedroom_lights_to_on.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_lights_to_on.yaml @@ -18,17 +18,17 @@ trigger: to: "off" - platform: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied to: "on" - platform: state id: occupied - entity_id: binary_sensor.master_bedroom_occupied + entity_id: binary_sensor.bedroom_occupied to: "on" # - platform: state # id: motion - # entity_id: group.master_bedroom_motion + # entity_id: binary_sensor.master_bedroom_motion # to: "on" condition: @@ -73,7 +73,7 @@ condition: - condition: trigger id: "mode_change" - condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "on" variables: diff --git a/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml b/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml index b9a9d4c..da61076 100644 --- a/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml @@ -10,7 +10,7 @@ trigger: - platform: state entity_id: - input_boolean.home_occupied - - binary_sensor.master_bedroom_occupied + - binary_sensor.bedroom_occupied to: "off" for: "00:05:00" @@ -29,7 +29,7 @@ condition: - "unavailable" - condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "on" - condition: or @@ -45,7 +45,7 @@ condition: for: minutes: 5 - condition: state - entity_id: binary_sensor.master_bedroom_occupied + entity_id: binary_sensor.bedroom_occupied state: "off" for: minutes: 5 @@ -57,7 +57,7 @@ action: state: "off" sequence: - action: homeassistant.turn_off - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied - conditions: - condition: not conditions: @@ -66,4 +66,4 @@ action: state: "Manual" sequence: - action: homeassistant.turn_off - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied diff --git a/automations/rooms/master_bedroom/master_bedroom_occupied.yaml b/automations/rooms/master_bedroom/master_bedroom_occupied.yaml index d009862..28e75cc 100644 --- a/automations/rooms/master_bedroom/master_bedroom_occupied.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_occupied.yaml @@ -5,14 +5,14 @@ mode: restart trigger: - platform: state entity_id: - - binary_sensor.master_bedroom_occupied + - binary_sensor.bedroom_occupied to: "on" condition: - condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "off" action: - action: input_boolean.turn_on - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied diff --git a/automations/things/automatic_fan_speeds.yaml b/automations/things/automatic_fan_speeds.yaml index 88e8de1..e0171f4 100644 --- a/automations/things/automatic_fan_speeds.yaml +++ b/automations/things/automatic_fan_speeds.yaml @@ -56,7 +56,7 @@ triggers: entity_id: input_boolean.girls_room_occupied - trigger: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied - trigger: state entity_id: input_boolean.girls_room_asleep @@ -210,7 +210,7 @@ action: - conditions: - alias: "Master Bedroom not occupied" condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "off" - alias: "Master Bedroom not asleep" condition: state @@ -248,7 +248,7 @@ action: - conditions: - alias: "Master Bedroom is occupied" condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "on" - alias: "Master Bedroom above high" condition: template @@ -265,7 +265,7 @@ action: - conditions: - alias: "Master Bedroom is occupied" condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "on" - alias: "Master Bedroom above medium" condition: template @@ -282,7 +282,7 @@ action: - conditions: - alias: "Master Bedroom is occupied" condition: state - entity_id: input_boolean.master_bedroom_occupied + entity_id: input_boolean.bedroom_occupied state: "on" - alias: "Master Bedroom above low" condition: template diff --git a/components/alerts/hvac_delta_too_small_for_too_long.yaml b/components/alerts/hvac_delta_too_small_for_too_long.yaml index 1b33749..8f4e44c 100644 --- a/components/alerts/hvac_delta_too_small_for_too_long.yaml +++ b/components/alerts/hvac_delta_too_small_for_too_long.yaml @@ -1,5 +1,5 @@ # name: "The AC is probably broken again!" -# message: "It is {{states('sensor.front_porch_temperature')}} outside and {{state_attr('climate.thermostat','current_temperature')}} inside. The thermostat is set to {{state_attr('climate.thermostat','target_temp_low')}} and the delta is {{states('sensor.hvac_multisensor_delta')}}" +# message: "It is {{states('sensor.front_porch_hue_motion_sensor_temperature')}} outside and {{state_attr('climate.thermostat','current_temperature')}} inside. The thermostat is set to {{state_attr('climate.thermostat','target_temp_low')}} and the delta is {{states('sensor.hvac_multisensor_delta')}}" # done_message: "AC is now {{states('sensor.hvac_multisensor_delta')}}" # entity_id: binary_sensor.hvac_multisensor_delta_too_small_for_too_long # state: "on" diff --git a/components/binary_sensors/bayesian_window_open_hvac.yaml b/components/binary_sensors/bayesian_window_open_hvac.yaml index a3b9529..198e303 100644 --- a/components/binary_sensors/bayesian_window_open_hvac.yaml +++ b/components/binary_sensors/bayesian_window_open_hvac.yaml @@ -1,31 +1,31 @@ -platform: 'bayesian' -name: 'Window Open HVAC On' +platform: "bayesian" +name: "Window Open HVAC On" device_class: problem prior: 0 probability_threshold: 0.6 observations: - - entity_id: 'group.my_exterior_windows' + - entity_id: "group.my_exterior_windows" prob_given_true: .5 prob_given_false: 0.01 - platform: 'state' - to_state: 'on' - - entity_id: 'group.my_exterior_doors' + platform: "state" + to_state: "on" + - entity_id: "binary_sensor.exterior_doors" prob_given_true: .5 prob_given_false: 0.01 - platform: 'state' - to_state: 'on' + platform: "state" + to_state: "on" - entity_id: sensor.hvac_action prob_given_true: .5 prob_given_false: 0.01 - platform: 'state' - to_state: 'cooling' + platform: "state" + to_state: "cooling" - entity_id: sensor.hvac_action prob_given_true: .5 prob_given_false: 0.01 - platform: 'state' - to_state: 'heating' + platform: "state" + to_state: "heating" - entity_id: sensor.hvac_action prob_given_true: .01 prob_given_false: 0.01 - platform: 'state' - to_state: 'idle' \ No newline at end of file + platform: "state" + to_state: "idle" diff --git a/components/binary_sensors/rooms/back_yard_occupied.yaml b/components/binary_sensors/rooms/back_yard_occupied.yaml index b223e49..d3f9daf 100644 --- a/components/binary_sensors/rooms/back_yard_occupied.yaml +++ b/components/binary_sensors/rooms/back_yard_occupied.yaml @@ -1,19 +1,19 @@ -platform: bayesian -unique_id: bayesianbinarysensor.back_yard_occupied -name: Back Yard Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.back_yard_occupied +# name: Back Yard Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.75 +# observations: - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .01 - prob_given_false: 0.01 - to_state: 'off' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .01 +# prob_given_false: 0.01 +# to_state: 'off' - - entity_id: group.back_yard_motion - prob_given_true: .9 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.back_yard_motion +# prob_given_true: .9 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/boys_room_occupied.yaml b/components/binary_sensors/rooms/boys_room_occupied.yaml index 0991cc6..e8c4c97 100644 --- a/components/binary_sensors/rooms/boys_room_occupied.yaml +++ b/components/binary_sensors/rooms/boys_room_occupied.yaml @@ -1,30 +1,30 @@ -platform: bayesian -unique_id: bayesianbinarysensor.boys_room_occupied -name: Boys Room Occupied -prior: 0.25 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.boys_room_occupied +# name: Boys Room Occupied +# prior: 0.25 +# probability_threshold: 0.75 +# observations: - - entity_id: binary_sensor.white_bed_occupied - platform: state - prob_given_true: .83 - prob_given_false: 0.0 - to_state: 'on' +# - entity_id: binary_sensor.white_bed_occupied +# platform: state +# prob_given_true: .83 +# prob_given_false: 0.0 +# to_state: 'on' - - entity_id: binary_sensor.boys_room_person_occupancy - prob_given_true: .4 - prob_given_false: 0.0 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.boys_room_person_occupancy +# prob_given_true: .4 +# prob_given_false: 0.0 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.67 - to_state: 'on' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .99 +# prob_given_false: 0.67 +# to_state: 'on' - - entity_id: group.boys_room_motion - platform: state - prob_given_true: .5 - prob_given_false: 0.0 - to_state: 'on' +# - entity_id: binary_sensor.boys_room_motion +# platform: state +# prob_given_true: .5 +# prob_given_false: 0.0 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/computer_area_occupied.yaml b/components/binary_sensors/rooms/computer_area_occupied.yaml index 62e0834..ec1501d 100644 --- a/components/binary_sensors/rooms/computer_area_occupied.yaml +++ b/components/binary_sensors/rooms/computer_area_occupied.yaml @@ -1,25 +1,19 @@ -platform: bayesian -unique_id: bayesianbinarysensor.computer_area_occupied -name: Computer Area Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.7 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.computer_area_occupied +# name: Computer Area Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.7 +# observations: - - entity_id: group.computer_area_motion - prob_given_true: .99 - prob_given_false: 0.5 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.computer_area_motion +# prob_given_true: .99 +# prob_given_false: 0.5 +# platform: state +# to_state: 'on' - # - entity_id: binary_sensor.computer_chair_contact_occupied - # prob_given_true: .99 - # prob_given_false: 0.5 - # platform: state - # to_state: 'on' - - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .7 - prob_given_false: 0.1 - to_state: 'on' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .7 +# prob_given_false: 0.1 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/dining_room_occupied.yaml b/components/binary_sensors/rooms/dining_room_occupied.yaml index 9fc3f5e..72ff6dd 100644 --- a/components/binary_sensors/rooms/dining_room_occupied.yaml +++ b/components/binary_sensors/rooms/dining_room_occupied.yaml @@ -1,25 +1,25 @@ -platform: bayesian -unique_id: bayesianbinarysensor.dining_room_occupied -name: Dining Room Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.7 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.dining_room_occupied +# name: Dining Room Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.7 +# observations: - - entity_id: group.dining_room_motion - prob_given_true: .99 - prob_given_false: .85 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.dining_room_motion +# prob_given_true: .99 +# prob_given_false: .85 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.dining_room_person_occupancy - prob_given_true: .99 - prob_given_false: .85 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.dining_room_person_occupancy +# prob_given_true: .99 +# prob_given_false: .85 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.01 - to_state: 'on' \ No newline at end of file +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .99 +# prob_given_false: 0.01 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/entryway_occupied.yaml b/components/binary_sensors/rooms/entryway_occupied.yaml index c032d99..c26c46d 100644 --- a/components/binary_sensors/rooms/entryway_occupied.yaml +++ b/components/binary_sensors/rooms/entryway_occupied.yaml @@ -1,36 +1,36 @@ -platform: bayesian -unique_id: bayesianbinarysensor.entryway_occupied -name: Entryway Occupied -device_class: occupancy -prior: 0.02 -probability_threshold: 0.65 -observations: - - entity_id: group.entryway_motion - prob_given_true: 0.9 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# platform: bayesian +# unique_id: bayesianbinarysensor.entryway_occupied +# name: Entryway Occupied +# device_class: occupancy +# prior: 0.02 +# probability_threshold: 0.65 +# observations: +# - entity_id: binary_sensor.entryway_motion +# prob_given_true: 0.9 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .98 - prob_given_false: 0.85 - to_state: 'on' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .98 +# prob_given_false: 0.85 +# to_state: 'on' - - entity_id: binary_sensor.entryway_person_occupancy - prob_given_true: .02 - prob_given_false: 0.0 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.entryway_person_occupancy +# prob_given_true: .02 +# prob_given_false: 0.0 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.inner_garage_door_contact - prob_given_true: 0.02 - prob_given_false: 0.0 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.inner_garage_door_contact +# prob_given_true: 0.02 +# prob_given_false: 0.0 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.front_door_contact - prob_given_true: 0.02 - prob_given_false: 0.0 - platform: state - to_state: 'on' \ No newline at end of file +# - entity_id: binary_sensor.front_door_contact +# prob_given_true: 0.02 +# prob_given_false: 0.0 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/front_room_occupied.yaml b/components/binary_sensors/rooms/front_room_occupied.yaml index e54aa28..a822260 100644 --- a/components/binary_sensors/rooms/front_room_occupied.yaml +++ b/components/binary_sensors/rooms/front_room_occupied.yaml @@ -1,37 +1,32 @@ -platform: bayesian -unique_id: bayesianbinarysensor.front_room_occupied -name: Front Room Occupied -device_class: occupancy -prior: 0.5 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.front_room_occupied +# name: Front Room Occupied +# device_class: occupancy +# prior: 0.5 +# probability_threshold: 0.75 +# observations: - - entity_id: group.front_room_motion - prob_given_true: .75 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.front_room_motion +# prob_given_true: .75 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' - - entity_id: media_player.front_room_tv - prob_given_true: .9 - prob_given_false: 0.01 - platform: state - to_state: 'playing' +# - entity_id: media_player.front_room_tv +# prob_given_true: .9 +# prob_given_false: 0.01 +# platform: state +# to_state: 'playing' - - entity_id: media_player.front_room_tv - prob_given_true: .5 - prob_given_false: 0.01 - platform: state - to_state: 'home' +# - entity_id: media_player.front_room_tv +# prob_given_true: .5 +# prob_given_false: 0.01 +# platform: state +# to_state: 'home' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .01 - prob_given_false: 0.01 - to_state: 'off' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .01 +# prob_given_false: 0.01 +# to_state: 'off' - # - entity_id: binary_sensor.front_room_person_occupancy - # prob_given_true: .99 - # prob_given_false: 0.01 - # platform: state - # to_state: 'on' diff --git a/components/binary_sensors/rooms/front_yard_occupied.yaml b/components/binary_sensors/rooms/front_yard_occupied.yaml index e84d1e5..53ecc32 100644 --- a/components/binary_sensors/rooms/front_yard_occupied.yaml +++ b/components/binary_sensors/rooms/front_yard_occupied.yaml @@ -1,19 +1,19 @@ -platform: bayesian -unique_id: bayesianbinarysensor.front_yard_occupied -name: Front Yard Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.front_yard_occupied +# name: Front Yard Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.75 +# observations: - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .01 - prob_given_false: 0.01 - to_state: 'off' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .01 +# prob_given_false: 0.01 +# to_state: 'off' - - entity_id: group.front_yard_motion - prob_given_true: .9 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.front_yard_motion +# prob_given_true: .9 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/furnace_room_occupied.yaml b/components/binary_sensors/rooms/furnace_room_occupied.yaml index dd528c3..ae2522f 100644 --- a/components/binary_sensors/rooms/furnace_room_occupied.yaml +++ b/components/binary_sensors/rooms/furnace_room_occupied.yaml @@ -1,13 +1,13 @@ -platform: bayesian -unique_id: bayesianbinarysensor.furnace_room_occupied -name: Furnace Room Occupied -device_class: occupancy -prior: 0.2 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.furnace_room_occupied +# name: Furnace Room Occupied +# device_class: occupancy +# prior: 0.2 +# probability_threshold: 0.75 +# observations: - - entity_id: group.furnace_room_motion - prob_given_true: .99 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.furnace_room_motion +# prob_given_true: .99 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/garage_occupied.yaml b/components/binary_sensors/rooms/garage_occupied.yaml index c38d462..ac3f6cb 100644 --- a/components/binary_sensors/rooms/garage_occupied.yaml +++ b/components/binary_sensors/rooms/garage_occupied.yaml @@ -1,67 +1,67 @@ -platform: bayesian -unique_id: bayesianbinarysensor.garage_occupied -name: Garage Occupied -device_class: occupancy -prior: 0.4 -probability_threshold: 0.6 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.garage_occupied +# name: Garage Occupied +# device_class: occupancy +# prior: 0.4 +# probability_threshold: 0.6 +# observations: - - entity_id: group.garage_motion - prob_given_true: .8 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.garage_motion +# prob_given_true: .8 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' - - entity_id: group.garage_motion - prob_given_true: .5 - prob_given_false: 0.5 - platform: state - to_state: 'off' +# - entity_id: binary_sensor.garage_motion +# prob_given_true: .5 +# prob_given_false: 0.5 +# platform: state +# to_state: 'off' - - entity_id: cover.garage_door - prob_given_true: .60 - prob_given_false: 0.5 - platform: state - to_state: 'open' +# - entity_id: cover.garage_door +# prob_given_true: .60 +# prob_given_false: 0.5 +# platform: state +# to_state: 'open' - - entity_id: cover.garage_door - prob_given_true: .50 - prob_given_false: 0.5 - platform: state - to_state: 'closed' +# - entity_id: cover.garage_door +# prob_given_true: .50 +# prob_given_false: 0.5 +# platform: state +# to_state: 'closed' - - entity_id: binary_sensor.inner_garage_door_contact - prob_given_true: .75 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.inner_garage_door_contact +# prob_given_true: .75 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.inner_garage_door_contact - prob_given_true: .5 - prob_given_false: 0.5 - platform: state - to_state: 'off' +# - entity_id: binary_sensor.inner_garage_door_contact +# prob_given_true: .5 +# prob_given_false: 0.5 +# platform: state +# to_state: 'off' - - entity_id: binary_sensor.outer_garage_door_contact - prob_given_true: .75 - prob_given_false: 0.5 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.outer_garage_door_contact +# prob_given_true: .75 +# prob_given_false: 0.5 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.outer_garage_door_contact - prob_given_true: 0.5 - prob_given_false: 0.5 - platform: state - to_state: 'off' +# - entity_id: binary_sensor.outer_garage_door_contact +# prob_given_true: 0.5 +# prob_given_false: 0.5 +# platform: state +# to_state: 'off' - - entity_id: binary_sensor.workshop_person_occupancy - prob_given_true: .99 - prob_given_false: 0.5 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.workshop_person_occupancy +# prob_given_true: .99 +# prob_given_false: 0.5 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.workshop_person_occupancy - prob_given_true: 0.5 - prob_given_false: 0.5 - platform: state - to_state: 'off' \ No newline at end of file +# - entity_id: binary_sensor.workshop_person_occupancy +# prob_given_true: 0.5 +# prob_given_false: 0.5 +# platform: state +# to_state: 'off' diff --git a/components/binary_sensors/rooms/girls_room_occupied.yaml b/components/binary_sensors/rooms/girls_room_occupied.yaml deleted file mode 100644 index d2eb7cf..0000000 --- a/components/binary_sensors/rooms/girls_room_occupied.yaml +++ /dev/null @@ -1,30 +0,0 @@ -platform: bayesian -unique_id: 608783dd-0d18-4e9b-a7f9-3f35eee41fc4 -name: Girls Room Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.90 -observations: - - platform: state - entity_id: binary_sensor.girls_room_motion - to_state: "on" - prob_given_true: .33 - prob_given_false: 0.0 - - - entity_id: binary_sensor.girls_room_person_occupancy - prob_given_true: .33 - prob_given_false: 0.0 - platform: state - to_state: "on" - - - platform: state - entity_id: binary_sensor.black_bed_occupied - to_state: "on" - prob_given_true: .67 - prob_given_false: 0.0 - - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .92 - prob_given_false: 0.5 - to_state: "on" diff --git a/components/binary_sensors/rooms/great_room_occupied.yaml b/components/binary_sensors/rooms/great_room_occupied.yaml index 7c36cb8..922e922 100644 --- a/components/binary_sensors/rooms/great_room_occupied.yaml +++ b/components/binary_sensors/rooms/great_room_occupied.yaml @@ -1,43 +1,43 @@ -platform: bayesian -unique_id: bayesianbinarysensor.great_room_occupied -name: Great Room Occupied -device_class: occupancy -prior: 0.5 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.great_room_occupied +# name: Great Room Occupied +# device_class: occupancy +# prior: 0.5 +# probability_threshold: 0.75 +# observations: - - entity_id: group.great_room_motion - platform: state - prob_given_true: .9 - prob_given_false: 0.01 - to_state: 'on' +# - entity_id: binary_sensor.great_room_motion +# platform: state +# prob_given_true: .9 +# prob_given_false: 0.01 +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .01 - prob_given_false: 0.01 - to_state: 'off' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .01 +# prob_given_false: 0.01 +# to_state: 'off' - - entity_id: media_player.downstairs_roku - platform: state - prob_given_true: .9 - prob_given_false: 0.01 - to_state: 'playing' +# - entity_id: media_player.downstairs_roku +# platform: state +# prob_given_true: .9 +# prob_given_false: 0.01 +# to_state: 'playing' - - entity_id: media_player.downstairs_roku - platform: state - prob_given_true: .9 - prob_given_false: 0.01 - to_state: 'paused' +# - entity_id: media_player.downstairs_roku +# platform: state +# prob_given_true: .9 +# prob_given_false: 0.01 +# to_state: 'paused' - - entity_id: media_player.downstairs_roku - platform: state - prob_given_true: .5 - prob_given_false: 0.01 - to_state: 'idle' +# - entity_id: media_player.downstairs_roku +# platform: state +# prob_given_true: .5 +# prob_given_false: 0.01 +# to_state: 'idle' - - entity_id: binary_sensor.great_room_person_occupancy - prob_given_true: .99 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.great_room_person_occupancy +# prob_given_true: .99 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/kitchen_occupied.yaml b/components/binary_sensors/rooms/kitchen_occupied.yaml index 8379ed5..fa7f60a 100644 --- a/components/binary_sensors/rooms/kitchen_occupied.yaml +++ b/components/binary_sensors/rooms/kitchen_occupied.yaml @@ -1,25 +1,25 @@ -platform: bayesian -unique_id: bayesianbinarysensor.kitchen_occupied -name: Kitchen Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.7 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.kitchen_occupied +# name: Kitchen Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.7 +# observations: - - entity_id: group.kitchen_motion - prob_given_true: .99 - prob_given_false: .85 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.kitchen_motion +# prob_given_true: .99 +# prob_given_false: .85 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.kitchen_person_occupancy - prob_given_true: .99 - prob_given_false: .85 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.kitchen_person_occupancy +# prob_given_true: .99 +# prob_given_false: .85 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.01 - to_state: 'on' \ No newline at end of file +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .99 +# prob_given_false: 0.01 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/mancave_occupied.yaml b/components/binary_sensors/rooms/mancave_occupied.yaml index 68bee90..d1dd77d 100644 --- a/components/binary_sensors/rooms/mancave_occupied.yaml +++ b/components/binary_sensors/rooms/mancave_occupied.yaml @@ -1,19 +1,19 @@ -platform: bayesian -unique_id: bayesianbinarysensor.mancave_occupied -name: Mancave Occupied -device_class: occupancy -prior: 0.5 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.mancave_occupied +# name: Mancave Occupied +# device_class: occupancy +# prior: 0.5 +# probability_threshold: 0.75 +# observations: - - entity_id: group.mancave_motion - prob_given_true: .9 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.mancave_motion +# prob_given_true: .9 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .01 - prob_given_false: 0.01 - to_state: 'off' \ No newline at end of file +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .01 +# prob_given_false: 0.01 +# to_state: 'off' diff --git a/components/binary_sensors/rooms/master_bathroom_occupied.yaml b/components/binary_sensors/rooms/master_bathroom_occupied.yaml index e970ab2..19aafa8 100644 --- a/components/binary_sensors/rooms/master_bathroom_occupied.yaml +++ b/components/binary_sensors/rooms/master_bathroom_occupied.yaml @@ -1,37 +1,25 @@ -platform: bayesian -unique_id: bayesianbinarysensor.master_bathroom_occupied -name: Master Bathroom Occupied -device_class: occupancy -prior: 0.2 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.master_bathroom_occupied +# name: Master Bathroom Occupied +# device_class: occupancy +# prior: 0.2 +# probability_threshold: 0.75 +# observations: - - entity_id: group.master_bathroom_motion - prob_given_true: .99 - prob_given_false: 0.05 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.master_bathroom_motion +# prob_given_true: .99 +# prob_given_false: 0.05 +# platform: state +# to_state: 'on' - # - entity_id: binary_sensor.bathroom_getting_humid - # prob_given_true: .75 - # prob_given_false: 0.01 - # platform: state - # to_state: 'on' +# - entity_id: binary_sensor.bathroom_multisensor_too_humid +# prob_given_true: .99 +# prob_given_false: 0.05 +# platform: state +# to_state: 'on' - - entity_id: binary_sensor.bathroom_multisensor_too_humid - prob_given_true: .99 - prob_given_false: 0.05 - platform: state - to_state: 'on' - - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.01 - to_state: 'on' - - # - entity_id: input_boolean.home_occupied - # platform: state - # prob_given_true: .01 - # prob_given_false: 0.5 - # to_state: 'off' \ No newline at end of file +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .99 +# prob_given_false: 0.01 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/master_bedroom_occupied.yaml b/components/binary_sensors/rooms/master_bedroom_occupied.yaml index e0f6d7d..d92bcb6 100644 --- a/components/binary_sensors/rooms/master_bedroom_occupied.yaml +++ b/components/binary_sensors/rooms/master_bedroom_occupied.yaml @@ -1,31 +1,31 @@ -platform: bayesian -unique_id: bayesianbinarysensor.master_bedroom_occupied -name: Master Bedroom Occupied -device_class: occupancy -prior: 0.25 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.master_bedroom_occupied +# name: Master Bedroom Occupied +# device_class: occupancy +# prior: 0.25 +# probability_threshold: 0.75 +# observations: - - entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either - platform: state - prob_given_true: .83 - prob_given_false: 0.0 - to_state: 'on' +# - entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either +# platform: state +# prob_given_true: .83 +# prob_given_false: 0.0 +# to_state: 'on' - - entity_id: binary_sensor.master_bedroom_person_occupancy - prob_given_true: .4 - prob_given_false: 0.0 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.master_bedroom_person_occupancy +# prob_given_true: .4 +# prob_given_false: 0.0 +# platform: state +# to_state: 'on' - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.67 - to_state: 'on' +# - entity_id: input_boolean.home_occupied +# platform: state +# prob_given_true: .99 +# prob_given_false: 0.67 +# to_state: 'on' - - entity_id: group.master_bedroom_motion - platform: state - prob_given_true: .5 - prob_given_false: 0.0 - to_state: 'on' \ No newline at end of file +# - entity_id: binary_sensor.master_bedroom_motion +# platform: state +# prob_given_true: .5 +# prob_given_false: 0.0 +# to_state: 'on' diff --git a/components/binary_sensors/rooms/storage_room_occupied.yaml b/components/binary_sensors/rooms/storage_room_occupied.yaml index f1ba0a6..4d273c5 100644 --- a/components/binary_sensors/rooms/storage_room_occupied.yaml +++ b/components/binary_sensors/rooms/storage_room_occupied.yaml @@ -1,13 +1,13 @@ -platform: bayesian -unique_id: bayesianbinarysensor.storage_room_occupied -name: Storage Room Occupied -device_class: occupancy -prior: 0.5 -probability_threshold: 0.75 -observations: +# platform: bayesian +# unique_id: bayesianbinarysensor.storage_room_occupied +# name: Storage Room Occupied +# device_class: occupancy +# prior: 0.5 +# probability_threshold: 0.75 +# observations: - - entity_id: binary_sensor.storage_room_door_contact - prob_given_true: .4 - prob_given_false: 0.01 - platform: state - to_state: 'on' +# - entity_id: binary_sensor.storage_room_door_contact +# prob_given_true: .4 +# prob_given_false: 0.01 +# platform: state +# to_state: 'on' diff --git a/components/binary_sensors/rooms/utility_room_occupied.yaml b/components/binary_sensors/rooms/utility_room_occupied.yaml deleted file mode 100644 index ece8770..0000000 --- a/components/binary_sensors/rooms/utility_room_occupied.yaml +++ /dev/null @@ -1,31 +0,0 @@ -platform: bayesian -unique_id: bayesianbinarysensor.utility_room_occupied -name: Utility Room Occupied -device_class: occupancy -prior: 0.2 -probability_threshold: 0.75 -observations: - - - entity_id: group.utility_room_motion - prob_given_true: .99 - prob_given_false: 0.05 - platform: state - to_state: 'on' - - # - entity_id: binary_sensor.utility_room_getting_humid - # prob_given_true: .75 - # prob_given_false: 0.01 - # platform: state - # to_state: 'on' - - - entity_id: binary_sensor.utility_room_multisensor_too_humid - prob_given_true: .99 - prob_given_false: 0.05 - platform: state - to_state: 'on' - - - entity_id: input_boolean.home_occupied - platform: state - prob_given_true: .99 - prob_given_false: 0.01 - to_state: 'on' \ No newline at end of file diff --git a/components/input_booleans/rooms/back_yard_occupied.yaml b/components/input_booleans/rooms/back_yard_occupied.yaml index 620f648..8a66708 100644 --- a/components/input_booleans/rooms/back_yard_occupied.yaml +++ b/components/input_booleans/rooms/back_yard_occupied.yaml @@ -1,2 +1,2 @@ -name: Back Yard -icon: mdi:slide +# name: Back Yard +# icon: mdi:slide diff --git a/components/input_booleans/rooms/boys_room_light_cycle.yaml b/components/input_booleans/rooms/boys_room_light_cycle.yaml deleted file mode 100644 index e2bebc4..0000000 --- a/components/input_booleans/rooms/boys_room_light_cycle.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Boys Room Light Cycle \ No newline at end of file diff --git a/components/input_booleans/rooms/boys_room_occupied.yaml b/components/input_booleans/rooms/boys_room_occupied.yaml index 74c7a34..6b79dc2 100644 --- a/components/input_booleans/rooms/boys_room_occupied.yaml +++ b/components/input_booleans/rooms/boys_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Boys Room -icon: mdi:earth +# name: Boys Room +# icon: mdi:earth diff --git a/components/input_booleans/rooms/computer_area_occupied.yaml b/components/input_booleans/rooms/computer_area_occupied.yaml index 1bb7624..fd8eb19 100644 --- a/components/input_booleans/rooms/computer_area_occupied.yaml +++ b/components/input_booleans/rooms/computer_area_occupied.yaml @@ -1,2 +1,2 @@ -name: Computer Area -icon: mdi:desktop-classic \ No newline at end of file +# name: Computer Area +# icon: mdi:desktop-classic \ No newline at end of file diff --git a/components/input_booleans/rooms/deck_occupied.yaml b/components/input_booleans/rooms/deck_occupied.yaml index 8bafbf6..79adb4f 100644 --- a/components/input_booleans/rooms/deck_occupied.yaml +++ b/components/input_booleans/rooms/deck_occupied.yaml @@ -1,2 +1,2 @@ -name: Deck -icon: mdi:fence \ No newline at end of file +# name: Deck +# icon: mdi:fence \ No newline at end of file diff --git a/components/input_booleans/rooms/dining_room_occupied.yaml b/components/input_booleans/rooms/dining_room_occupied.yaml index 0c5baec..f479e99 100644 --- a/components/input_booleans/rooms/dining_room_occupied.yaml +++ b/components/input_booleans/rooms/dining_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Dining Room -icon: mdi:table-chair +# name: Dining Room +# icon: mdi:table-chair diff --git a/components/input_booleans/rooms/entryway_occupied.yaml b/components/input_booleans/rooms/entryway_occupied.yaml index b190747..88494f0 100644 --- a/components/input_booleans/rooms/entryway_occupied.yaml +++ b/components/input_booleans/rooms/entryway_occupied.yaml @@ -1,2 +1,2 @@ -name: Entryway -icon: mdi:ceiling-light \ No newline at end of file +# name: Entryway +# icon: mdi:ceiling-light \ No newline at end of file diff --git a/components/input_booleans/rooms/front_porch_occupied.yaml b/components/input_booleans/rooms/front_porch_occupied.yaml index 26c0bc3..7ed07ad 100644 --- a/components/input_booleans/rooms/front_porch_occupied.yaml +++ b/components/input_booleans/rooms/front_porch_occupied.yaml @@ -1,2 +1,2 @@ -name: Front Porch -icon: mdi:outdoor-lamp \ No newline at end of file +# name: Front Porch +# icon: mdi:outdoor-lamp \ No newline at end of file diff --git a/components/input_booleans/rooms/front_room_occupied.yaml b/components/input_booleans/rooms/front_room_occupied.yaml index d501ca1..8a20796 100644 --- a/components/input_booleans/rooms/front_room_occupied.yaml +++ b/components/input_booleans/rooms/front_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Front Room -icon: mdi:television \ No newline at end of file +# name: Front Room +# icon: mdi:television \ No newline at end of file diff --git a/components/input_booleans/rooms/front_yard_occupied.yaml b/components/input_booleans/rooms/front_yard_occupied.yaml index 4112e4b..160a734 100644 --- a/components/input_booleans/rooms/front_yard_occupied.yaml +++ b/components/input_booleans/rooms/front_yard_occupied.yaml @@ -1,2 +1,2 @@ -name: Front Yard -icon: mdi:grass \ No newline at end of file +# name: Front Yard +# icon: mdi:grass \ No newline at end of file diff --git a/components/input_booleans/rooms/furnace_room_occupied.yaml b/components/input_booleans/rooms/furnace_room_occupied.yaml index 977b77f..8539580 100644 --- a/components/input_booleans/rooms/furnace_room_occupied.yaml +++ b/components/input_booleans/rooms/furnace_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Furnace Room -icon: mdi:hvac \ No newline at end of file +# name: Furnace Room +# icon: mdi:hvac \ No newline at end of file diff --git a/components/input_booleans/rooms/garage_occupied.yaml b/components/input_booleans/rooms/garage_occupied.yaml index 3671c20..26915d8 100644 --- a/components/input_booleans/rooms/garage_occupied.yaml +++ b/components/input_booleans/rooms/garage_occupied.yaml @@ -1,2 +1,2 @@ -name: Garage -icon: mdi:garage \ No newline at end of file +# name: Garage +# icon: mdi:garage \ No newline at end of file diff --git a/components/input_booleans/rooms/girls_room_automatic_lights.yaml b/components/input_booleans/rooms/girls_room_automatic_lights.yaml deleted file mode 100644 index 14b8711..0000000 --- a/components/input_booleans/rooms/girls_room_automatic_lights.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Girls Room Automatic Lights -icon: mdi:lightbulb-auto \ No newline at end of file diff --git a/components/input_booleans/rooms/girls_room_closet_occupied.yaml b/components/input_booleans/rooms/girls_room_closet_occupied.yaml index e5a1866..8832e0a 100644 --- a/components/input_booleans/rooms/girls_room_closet_occupied.yaml +++ b/components/input_booleans/rooms/girls_room_closet_occupied.yaml @@ -1,2 +1,2 @@ -name: Girls Room Closet -icon: mdi:hanger \ No newline at end of file +# name: Girls Room Closet +# icon: mdi:hanger \ No newline at end of file diff --git a/components/input_booleans/rooms/girls_room_light_cycle.yaml b/components/input_booleans/rooms/girls_room_light_cycle.yaml deleted file mode 100644 index 864c894..0000000 --- a/components/input_booleans/rooms/girls_room_light_cycle.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Girls Room Light Cycle \ No newline at end of file diff --git a/components/input_booleans/rooms/girls_room_occupied.yaml b/components/input_booleans/rooms/girls_room_occupied.yaml index 211756f..624207e 100644 --- a/components/input_booleans/rooms/girls_room_occupied.yaml +++ b/components/input_booleans/rooms/girls_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Girls Room -icon: mdi:teddy-bear +# name: Girls Room +# icon: mdi:teddy-bear diff --git a/components/input_booleans/rooms/great_room_occupied.yaml b/components/input_booleans/rooms/great_room_occupied.yaml index a9e621e..eab8cfd 100644 --- a/components/input_booleans/rooms/great_room_occupied.yaml +++ b/components/input_booleans/rooms/great_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Great Room -icon: mdi:microsoft-xbox-controller \ No newline at end of file +# name: Great Room +# icon: mdi:microsoft-xbox-controller \ No newline at end of file diff --git a/components/input_booleans/rooms/kitchen_occupied.yaml b/components/input_booleans/rooms/kitchen_occupied.yaml index 4427378..042fd27 100644 --- a/components/input_booleans/rooms/kitchen_occupied.yaml +++ b/components/input_booleans/rooms/kitchen_occupied.yaml @@ -1,2 +1,2 @@ -name: Kitchen -icon: mdi:fridge +# name: Kitchen +# icon: mdi:fridge diff --git a/components/input_booleans/rooms/mancave_occupied.yaml b/components/input_booleans/rooms/mancave_occupied.yaml index fa3efe4..54fb4f3 100644 --- a/components/input_booleans/rooms/mancave_occupied.yaml +++ b/components/input_booleans/rooms/mancave_occupied.yaml @@ -1,2 +1,2 @@ -name: Mancave -icon: mdi:human-male +# name: Mancave +# icon: mdi:human-male diff --git a/components/input_booleans/rooms/master_bathroom_occupied.yaml b/components/input_booleans/rooms/master_bathroom_occupied.yaml index b06c0af..64dfa5c 100644 --- a/components/input_booleans/rooms/master_bathroom_occupied.yaml +++ b/components/input_booleans/rooms/master_bathroom_occupied.yaml @@ -1,2 +1,2 @@ -name: Master Bathroom -icon: mdi:shower +# name: Master Bathroom +# icon: mdi:shower diff --git a/components/input_booleans/rooms/master_bedroom_closet_occupied.yaml b/components/input_booleans/rooms/master_bedroom_closet_occupied.yaml index a7a1c46..f4824cb 100644 --- a/components/input_booleans/rooms/master_bedroom_closet_occupied.yaml +++ b/components/input_booleans/rooms/master_bedroom_closet_occupied.yaml @@ -1,2 +1,2 @@ -name: Master Bedroom Closet -icon: mdi:hanger +# name: Master Bedroom Closet +# icon: mdi:hanger diff --git a/components/input_booleans/rooms/master_bedroom_occupied.yaml b/components/input_booleans/rooms/master_bedroom_occupied.yaml index 3dcb0da..0b40940 100644 --- a/components/input_booleans/rooms/master_bedroom_occupied.yaml +++ b/components/input_booleans/rooms/master_bedroom_occupied.yaml @@ -1,2 +1,2 @@ -name: Master Bedroom -icon: mdi:bed-king +# name: Master Bedroom +# icon: mdi:bed-king diff --git a/components/input_booleans/rooms/utility_room_occupied.yaml b/components/input_booleans/rooms/utility_room_occupied.yaml index ba51ad8..78ac842 100644 --- a/components/input_booleans/rooms/utility_room_occupied.yaml +++ b/components/input_booleans/rooms/utility_room_occupied.yaml @@ -1,2 +1,2 @@ -name: Utility Room -icon: mdi:washing-machine +# name: Utility Room +# icon: mdi:washing-machine diff --git a/components/packages/batteries/hue_batteries.yaml b/components/packages/batteries/hue_batteries.yaml index ea77766..29377f8 100644 --- a/components/packages/batteries/hue_batteries.yaml +++ b/components/packages/batteries/hue_batteries.yaml @@ -4,8 +4,8 @@ sensor: name: Lowest Hue Device Battery type: min entity_ids: - - sensor.bar_battery - - sensor.entryway_battery - - sensor.front_room_battery - - sensor.front_porch_battery - - sensor.deck_battery + - sensor.bar_hue_motion_sensor_battery + - sensor.entryway_hue_motion_sensor_battery + - sensor.front_room_hue_motion_sensor_battery + - sensor.front_porch_hue_motion_sensor_battery + - sensor.deck_hue_motion_sensor_battery diff --git a/components/packages/camera_casting.yaml b/components/packages/camera_casting.yaml index facb761..776eec7 100644 --- a/components/packages/camera_casting.yaml +++ b/components/packages/camera_casting.yaml @@ -25,6 +25,62 @@ script: execute_cast_dropdown: alias: Press to execute sequence: + - variables: + media_player: > + {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} + media_player.front_room_hub + {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %} + media_player.girls_room_hub + {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} + media_player.computer_area_hub + {% endif %} + camera: > + {% if is_state('input_select.camera_dropdown', 'Boys Room') %} + media-source://camera/camera.frigate_cam01 + {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} + media-source://camera/camera.frigate_cam12 + {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} + media-source://camera/camera.frigate_cam03 + {% elif is_state('input_select.camera_dropdown', 'Garage') %} + media-source://camera/camera.frigate_cam04 + {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} + media-source://camera/camera.frigate_cam06 + {% elif is_state('input_select.camera_dropdown', 'Girls Room') %} + media-source://camera/camera.frigate_cam08 + {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} + media-source://camera/camera.frigate_cam12 + {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} + media-source://camera/camera.frigate_cam18 + {% elif is_state('input_select.camera_dropdown', 'Front Door') %} + media-source://camera/camera.frigate_cam19 + {% elif is_state('input_select.camera_dropdown', 'Front Room') %} + media-source://camera/camera.frigate_cam12 + {% endif %} + + + - action: media_player.volume_set + data: + entity_id: "{{ media_player }}" + volume_level: 0.100 + + - action: media_player.play_media + target: + entity_id: "{{ media_player }}" + data: + media: + media_content_id: "{{ camera }}" + media_content_type: image/jpeg + # metadata: + # title: Frigate Cam01 + # thumbnail: /api/camera_proxy/camera.frigate_cam01 + # media_class: video + # children_media_class: null + # navigateIds: + # - {} + # - media_content_type: app + # media_content_id: media-source://camera + # browse_entity_id: media_player.front_room_hub + # - action: media_player.play_media # target: # entity_id: > @@ -58,18 +114,6 @@ script: # {% endif %} # media_content_type: 'image/jpeg' - - action: media_player.volume_set - data: - entity_id: > - {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} - media_player.front_room_hub - {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %} - media_player.girls_room_hub - {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} - media_player.computer_area_hub - {% endif %} - volume_level: 0.100 - # - action: webrtc.dash_cast # data: # entity_id: > @@ -82,60 +126,60 @@ script: # {% endif %} # url: > # {% if is_state('input_select.camera_dropdown', 'Boys Room') %} - # rtsp://192.168.1.11:8554/cam01_sub_opus + # rtsp://192.168.1.11:8554/cam01_sub # {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} - # rtsp://192.168.1.11:8554/cam12_sub_opus + # rtsp://192.168.1.11:8554/cam12_sub # {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} - # rtsp://192.168.1.11:8554/cam03_sub_opus + # rtsp://192.168.1.11:8554/cam03_sub # {% elif is_state('input_select.camera_dropdown', 'Garage') %} - # rtsp://192.168.1.11:8554/cam04_sub_opus + # rtsp://192.168.1.11:8554/cam04_sub # {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} - # rtsp://192.168.1.11:8554/cam06_sub_opus + # rtsp://192.168.1.11:8554/cam06_sub # {% elif is_state('input_select.camera_dropdown', 'Girls Room') %} - # rtsp://192.168.1.11:8554/cam08_sub_opus + # rtsp://192.168.1.11:8554/cam08_sub # {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} - # rtsp://192.168.1.11:8554/cam14_sub_opus + # rtsp://192.168.1.11:8554/cam14_sub # {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} - # rtsp://192.168.1.11:8554/cam18_sub_opus + # rtsp://192.168.1.11:8554/cam18_sub # {% elif is_state('input_select.camera_dropdown', 'Front Door') %} - # rtsp://192.168.1.11:8554/cam19_sub_opus + # rtsp://192.168.1.11:8554/cam19_sub # {% elif is_state('input_select.camera_dropdown', 'Front Room') %} - # rtsp://192.168.1.11:8554/cam13_sub_opus + # rtsp://192.168.1.11:8554/cam13_sub # {% endif %} # force: true # extra: # mode: webrtc - - action: cast.show_lovelace_view - data: - entity_id: > - {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} - media_player.front_room_hub - {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %} - media_player.girls_room_hub - {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} - media_player.computer_area_hub - {% endif %} - dashboard_path: camera-casting-yml - view_path: > - {% if is_state('input_select.camera_dropdown', 'Boys Room') %} - boys-room-camera - {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} - kitchen-camera - {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} - computer-area-camera - {% elif is_state('input_select.camera_dropdown', 'Garage') %} - garage-camera - {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} - mbr-camera - {% elif is_state('input_select.camera_dropdown', 'Girls Room') %} - girls-room-camera - {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} - back-yard-camera - {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} - front-yard-camera - {% elif is_state('input_select.camera_dropdown', 'Front Door') %} - front-porch-camera - {% elif is_state('input_select.camera_dropdown', 'Front Room') %} - front-room-camera - {% endif %} + # - action: cast.show_lovelace_view + # data: + # entity_id: > + # {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %} + # media_player.front_room_hub + # {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %} + # media_player.girls_room_hub + # {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %} + # media_player.computer_area_hub + # {% endif %} + # dashboard_path: casting-yml + # view_path: > + # {% if is_state('input_select.camera_dropdown', 'Boys Room') %} + # boys-room-camera + # {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} + # kitchen-camera + # {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} + # computer-area-camera + # {% elif is_state('input_select.camera_dropdown', 'Garage') %} + # garage-camera + # {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} + # mbr-camera + # {% elif is_state('input_select.camera_dropdown', 'Girls Room') %} + # girls-room-camera + # {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} + # back-yard-camera + # {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} + # front-yard-camera + # {% elif is_state('input_select.camera_dropdown', 'Front Door') %} + # front-porch-camera + # {% elif is_state('input_select.camera_dropdown', 'Front Room') %} + # front-room-camera + # {% endif %} diff --git a/components/packages/fan.yaml b/components/packages/fan.yaml deleted file mode 100644 index 03d02b7..0000000 --- a/components/packages/fan.yaml +++ /dev/null @@ -1 +0,0 @@ -fan: !include_dir_list ../fans \ No newline at end of file diff --git a/components/packages/google_assistant.yaml b/components/packages/google_assistant.yaml index 1fff2da..714c1d9 100644 --- a/components/packages/google_assistant.yaml +++ b/components/packages/google_assistant.yaml @@ -52,25 +52,37 @@ google_assistant: - Computer Camera room: Computer Area - camera.frigate_cam13: - name: Front Room Camera + camera.frigate_cam12: + name: Kitchen Camera expose: true aliases: - - Front Room Cam - room: Front Room + - Kitchen Cam + room: Kitchen camera.frigate_cam08: - name: Nursery Camera + name: Girls Room Camera expose: true aliases: - - Baby Cam - - Baby Monitor - - Kids Cam - - Kids Room Camera - Nursery Cam - - Baby Monitor Cam + - Bridgets Cam - Baby Monitor Camera - room: Nursery + room: Girls Room + + camera.frigate_cam01: + name: Boys Room Camera + expose: true + aliases: + - Blue Room Camera + - Emmetts Cam + room: Boys Room + + camera.frigate_cam18: + name: Front Yard Camera + expose: true + aliases: + - Driveway Camera + - Out Front Cam + room: Front Yard input_boolean.announcement_pending: name: Announcement Pending diff --git a/components/packages/hvac_stats.yaml b/components/packages/hvac_stats.yaml index d37fceb..f833b9e 100644 --- a/components/packages/hvac_stats.yaml +++ b/components/packages/hvac_stats.yaml @@ -6,7 +6,7 @@ sensor: - sensor.master_bedroom_multisensor_air_temperature - sensor.girls_room_multisensor_air_temperature - sensor.thermostat_temperature - - sensor.bar_temperature + - sensor.bar_hue_motion_sensor_temperature - sensor.front_room_thermostat_temperature - sensor.kitchen_multisensor_air_temperature @@ -17,7 +17,7 @@ sensor: - sensor.master_bedroom_multisensor_air_temperature - sensor.girls_room_multisensor_air_temperature - sensor.thermostat_temperature - - sensor.bar_temperature + - sensor.bar_hue_motion_sensor_temperature - sensor.front_room_thermostat_temperature - sensor.kitchen_multisensor_air_temperature @@ -28,7 +28,7 @@ sensor: # - sensor.master_bedroom_multisensor_air_temperature # - sensor.girls_room_multisensor_air_temperature # - sensor.thermostat_temperature - # - sensor.bar_temperature + # - sensor.bar_hue_motion_sensor_temperature # - sensor.front_room_thermostat_temperature # - sensor.kitchen_multisensor_air_temperature diff --git a/components/packages/lovelace.yaml b/components/packages/lovelace.yaml index c6f1976..f2945d0 100644 --- a/components/packages/lovelace.yaml +++ b/components/packages/lovelace.yaml @@ -32,12 +32,12 @@ lovelace: icon: mdi:camcorder show_in_sidebar: false filename: ui-cams.yaml - camera-casting-yml: + casting-yml: mode: yaml - title: Camera Casting + title: Casting icon: mdi:cast show_in_sidebar: false - filename: ui-camera-cast.yaml + filename: ui-cast.yaml details-yml: mode: yaml title: Details diff --git a/components/packages/naturally_lit_rooms.yaml b/components/packages/naturally_lit_rooms.yaml index 6b06921..f07d758 100644 --- a/components/packages/naturally_lit_rooms.yaml +++ b/components/packages/naturally_lit_rooms.yaml @@ -65,7 +65,7 @@ template: entity_id: input_number.deck_light_level_trigger - platform: state - entity_id: sensor.deck_light_level + entity_id: sensor.deck_hue_motion_sensor_illuminance binary_sensor: - name: "Deck Naturally Lit" @@ -75,15 +75,15 @@ template: delay_off: seconds: 3 state: > - {{ states('sensor.deck_light_level') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) }} + {{ states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) }} icon: > - {% if states('sensor.deck_light_level') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) %} + {% if states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) %} mdi:weather-sunny {% else %} mdi:weather-sunny-off {% endif %} attributes: - illuminance: "{{ states('sensor.deck_light_level') | float(default=0) }}" + illuminance: "{{ states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) }}" trigger: "{{ states('input_number.deck_light_level_trigger') | float(default=0) }}" - trigger: @@ -128,7 +128,7 @@ template: entity_id: input_number.entryway_light_level_trigger - platform: state - entity_id: sensor.entryway_light_level + entity_id: sensor.entryway_hue_motion_sensor_illuminance binary_sensor: - name: "Entryway Naturally Lit" @@ -138,15 +138,15 @@ template: delay_off: seconds: 3 state: > - {{ states('sensor.entryway_light_level') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) }} + {{ states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) }} icon: > - {% if states('sensor.entryway_light_level') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) %} + {% if states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) %} mdi:weather-sunny {% else %} mdi:weather-sunny-off {% endif %} attributes: - illuminance: "{{ states('sensor.entryway_light_level') | float(default=0) }}" + illuminance: "{{ states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) }}" trigger: "{{ states('input_number.entryway_light_level_trigger') | float(default=0) }}" - trigger: @@ -157,7 +157,7 @@ template: entity_id: input_number.front_porch_light_level_trigger - platform: state - entity_id: sensor.front_porch_light_level + entity_id: sensor.front_porch_hue_motion_sensor_illuminance binary_sensor: - name: "Front Porch Naturally Lit" @@ -167,15 +167,15 @@ template: delay_off: seconds: 3 state: > - {{ states('sensor.front_porch_light_level') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) }} + {{ states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) }} icon: > - {% if states('sensor.front_porch_light_level') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) %} + {% if states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) %} mdi:weather-sunny {% else %} mdi:weather-sunny-off {% endif %} attributes: - illuminance: "{{ states('sensor.front_porch_light_level') | float(default=0) }}" + illuminance: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) }}" trigger: "{{ states('input_number.front_porch_light_level_trigger') | float(default=0) }}" - trigger: @@ -186,7 +186,7 @@ template: entity_id: input_number.front_room_light_level_trigger - platform: state - entity_id: sensor.front_room_light_level + entity_id: sensor.front_room_hue_motion_sensor_illuminance binary_sensor: - name: "Front Room Naturally Lit" @@ -196,15 +196,15 @@ template: delay_off: seconds: 3 state: > - {{ states('sensor.front_room_light_level') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) }} + {{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) }} icon: > - {% if states('sensor.front_room_light_level') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) %} + {% if states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) %} mdi:weather-sunny {% else %} mdi:weather-sunny-off {% endif %} attributes: - illuminance: "{{ states('sensor.front_room_light_level') | float(default=0) }}" + illuminance: "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) }}" trigger: "{{ states('input_number.front_room_light_level_trigger') | float(default=0) }}" - trigger: diff --git a/components/packages/rtl_433_devices/back_yard_thermostat.yaml b/components/packages/rtl_433_devices/back_yard_thermostat.yaml index 0d3c478..b0e41b1 100644 --- a/components/packages/rtl_433_devices/back_yard_thermostat.yaml +++ b/components/packages/rtl_433_devices/back_yard_thermostat.yaml @@ -1,53 +1,53 @@ -mqtt: - sensor: - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/time" - entity_category: diagnostic - unique_id: acurite-tower-1-a-time - device: - identifiers: acurite-tower-1-a - name: Back Yard Thermostat - model: Tower - manufacturer: Acurite - - - name: "Battery" - device_class: battery - unit_of_measurement: "%" - value_template: "{{ (float(value) * 99 + 1) | round(0) }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/battery_ok" - unique_id: acurite-tower-1-a-battery-ok - device: - identifiers: acurite-tower-1-a - name: Back Yard Thermostat - model: Tower - manufacturer: Acurite - - - name: "Temperature" - device_class: temperature - unit_of_measurement: "°C" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/temperature_C" - unique_id: acurite-tower-1-a-temperature-c - device: - identifiers: acurite-tower-1-a - name: Back Yard Thermostat - model: Tower - manufacturer: Acurite - - - name: "Humidity" - device_class: humidity - unit_of_measurement: "%" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/humidity" - unique_id: acurite-tower-1-a-humidity - device: - identifiers: acurite-tower-1-a - name: Back Yard Thermostat - model: Tower - manufacturer: Acurite +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/time" + entity_category: diagnostic + unique_id: acurite-tower-1-a-time + device: + identifiers: acurite-tower-1-a + name: Back Yard Thermostat + model: Tower + manufacturer: Acurite + + - name: "Battery" + device_class: battery + unit_of_measurement: "%" + value_template: "{{ (float(value) * 99 + 1) | round(0) }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/battery_ok" + unique_id: acurite-tower-1-a-battery-ok + device: + identifiers: acurite-tower-1-a + name: Back Yard Thermostat + model: Tower + manufacturer: Acurite + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/temperature_C" + unique_id: acurite-tower-1-a-temperature-c + device: + identifiers: acurite-tower-1-a + name: Back Yard Thermostat + model: Tower + manufacturer: Acurite + + - name: "Humidity" + device_class: humidity + unit_of_measurement: "%" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/humidity" + unique_id: acurite-tower-1-a-humidity + device: + identifiers: acurite-tower-1-a + name: Back Yard Thermostat + model: Tower + manufacturer: Acurite diff --git a/components/packages/rtl_433_devices/chevrolet_traverse_lt_awd.yaml b/components/packages/rtl_433_devices/chevrolet_traverse_lt_awd.yaml index 48e3d99..e376f63 100644 --- a/components/packages/rtl_433_devices/chevrolet_traverse_lt_awd.yaml +++ b/components/packages/rtl_433_devices/chevrolet_traverse_lt_awd.yaml @@ -1,12 +1,12 @@ -mqtt: - device_tracker: - - name: "Location" - icon: mdi:car-estate - json_attributes_topic: "cleverdevices/clever_traverse/attributes" - unique_id: chevrolet-traverse-lt-awd - device: - name: Chevrolet Traverse - identifiers: chevrolet-traverse-lt-awd - model_id: LT AWD - model: Traverse - manufacturer: Chevrolet +mqtt: + device_tracker: + - name: "Location" + icon: mdi:car-estate + json_attributes_topic: "cleverdevices/clever_traverse/attributes" + unique_id: chevrolet-traverse-lt-awd + device: + name: Chevrolet Traverse + identifiers: chevrolet-traverse-lt-awd + model_id: LT AWD + model: Traverse + manufacturer: Chevrolet diff --git a/components/packages/rtl_433_devices/daisy_soil_sensor.yaml b/components/packages/rtl_433_devices/daisy_soil_sensor.yaml index 42f4792..8691088 100644 --- a/components/packages/rtl_433_devices/daisy_soil_sensor.yaml +++ b/components/packages/rtl_433_devices/daisy_soil_sensor.yaml @@ -1,42 +1,42 @@ -mqtt: - sensor: - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/time" - entity_category: diagnostic - unique_id: fine-offset-wh51-daisy-time - device: - identifiers: ecowitt-wh51-daisy - name: Daisy Soil Sensor - model: WH51 - manufacturer: Ecowitt - - - name: "Battery" - device_class: battery - unit_of_measurement: "%" - value_template: "{{ (float(value) * 99 + 1) | round(0) }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/battery_ok" - unique_id: fine-offset-wh51-battery-ok - device: - identifiers: ecowitt-wh51-daisy - name: Daisy Soil Sensor - model: WH51 - manufacturer: Ecowitt - - - name: "Moisture" - device_class: moisture - unit_of_measurement: "%" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/moisture" - unique_id: fine-offset-wh51-daisy-moisture - device: - identifiers: ecowitt-wh51-daisy - name: Daisy Soil Sensor - model: WH51 - manufacturer: Ecowitt - - +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/time" + entity_category: diagnostic + unique_id: fine-offset-wh51-daisy-time + device: + identifiers: ecowitt-wh51-daisy + name: Daisy Soil Sensor + model: WH51 + manufacturer: Ecowitt + + - name: "Battery" + device_class: battery + unit_of_measurement: "%" + value_template: "{{ (float(value) * 99 + 1) | round(0) }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/battery_ok" + unique_id: fine-offset-wh51-battery-ok + device: + identifiers: ecowitt-wh51-daisy + name: Daisy Soil Sensor + model: WH51 + manufacturer: Ecowitt + + - name: "Moisture" + device_class: moisture + unit_of_measurement: "%" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/moisture" + unique_id: fine-offset-wh51-daisy-moisture + device: + identifiers: ecowitt-wh51-daisy + name: Daisy Soil Sensor + model: WH51 + manufacturer: Ecowitt + + diff --git a/components/packages/rtl_433_devices/front_yard_thermostat.yaml b/components/packages/rtl_433_devices/front_yard_thermostat.yaml index 72f420d..ef5a522 100644 --- a/components/packages/rtl_433_devices/front_yard_thermostat.yaml +++ b/components/packages/rtl_433_devices/front_yard_thermostat.yaml @@ -1,53 +1,53 @@ -mqtt: - sensor: - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/time" - entity_category: diagnostic - unique_id: lacrosse-tx141thbv2-0-time - device: - identifiers: lacrosse-tx141thbv2-0 - name: Front Yard Thermostat - model: TX141THBv2 - manufacturer: LaCrosse - - - name: "Battery" - device_class: battery - unit_of_measurement: "%" - value_template: "{{ (float(value) * 99 + 1) | round(0) }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/battery_ok" - unique_id: lacrosse-tx141thbv2-0-battery-ok - device: - identifiers: lacrosse-tx141thbv2-0 - name: Front Yard Thermostat - model: TX141THBv2 - manufacturer: LaCrosse - - - name: "Temperature" - device_class: temperature - unit_of_measurement: "°C" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/temperature_C" - unique_id: lacrosse-tx141thbv2-0-temperature-c - device: - identifiers: lacrosse-tx141thbv2-0 - name: Front Yard Thermostat - model: TX141THBv2 - manufacturer: LaCrosse - - - name: "Humidity" - device_class: humidity - unit_of_measurement: "%" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/humidity" - unique_id: lacrosse-tx141thbv2-0-humidity - device: - identifiers: lacrosse-tx141thbv2-0 - name: Front Yard Thermostat - model: TX141THBv2 +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/time" + entity_category: diagnostic + unique_id: lacrosse-tx141thbv2-0-time + device: + identifiers: lacrosse-tx141thbv2-0 + name: Front Yard Thermostat + model: TX141THBv2 + manufacturer: LaCrosse + + - name: "Battery" + device_class: battery + unit_of_measurement: "%" + value_template: "{{ (float(value) * 99 + 1) | round(0) }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/battery_ok" + unique_id: lacrosse-tx141thbv2-0-battery-ok + device: + identifiers: lacrosse-tx141thbv2-0 + name: Front Yard Thermostat + model: TX141THBv2 + manufacturer: LaCrosse + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/temperature_C" + unique_id: lacrosse-tx141thbv2-0-temperature-c + device: + identifiers: lacrosse-tx141thbv2-0 + name: Front Yard Thermostat + model: TX141THBv2 + manufacturer: LaCrosse + + - name: "Humidity" + device_class: humidity + unit_of_measurement: "%" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/humidity" + unique_id: lacrosse-tx141thbv2-0-humidity + device: + identifiers: lacrosse-tx141thbv2-0 + name: Front Yard Thermostat + model: TX141THBv2 manufacturer: LaCrosse \ No newline at end of file diff --git a/components/packages/rtl_433_devices/hasta_soil_sensor.yaml b/components/packages/rtl_433_devices/hasta_soil_sensor.yaml index 356eb90..0894412 100644 --- a/components/packages/rtl_433_devices/hasta_soil_sensor.yaml +++ b/components/packages/rtl_433_devices/hasta_soil_sensor.yaml @@ -1,40 +1,40 @@ -mqtt: - sensor: - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/time" - entity_category: diagnostic - unique_id: fine-offset-wh51-hasta-time - device: - identifiers: ecowitt-wh51-hasta - name: Hasta Soil Sensor - model: WH51 - manufacturer: Ecowitt - - - name: "Battery" - device_class: battery - unit_of_measurement: "%" - value_template: "{{ (float(value) * 99 + 1) | round(0) }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/battery_ok" - unique_id: fine-offset-wh51-hasta-battery-ok - device: - identifiers: ecowitt-wh51-hasta - name: Hasta Soil Sensor - model: WH51 - manufacturer: Ecowitt - - - name: "Moisture" - device_class: moisture - unit_of_measurement: "%" - value_template: "{{ value|float }}" - state_class: measurement - state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/moisture" - unique_id: fine-offset-wh51-0ce593-moisture - device: - identifiers: ecowitt-wh51-hasta - name: Hasta Soil Sensor - model: WH51 +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/time" + entity_category: diagnostic + unique_id: fine-offset-wh51-hasta-time + device: + identifiers: ecowitt-wh51-hasta + name: Hasta Soil Sensor + model: WH51 + manufacturer: Ecowitt + + - name: "Battery" + device_class: battery + unit_of_measurement: "%" + value_template: "{{ (float(value) * 99 + 1) | round(0) }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/battery_ok" + unique_id: fine-offset-wh51-hasta-battery-ok + device: + identifiers: ecowitt-wh51-hasta + name: Hasta Soil Sensor + model: WH51 + manufacturer: Ecowitt + + - name: "Moisture" + device_class: moisture + unit_of_measurement: "%" + value_template: "{{ value|float }}" + state_class: measurement + state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/moisture" + unique_id: fine-offset-wh51-0ce593-moisture + device: + identifiers: ecowitt-wh51-hasta + name: Hasta Soil Sensor + model: WH51 manufacturer: Ecowitt \ No newline at end of file diff --git a/components/packages/rtl_433_devices/podein_devices.yaml b/components/packages/rtl_433_devices/podein_devices.yaml index 9fab11d..bc159d6 100644 --- a/components/packages/rtl_433_devices/podein_devices.yaml +++ b/components/packages/rtl_433_devices/podein_devices.yaml @@ -1,11 +1,11 @@ -mqtt: - device_tracker: - - name: Kristy's Phone - icon: mdi:cellphone - json_attributes_topic: "cleverdevices/kristy_s_phone/attributes" - unique_id: kristys-phone - - - name: nmap_tracker_fe_cf_82_b2_22_e0 - icon: mdi:cellphone - json_attributes_topic: "cleverdevices/marshalls_phone/attributes" +mqtt: + device_tracker: + - name: Kristy's Phone + icon: mdi:cellphone + json_attributes_topic: "cleverdevices/kristy_s_phone/attributes" + unique_id: kristys-phone + + - name: nmap_tracker_fe_cf_82_b2_22_e0 + icon: mdi:cellphone + json_attributes_topic: "cleverdevices/marshalls_phone/attributes" unique_id: marshalls-phone \ No newline at end of file diff --git a/components/packages/rtl_433_devices/tpms.yaml b/components/packages/rtl_433_devices/tpms.yaml index 1ee013f..dba6b5c 100644 --- a/components/packages/rtl_433_devices/tpms.yaml +++ b/components/packages/rtl_433_devices/tpms.yaml @@ -1,112 +1,112 @@ -mqtt: - sensor: - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/time" - entity_category: diagnostic - unique_id: schrader-0d0d33-time - device: - name: "Tire 1" - identifiers: schrader-0d0d33 - via_device: chevrolet-traverse-lt-awd - - - name: "Pressure" - device_class: pressure - unit_of_measurement: "kPa" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/pressure_kPa" - unique_id: schrader-0d0d33-pressure-kpa - device: - name: "Tire 1" - identifiers: schrader-0d0d33 - via_device: chevrolet-traverse-lt-awd - - - name: "Temperature" - device_class: temperature - unit_of_measurement: "°C" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/temperature_C" - unique_id: schrader-0d0d33-temperature-c - device: - name: "Tire 1" - identifiers: schrader-0d0d33 - via_device: chevrolet-traverse-lt-awd - - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/time" - entity_category: diagnostic - unique_id: schrader-0d31a0-time - device: - name: "Tire 2" - identifiers: schrader-0d31a0 - via_device: chevrolet-traverse-lt-awd - - - name: "Pressure" - device_class: pressure - unit_of_measurement: "kPa" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/pressure_kPa" - unique_id: schrader-0d31a0-pressure-kpa - device: - name: "Tire 2" - identifiers: schrader-0d31a0 - via_device: chevrolet-traverse-lt-awd - - - name: "Temperature" - device_class: temperature - unit_of_measurement: "°C" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/temperature_C" - unique_id: schrader-0d31a0-temperature-c - device: - name: "Tire 2" - identifiers: schrader-0d31a0 - via_device: chevrolet-traverse-lt-awd - - - name: "Timestamp" - device_class: timestamp - icon: mdi:clock-in - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/time" - entity_category: diagnostic - unique_id: schrader-0d1909-time - device: - name: "Tire 3" - identifiers: schrader-0d1909 - via_device: chevrolet-traverse-lt-awd - - - name: "Pressure" - device_class: pressure - unit_of_measurement: "kPa" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/pressure_kPa" - unique_id: schrader-0d1909-pressure-kpa - device: - name: "Tire 3" - identifiers: schrader-0d1909 - via_device: chevrolet-traverse-lt-awd - - - name: "Temperature" - device_class: temperature - unit_of_measurement: "°C" - value_template: "{{ value|float }}" - state_class: measurement - entity_category: diagnostic - state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/temperature_C" - unique_id: schrader-0d1909-temperature-c - device: - name: "Tire 3" - identifiers: schrader-0d1909 +mqtt: + sensor: + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/time" + entity_category: diagnostic + unique_id: schrader-0d0d33-time + device: + name: "Tire 1" + identifiers: schrader-0d0d33 + via_device: chevrolet-traverse-lt-awd + + - name: "Pressure" + device_class: pressure + unit_of_measurement: "kPa" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/pressure_kPa" + unique_id: schrader-0d0d33-pressure-kpa + device: + name: "Tire 1" + identifiers: schrader-0d0d33 + via_device: chevrolet-traverse-lt-awd + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/temperature_C" + unique_id: schrader-0d0d33-temperature-c + device: + name: "Tire 1" + identifiers: schrader-0d0d33 + via_device: chevrolet-traverse-lt-awd + + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/time" + entity_category: diagnostic + unique_id: schrader-0d31a0-time + device: + name: "Tire 2" + identifiers: schrader-0d31a0 + via_device: chevrolet-traverse-lt-awd + + - name: "Pressure" + device_class: pressure + unit_of_measurement: "kPa" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/pressure_kPa" + unique_id: schrader-0d31a0-pressure-kpa + device: + name: "Tire 2" + identifiers: schrader-0d31a0 + via_device: chevrolet-traverse-lt-awd + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/temperature_C" + unique_id: schrader-0d31a0-temperature-c + device: + name: "Tire 2" + identifiers: schrader-0d31a0 + via_device: chevrolet-traverse-lt-awd + + - name: "Timestamp" + device_class: timestamp + icon: mdi:clock-in + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/time" + entity_category: diagnostic + unique_id: schrader-0d1909-time + device: + name: "Tire 3" + identifiers: schrader-0d1909 + via_device: chevrolet-traverse-lt-awd + + - name: "Pressure" + device_class: pressure + unit_of_measurement: "kPa" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/pressure_kPa" + unique_id: schrader-0d1909-pressure-kpa + device: + name: "Tire 3" + identifiers: schrader-0d1909 + via_device: chevrolet-traverse-lt-awd + + - name: "Temperature" + device_class: temperature + unit_of_measurement: "°C" + value_template: "{{ value|float }}" + state_class: measurement + entity_category: diagnostic + state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/temperature_C" + unique_id: schrader-0d1909-temperature-c + device: + name: "Tire 3" + identifiers: schrader-0d1909 via_device: chevrolet-traverse-lt-awd \ No newline at end of file diff --git a/components/packages/template_binary_sensors.yaml b/components/packages/template_binary_sensors.yaml index 911c06a..377726b 100644 --- a/components/packages/template_binary_sensors.yaml +++ b/components/packages/template_binary_sensors.yaml @@ -212,9 +212,9 @@ template: minutes: 5 state: >- {% if is_state('binary_sensor.patio_door_contact', 'on') or is_state('group.my_exterior_windows', 'on') or is_state('binary_sensor.front_door_contact', 'on') %} - {% if is_state_attr('climate.thermostat', 'hvac_action', 'cooling') and states('sensor.master_bedroom_multisensor_air_temperature') | int < states('sensor.front_porch_temperature') | int %} + {% if is_state_attr('climate.thermostat', 'hvac_action', 'cooling') and states('sensor.master_bedroom_multisensor_air_temperature') | int < states('sensor.front_porch_hue_motion_sensor_temperature') | int %} {{'true'}} - {% elif is_state_attr('climate.thermostat', 'hvac_action', 'heating') and states('sensor.master_bedroom_multisensor_air_temperature') | int > states('sensor.front_porch_temperature') | int %} + {% elif is_state_attr('climate.thermostat', 'hvac_action', 'heating') and states('sensor.master_bedroom_multisensor_air_temperature') | int > states('sensor.front_porch_hue_motion_sensor_temperature') | int %} {{'true'}} {% else %} {{'false'}} @@ -297,7 +297,7 @@ template: default_entity_id: binary_sensor.temp_just_right name: Temp Just Right state: >- - {% if states('sensor.front_porch_temperature') | float(default=0) > 50 and states('sensor.front_porch_temperature') | float(default=0) < 90 %} + {% if states('sensor.front_porch_hue_motion_sensor_temperature') | float(default=0) > 50 and states('sensor.front_porch_hue_motion_sensor_temperature') | float(default=0) < 90 %} {{'true'}} {% else %} {{ 'false' }} @@ -306,17 +306,17 @@ template: - unique_id: templatebinarysensor.is_dark default_entity_id: binary_sensor.is_dark name: Is Dark - state: "{{ (states('sensor.front_porch_light_level') | int(0) < states('input_number.is_dark') | int(0)) or (states('sensor.front_porch_light_level') | int(0) < 30 and is_state('light.front_porch_overhead','on')) }}" + state: "{{ (states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < states('input_number.is_dark') | int(0)) or (states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < 30 and is_state('light.front_porch_overhead','on')) }}" - unique_id: templatebinarysensor.is_dim default_entity_id: binary_sensor.is_dim name: Is Dim - state: "{{ states('sensor.front_porch_light_level') | int(0) >= states('input_number.is_dark') | int(0) and states('sensor.front_porch_light_level') | int(0) < states('input_number.is_daylight') | int(0) }}" + state: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) >= states('input_number.is_dark') | int(0) and states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < states('input_number.is_daylight') | int(0) }}" - unique_id: templatebinarysensor.is_daylight default_entity_id: binary_sensor.is_daylight name: Is Daylight - state: "{{ states('sensor.front_porch_light_level') | int(0) >= states('input_number.is_daylight') | int(0) }}" + state: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) >= states('input_number.is_daylight') | int(0) }}" - unique_id: templatebinarysensor.garage_open_nobody_home default_entity_id: binary_sensor.garage_open_nobody_home @@ -515,7 +515,7 @@ template: - unique_id: templatebinarysensor.dining_room_light_left_on default_entity_id: binary_sensor.dining_room_light_left_on name: Dining Room Light Left On - state: "{{ is_state('light.dining_room_switch','on') and is_state('input_boolean.dining_room_occupied','off') }}" + state: "{{ is_state('light.dining_room','on') and is_state('input_boolean.dining_room_occupied','off') }}" delay_on: seconds: 30 @@ -557,14 +557,14 @@ template: - unique_id: templatebinarysensor.master_bathroom_light_left_on default_entity_id: binary_sensor.master_bathroom_light_left_on name: Master Bathroom Light Left On - state: "{{ is_state('light.master_bathroom_hue','on') and is_state('input_boolean.master_bathroom_occupied','off') }}" + state: "{{ is_state('light.master_bathroom_hue','on') and is_state('input_boolean.bathroom_occupied','off') }}" delay_on: seconds: 30 - unique_id: templatebinarysensor.master_bedroom_light_left_on default_entity_id: binary_sensor.master_bedroom_light_left_on name: Master Bedroom Light Left On - state: "{{ is_state('light.master_bedroom_hue','on') and is_state('input_boolean.master_bedroom_occupied','off') }}" + state: "{{ is_state('light.master_bedroom_hue','on') and is_state('input_boolean.bedroom_occupied','off') }}" delay_on: seconds: 30 diff --git a/components/packages/template_fans.yaml b/components/packages/template_fans.yaml index 9452097..43e8b80 100644 --- a/components/packages/template_fans.yaml +++ b/components/packages/template_fans.yaml @@ -1,27 +1,27 @@ template: -- fan: - - unique_id: template_fan.utility_room_vent - turn_on: - - action: switch.turn_on - entity_id: - - switch.utility_room_vent_switch - turn_off: - - action: switch.turn_off - entity_id: - - switch.utility_room_vent_switch - default_entity_id: fan.utility_room_vent - name: Utility Room Vent - state: "{{ states('switch.utility_room_vent_switch') }}" + - fan: + - unique_id: template_fan.utility_room_vent + turn_on: + - action: switch.turn_on + entity_id: + - switch.utility_room_vent_switch + turn_off: + - action: switch.turn_off + entity_id: + - switch.utility_room_vent_switch + default_entity_id: fan.utility_room_vent + name: Utility Room Vent + state: "{{ states('switch.utility_room_vent_switch') }}" - - unique_id: templatefan.bathroom_vent - turn_on: - - action: switch.turn_on - entity_id: - - switch.bathroom_vent_switch - turn_off: - - action: switch.turn_off - entity_id: - - switch.bathroom_vent_switch - default_entity_id: fan.bathroom_vent - name: Bathroom Vent - state: "{{ states('switch.bathroom_vent_switch') }}" + - unique_id: templatefan.bathroom_vent + turn_on: + - action: switch.turn_on + entity_id: + - switch.master_bathroom_vent_switch + turn_off: + - action: switch.turn_off + entity_id: + - switch.master_bathroom_vent_switch + default_entity_id: fan.bathroom_vent + name: Bathroom Vent + state: "{{ states('switch.master_bathroom_vent_switch') }}" diff --git a/components/packages/template_sensors.yaml b/components/packages/template_sensors.yaml index c343af5..11f8a57 100644 --- a/components/packages/template_sensors.yaml +++ b/components/packages/template_sensors.yaml @@ -213,8 +213,8 @@ template: - unique_id: temlatesensor.open_external_doors_count default_entity_id: sensor.open_external_doors_count name: Open External Doors - state: "{{ (expand('group.my_exterior_doors') | selectattr('state', 'eq', 'on')) | list | count |int(default=0) }}" - icon: "{{ iif(is_state('group.my_exterior_windows', 'on'), 'mdi:door-open','mdi:door') }}" + state: "{{ (expand('binary_sensor.exterior_doors') | selectattr('state', 'eq', 'on')) | list | count |int(default=0) }}" + icon: "{{ iif(is_state('binary_sensor.exterior_doors', 'on'), 'mdi:door-open','mdi:door') }}" - unique_id: temlatesensor.frigate_person_count default_entity_id: sensor.frigate_person_count diff --git a/components/packages/meterologisk_templates.yaml b/components/packages/weather_forecast_templates.yaml similarity index 69% rename from components/packages/meterologisk_templates.yaml rename to components/packages/weather_forecast_templates.yaml index 96fcf32..9bf8218 100644 --- a/components/packages/meterologisk_templates.yaml +++ b/components/packages/weather_forecast_templates.yaml @@ -31,20 +31,20 @@ template: data: type: daily target: - entity_id: weather.forecast_home + entity_id: weather.home response_variable: daily - action: weather.get_forecasts data: type: hourly target: - entity_id: weather.forecast_home + entity_id: weather.home response_variable: hourly binary_sensor: - name: "Impending Rain" unique_id: templatebinarysensor.impending_rain - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" icon: mdi:weather-rainy # This looks too far into the future. Cutting it down a bit state: >- @@ -53,8 +53,8 @@ template: {%- set ns = namespace() -%} {%- set ns.totalprecipitation = 0 -%} {%- for daypart in range(0, 8) -%} - {%- set precipitation = hourly['weather.forecast_home'].forecast[daypart].precipitation -%} - {%- set wind_speed = hourly['weather.forecast_home'].forecast[daypart].wind_speed -%} + {%- set precipitation = hourly['weather.home'].forecast[daypart].precipitation -%} + {%- set wind_speed = hourly['weather.home'].forecast[daypart].wind_speed -%} {% if wind_speed > states('input_number.wind_speed_blowing_rain') |float(default=0) %} {%- set upcoming_precipitation = precipitation -%} {%- endif -%} @@ -67,14 +67,14 @@ template: unique_id: "custom_sensor.sprinkler_total_expected_precipitation" icon: mdi:weather-pouring unit_of_measurement: mm - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" state: > {%- set totalprecipitation = 0 | float -%} {%- set upcoming_precipitation = 0 | float -%} {%- set ns = namespace() -%} {%- set ns.totalprecipitation = 0 -%} {%- for daypart in range(0, 5) -%} - {%- set precipitation = daily['weather.forecast_home'].forecast[daypart].precipitation * 25.4 -%} + {%- set precipitation = daily['weather.home'].forecast[daypart].precipitation * 25.4 -%} {%- set upcoming_precipitation = precipitation -%} {%- set ns.totalprecipitation = ns.totalprecipitation + upcoming_precipitation -%} {%- endfor %} @@ -83,36 +83,36 @@ template: - name: "Today's Low Temperature" unique_id: templatesensor.templow_today unit_of_measurement: °F - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - state: "{{ daily['weather.forecast_home'].forecast[0].templow }}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + state: "{{ daily['weather.home'].forecast[0].templow }}" - name: "Today's High Temperature" unique_id: templatesensor.temphigh_today unit_of_measurement: °F - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - state: "{{ daily['weather.forecast_home'].forecast[0].temperature}}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + state: "{{ daily['weather.home'].forecast[0].temperature}}" # - name: "Today's Chance of Precipitation" # unique_id: templatesensor.precip_chance_today # icon: mdi:cloud-percent # unit_of_measurement: '%' - # availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - # state: "{{ daily['weather.forecast_home'].forecast[0].precipitation_probability}}" + # availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + # state: "{{ daily['weather.home'].forecast[0].precipitation_probability}}" - name: "Tomorrow's Low Temperature" unique_id: templatesensor.templow_tomorrow unit_of_measurement: °F - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - state: "{{ daily['weather.forecast_home'].forecast[1].templow}}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + state: "{{ daily['weather.home'].forecast[1].templow}}" - name: "Tomorrow's High Temperature" unique_id: templatesensor.temphigh_tomorrow unit_of_measurement: °F - availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - state: "{{ daily['weather.forecast_home'].forecast[1].temperature}}" + availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + state: "{{ daily['weather.home'].forecast[1].temperature}}" # - name: "Tomorrow's Chance of Precipitation" # unique_id: templatesensor.precip_chance_tomorrow # icon: mdi:cloud-percent # unit_of_measurement: '%' - # availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}" - # state: "{{ daily['weather.forecast_home'].forecast[1].precipitation_probability}}" + # availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}" + # state: "{{ daily['weather.home'].forecast[1].precipitation_probability}}" diff --git a/components/packages/zwave_nodes.yaml b/components/packages/zwave_nodes.yaml index 20620b5..8e5ed77 100644 --- a/components/packages/zwave_nodes.yaml +++ b/components/packages/zwave_nodes.yaml @@ -1,7 +1,8 @@ template: - sensor: - - name: "Alive ZWave Devices" + - name: "ZWave: All Devices" unique_id: template_sensor_alive_zwave + icon: mdi:z-wave state: >- {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") | selectattr('state', 'in', 'alive') | @@ -9,14 +10,14 @@ template: - name: "Dead ZWave Devices" unique_id: template_sensor_failed_zwave + icon: mdi:z-wave state: >- - {% if states('sensor.alive_zwave_devices')|int(default=0) > 0 %} + {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") | + selectattr('state', 'in', 'alive') | map(attribute='entity_id')| list | count | int(default=0)}} + attributes: + devices: >- {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") | - selectattr('state', 'in', 'dead') | - map(attribute='entity_id')| list | count | int(default=0)}} - {% else %} - 0 - {% endif %} + selectattr('state', 'in', 'alive') | map(attribute='entity_id')| list }} automation: - id: automation_alert_failed_zwave_nodes diff --git a/customizations/entities/doors.yaml b/customizations/entities/doors.yaml deleted file mode 100644 index 0abacac..0000000 --- a/customizations/entities/doors.yaml +++ /dev/null @@ -1,8 +0,0 @@ -group.master_bedroom_doors: - icon: mdi:door - -group.master_bathroom_doors: - icon: mdi:door - -binary_sensory.patio_door_contact: - icon: mdi:door-sliding \ No newline at end of file diff --git a/customizations/entities/fansandvents.yaml b/customizations/entities/fansandvents.yaml index fe33b13..4a0ebcb 100644 --- a/customizations/entities/fansandvents.yaml +++ b/customizations/entities/fansandvents.yaml @@ -1,4 +1,4 @@ -switch.bathroom_vent_switch: +switch.master_bathroom_vent_switch: icon: mdi:fan switch.utility_room_vent_switch: diff --git a/customizations/entities/lights.yaml b/customizations/entities/lights.yaml index c2d8882..1af57a5 100644 --- a/customizations/entities/lights.yaml +++ b/customizations/entities/lights.yaml @@ -9,7 +9,7 @@ light.kitchen_hue: # light.dining_room_hue: # icon: mdi:chandelier -light.dining_room_switch: +light.dining_room: icon: mdi:chandelier light.dining_room_1: diff --git a/esphome/common/bme680.yaml b/esphome/common/bme680.yaml index 4720479..9aaf6bf 100644 --- a/esphome/common/bme680.yaml +++ b/esphome/common/bme680.yaml @@ -172,8 +172,7 @@ sensor: - platform: copy source_id: temperature - device_class: temperature - unit_of_measurement: "°F/m" + unit_of_measurement: "°F" name: "Air Temperature Change" id: air_temperature_change icon: mdi:chart-line @@ -224,8 +223,7 @@ sensor: - platform: copy source_id: humidity - device_class: humidity - unit_of_measurement: "%/m" + unit_of_measurement: "%" name: "Relative Humidity Change" id: relative_humidity_change icon: mdi:chart-line diff --git a/esphome/common/bme680_advanced.yaml b/esphome/common/bme680_advanced.yaml index fb9c5ee..1dfa00b 100644 --- a/esphome/common/bme680_advanced.yaml +++ b/esphome/common/bme680_advanced.yaml @@ -1,53 +1,53 @@ -# Example configuration entry -sensor: - - platform: bme680 - temperature: - name: "BME680 Temperature" - oversampling: 16x - pressure: - name: "BME680 Pressure" - humidity: - id: "humidity" - name: "BME680 Humidity" - gas_resistance: - id: "gas_resistance" - name: "BME680 Gas Resistance" - address: 0x77 - update_interval: 60s - - platform: template - name: "BME680 Indoor Air Quality" - id: iaq - icon: "mdi:gauge" - # calculation: comp_gas = log(R_gas[ohm]) + 0.04 log(Ohm)/%rh * hum[%rh] - lambda: |- - return log(id(gas_resistance).state) + 0.04 * id(humidity).state; - state_class: "measurement" -text_sensor: - - platform: template - name: "BME680 IAQ Classification" - icon: "mdi:checkbox-marked-circle-outline" - lambda: |- - if (int(id(iaq).state) <= 50) { - return {"Excellent"}; - } - else if (int(id(iaq).state) <= 100) { - return {"Good"}; - } - else if (int(id(iaq).state) <= 150) { - return {"Lightly polluted"}; - } - else if (int(id(iaq).state) <= 200) { - return {"Moderately polluted"}; - } - else if (int(id(iaq).state) <= 250) { - return {"Heavily polluted"}; - } - else if (int(id(iaq).state) <= 350) { - return {"Severely polluted"}; - } - else if (int(id(iaq).state) <= 500) { - return {"Extremely polluted"}; - } - else { - return {"unknown"}; +# Example configuration entry +sensor: + - platform: bme680 + temperature: + name: "BME680 Temperature" + oversampling: 16x + pressure: + name: "BME680 Pressure" + humidity: + id: "humidity" + name: "BME680 Humidity" + gas_resistance: + id: "gas_resistance" + name: "BME680 Gas Resistance" + address: 0x77 + update_interval: 60s + - platform: template + name: "BME680 Indoor Air Quality" + id: iaq + icon: "mdi:gauge" + # calculation: comp_gas = log(R_gas[ohm]) + 0.04 log(Ohm)/%rh * hum[%rh] + lambda: |- + return log(id(gas_resistance).state) + 0.04 * id(humidity).state; + state_class: "measurement" +text_sensor: + - platform: template + name: "BME680 IAQ Classification" + icon: "mdi:checkbox-marked-circle-outline" + lambda: |- + if (int(id(iaq).state) <= 50) { + return {"Excellent"}; + } + else if (int(id(iaq).state) <= 100) { + return {"Good"}; + } + else if (int(id(iaq).state) <= 150) { + return {"Lightly polluted"}; + } + else if (int(id(iaq).state) <= 200) { + return {"Moderately polluted"}; + } + else if (int(id(iaq).state) <= 250) { + return {"Heavily polluted"}; + } + else if (int(id(iaq).state) <= 350) { + return {"Severely polluted"}; + } + else if (int(id(iaq).state) <= 500) { + return {"Extremely polluted"}; + } + else { + return {"unknown"}; } \ No newline at end of file diff --git a/esphome/common/bme680_bsec.yaml b/esphome/common/bme680_bsec.yaml index 12e3f23..c4034ad 100644 --- a/esphome/common/bme680_bsec.yaml +++ b/esphome/common/bme680_bsec.yaml @@ -1,106 +1,106 @@ -bme680_bsec: - # id - # ----------- - # Identifier for this component, useful when working with multiple devices. - # Must be unique, and can be used in the sensor sections to refer to the correct device. - # Default: auto-computed - id: bme680_internal - - # i2c address - # ----------- - # Common values are: - # - 0x76 - # - 0x77 - # Default: 0x76 - address: 0x76 - - # Temperature offset - # ------------------ - # Useful if device is in enclosure and reads too high - # For example, if it reads 5C too high, set this to 5 - # This also corrects the relative humidity readings - # Default: 0 - temperature_offset: 0 - - # IAQ calculation mode - # -------------------- - # Available options: - # - static (for fixed position devices) - # - mobile (for on a person or other moveable devices) - # Default: static - iaq_mode: static - - # Supply voltage - # -------------------- - # Available options: - # - 3.3V - # - 1.8V - # Default: 3.3V - supply_voltage: 3.3V - - # Sample rate - # ----------- - # Available options: - # - lp (low power - samples every 3 seconds) - # - ulp (ultra-low power - samples every 5 minutes) - # Default: lp - sample_rate: ulp - - # Interval at which to save BSEC state - # ------------------------------------ - # Default: 6h - state_save_interval: 6h - -sensor: - - platform: bme680_bsec - # ID of the bme680_bsec component to use for the next sensors. - # Useful when working with multiple devices - bme680_bsec_id: bme680_internal - - temperature: - # Temperature in °C - name: "BME680 Temperature" - sample_rate: lp - filters: - - median - pressure: - # Pressure in hPa - name: "BME680 Pressure" - sample_rate: lp - filters: - - median - humidity: - # Relative humidity % - name: "BME680 Humidity" - sample_rate: lp - filters: - - median - gas_resistance: - # Gas resistance in Ω - name: "BME680 Gas Resistance" - filters: - - median - iaq: - # Indoor air quality value - name: "BME680 IAQ" - filters: - - median - iaq_accuracy: - # IAQ accuracy as a numeric value of 0, 1, 2, 3 - name: "BME680 Numeric IAQ Accuracy" - co2_equivalent: - # CO2 equivalent estimate in ppm - name: "BME680 CO2 Equivalent" - filters: - - median - breath_voc_equivalent: - # Volatile organic compounds equivalent estimate in ppm - name: "BME680 Breath VOC Equivalent" - filters: - - median - -text_sensor: - - platform: bme680_bsec - iaq_accuracy: - # IAQ accuracy as a text value of Stabilizing, Uncertain, Calibrating, Calibrated +bme680_bsec: + # id + # ----------- + # Identifier for this component, useful when working with multiple devices. + # Must be unique, and can be used in the sensor sections to refer to the correct device. + # Default: auto-computed + id: bme680_internal + + # i2c address + # ----------- + # Common values are: + # - 0x76 + # - 0x77 + # Default: 0x76 + address: 0x76 + + # Temperature offset + # ------------------ + # Useful if device is in enclosure and reads too high + # For example, if it reads 5C too high, set this to 5 + # This also corrects the relative humidity readings + # Default: 0 + temperature_offset: 0 + + # IAQ calculation mode + # -------------------- + # Available options: + # - static (for fixed position devices) + # - mobile (for on a person or other moveable devices) + # Default: static + iaq_mode: static + + # Supply voltage + # -------------------- + # Available options: + # - 3.3V + # - 1.8V + # Default: 3.3V + supply_voltage: 3.3V + + # Sample rate + # ----------- + # Available options: + # - lp (low power - samples every 3 seconds) + # - ulp (ultra-low power - samples every 5 minutes) + # Default: lp + sample_rate: ulp + + # Interval at which to save BSEC state + # ------------------------------------ + # Default: 6h + state_save_interval: 6h + +sensor: + - platform: bme680_bsec + # ID of the bme680_bsec component to use for the next sensors. + # Useful when working with multiple devices + bme680_bsec_id: bme680_internal + + temperature: + # Temperature in °C + name: "BME680 Temperature" + sample_rate: lp + filters: + - median + pressure: + # Pressure in hPa + name: "BME680 Pressure" + sample_rate: lp + filters: + - median + humidity: + # Relative humidity % + name: "BME680 Humidity" + sample_rate: lp + filters: + - median + gas_resistance: + # Gas resistance in Ω + name: "BME680 Gas Resistance" + filters: + - median + iaq: + # Indoor air quality value + name: "BME680 IAQ" + filters: + - median + iaq_accuracy: + # IAQ accuracy as a numeric value of 0, 1, 2, 3 + name: "BME680 Numeric IAQ Accuracy" + co2_equivalent: + # CO2 equivalent estimate in ppm + name: "BME680 CO2 Equivalent" + filters: + - median + breath_voc_equivalent: + # Volatile organic compounds equivalent estimate in ppm + name: "BME680 Breath VOC Equivalent" + filters: + - median + +text_sensor: + - platform: bme680_bsec + iaq_accuracy: + # IAQ accuracy as a text value of Stabilizing, Uncertain, Calibrating, Calibrated name: "BME680 IAQ Accuracy" \ No newline at end of file diff --git a/esphome/common/bme680_multiple.yaml b/esphome/common/bme680_multiple.yaml index df2bce7..eecd8a5 100644 --- a/esphome/common/bme680_multiple.yaml +++ b/esphome/common/bme680_multiple.yaml @@ -1,61 +1,61 @@ -# I2C bus for the BME680 devices -i2c: - - id: "i2cbus_bme" - sda: GPIO18 - scl: GPIO19 - scan: true - -# BME680 devices using BSEC library -bme680_bsec: - - id: bme680_internal - i2c_id: "i2cbus_bme" - address: 0x76 - - id: bme680_external - i2c_id: "i2cbus_bme" - address: 0x77 - -sensor: - # Sensors for the internal BME680 device - - platform: bme680_bsec - bme680_bsec_id: bme680_internal - temperature: - name: "IN_Temp" - pressure: - name: "IN_Press" - humidity: - name: "IN_RH" - iaq: - name: "IN_IAQ" - co2_equivalent: - name: "IN_CO2eq" - breath_voc_equivalent: - name: "IN_VOCeq" - - # Sensors for the external BME680 device - - platform: bme680_bsec - bme680_bsec_id: bme680_external - temperature: - name: "OUT_Temperatura" - pressure: - name: "OUT_Pressione" - humidity: - name: "OUT_RH" - iaq: - name: "OUT_IAQ" - co2_equivalent: - name: "OUT_CO2eq" - breath_voc_equivalent: - name: "OUT_VOCeq" - -text_sensor: - # Text sensor for the internal BME680 device - - platform: bme680_bsec - bme680_bsec_id: bme680_internal - iaq_accuracy: - name: "IN_IAQaccuracy" - - # Text sensor for the external BME680 device - - platform: bme680_bsec - bme680_bsec_id: bme680_external - iaq_accuracy: +# I2C bus for the BME680 devices +i2c: + - id: "i2cbus_bme" + sda: GPIO18 + scl: GPIO19 + scan: true + +# BME680 devices using BSEC library +bme680_bsec: + - id: bme680_internal + i2c_id: "i2cbus_bme" + address: 0x76 + - id: bme680_external + i2c_id: "i2cbus_bme" + address: 0x77 + +sensor: + # Sensors for the internal BME680 device + - platform: bme680_bsec + bme680_bsec_id: bme680_internal + temperature: + name: "IN_Temp" + pressure: + name: "IN_Press" + humidity: + name: "IN_RH" + iaq: + name: "IN_IAQ" + co2_equivalent: + name: "IN_CO2eq" + breath_voc_equivalent: + name: "IN_VOCeq" + + # Sensors for the external BME680 device + - platform: bme680_bsec + bme680_bsec_id: bme680_external + temperature: + name: "OUT_Temperatura" + pressure: + name: "OUT_Pressione" + humidity: + name: "OUT_RH" + iaq: + name: "OUT_IAQ" + co2_equivalent: + name: "OUT_CO2eq" + breath_voc_equivalent: + name: "OUT_VOCeq" + +text_sensor: + # Text sensor for the internal BME680 device + - platform: bme680_bsec + bme680_bsec_id: bme680_internal + iaq_accuracy: + name: "IN_IAQaccuracy" + + # Text sensor for the external BME680 device + - platform: bme680_bsec + bme680_bsec_id: bme680_external + iaq_accuracy: name: "OUT_IAQaccuracy" \ No newline at end of file diff --git a/esphome/nursery-tagreader.yaml b/esphome/nursery-tagreader.yaml index b450f19..8207aeb 100644 --- a/esphome/nursery-tagreader.yaml +++ b/esphome/nursery-tagreader.yaml @@ -1,11 +1,11 @@ substitutions: - devicename: girls_room-tagreader + devicename: nursery-tagreader entity_name: nursery_tagreader friendly_name: Nursery Tagreader comment: Clever Tag Reader platform: ESP8266 board: d1_mini - static_ip: !secret girls_room-tagreader-ip + static_ip: !secret nursery-tagreader-ip packages: wifi: !include common/wifi.yaml diff --git a/groups.yaml b/groups.yaml index 63d0f51..b6a898a 100644 --- a/groups.yaml +++ b/groups.yaml @@ -23,97 +23,97 @@ my_room_status: - input_boolean.dining_room_occupied - input_boolean.great_room_occupied - input_boolean.utility_room_occupied - - input_boolean.master_bedroom_occupied + - input_boolean.bedroom_occupied - input_boolean.girls_room_occupied - - input_boolean.master_bathroom_occupied + - input_boolean.bathroom_occupied - input_boolean.boys_room_occupied - input_boolean.mancave_occupied - input_boolean.computer_area_occupied - input_boolean.entryway_occupied - input_boolean.garage_occupied -mancave_motion: - name: Mancave Motion - icon: mdi:motion-sensor - entities: - - binary_sensor.mancave_motion_switch_home_security_motion_detection +# mancave_motion: +# name: Mancave Motion +# icon: mdi:motion-sensor +# entities: +# - binary_sensor.mancave_motion_switch_motion_detection -furnace_room_motion: - name: Furnace Room Motion - icon: mdi:motion-sensor - entities: - - binary_sensor.furnace_room_motion_switch_home_security_motion_detection +# furnace_room_motion: +# name: Furnace Room Motion +# icon: mdi:motion-sensor +# entities: +# - binary_sensor.furnace_room_motion_switch_motion_detection -boys_room_motion: - name: Boys Room Motion - icon: mdi:motion-sensor - entities: - - binary_sensor.boys_room_motion_switch_motion_detection - - binary_sensor.boys_room_multisensor_motion_detection +# boys_room_motion: +# name: Boys Room Motion +# icon: mdi:motion-sensor +# entities: +# - binary_sensor.boys_room_motion_switch_motion_detection +# - binary_sensor.boys_room_multisensor_motion_detection -front_room_motion: - name: Front Room Motion - icon: mdi:motion-sensor - entities: - - binary_sensor.front_room_motion_switch_home_security_motion_detection - - binary_sensor.front_room_motion_sensor_home_security_motion_detection - - binary_sensor.front_room_motion +# front_room_motion: +# name: Front Room Motion +# icon: mdi:motion-sensor +# entities: +# - binary_sensor.front_room_motion_switch_motion_detection +# - binary_sensor.front_room_motion_sensor_motion_detection +# - binary_sensor.front_room_motion -dining_room_motion: - name: Dining Room Motion - icon: mdi:motion-sensor - entities: - - binary_sensor.dining_room_motion_switch_home_security_motion_detection - - binary_sensor.dining_room_multisensor_motion_detection - - binary_sensor.bar_motion +# dining_room_motion: +# name: Dining Room Motion +# icon: mdi:motion-sensor +# entities: +# - binary_sensor.dining_room_motion_switch_motion_detection +# - binary_sensor.dining_room_multisensor_motion_detection +# - binary_sensor.bar_motion -master_bedroom_doors: - name: Master Bedroom Doors - icon: hass:door - entities: - - binary_sensor.master_bedroom_closet_door_contact - - binary_sensor.master_bedroom_door_contact - - binary_sensor.master_suite_door_contact +# master_bedroom_doors: +# name: Master Bedroom Doors +# icon: hass:door +# entities: +# - binary_sensor.master_bedroom_closet_door_contact +# - binary_sensor.master_bedroom_door_contact +# - binary_sensor.master_suite_door_contact -master_bathroom_doors: - icon: hass:door - name: Master Bathroom Doors - entities: - - binary_sensor.master_suite_door_contact - - binary_sensor.master_bathroom_door_contact +# master_bathroom_doors: +# icon: hass:door +# name: Master Bathroom Doors +# entities: +# - binary_sensor.master_suite_door_contact +# - binary_sensor.master_bathroom_door_contact -master_bathroom_motion: - icon: mdi:motion-sensor - name: Master Bathroom Motion - entities: - - binary_sensor.master_bathroom_motion_switch_home_security_motion_detection +# master_bathroom_motion: +# icon: mdi:motion-sensor +# name: Master Bathroom Motion +# entities: +# - binary_sensor.master_bathroom_motion_switch_motion_detection -computer_area_motion: - icon: mdi:motion-sensor - name: Computer Area Motion - entities: - - binary_sensor.computer_area_multisensor_home_security_motion_detection - - binary_sensor.great_room_motion_switch_home_security_motion_detection - - binary_sensor.everything_presence_lite_8fa4fc_occupancy +# computer_area_motion: +# icon: mdi:motion-sensor +# name: Computer Area Motion +# entities: +# - binary_sensor.computer_area_multisensor_motion_detection +# - binary_sensor.great_room_motion_switch_motion_detection +# - binary_sensor.everything_presence_lite_8fa4fc_occupancy -utility_room_motion: - icon: mdi:motion-sensor - name: Utility Room Motion - entities: - - binary_sensor.utility_room_motion_switch_home_security_motion_detection +# utility_room_motion: +# icon: mdi:motion-sensor +# name: Utility Room Motion +# entities: +# - binary_sensor.utility_room_motion_switch_motion_detection -kitchen_motion: - icon: mdi:motion-sensor - name: Kitchen Motion - entities: - - binary_sensor.kitchen_multisensor_home_security_motion_detection +# kitchen_motion: +# icon: mdi:motion-sensor +# name: Kitchen Motion +# entities: +# - binary_sensor.kitchen_multisensor_motion_detection -great_room_motion: - icon: mdi:motion-sensor - name: Great Room Motion - entities: - - binary_sensor.great_room_multisensor_home_security_motion_detection - - binary_sensor.everything_presence_lite_8fa4fc_occupancy +# great_room_motion: +# icon: mdi:motion-sensor +# name: Great Room Motion +# entities: +# - binary_sensor.great_room_multisensor_motion_detection +# - binary_sensor.everything_presence_lite_8fa4fc_occupancy # girls_room_doors: # icon: hass:door @@ -126,56 +126,56 @@ great_room_motion: # icon: mdi:motion-sensor # name: Girls Room Motion # entities: -# - binary_sensor.girls_room_multisensor_home_security_motion_detection # The Aeotech -# - binary_sensor.girls_room_closet_motion_switch_home_security_motion_detection +# - binary_sensor.girls_room_multisensor_motion_detection # The Aeotech +# - binary_sensor.girls_room_closet_motion_switch_motion_detection -master_bedroom_motion: - icon: mdi:motion-sensor - name: Master Bedroom Motion - entities: - - binary_sensor.master_bedroom_multisensor_home_security_motion_detection - - binary_sensor.master_bedroom_closet_motion_switch_home_security_motion_detection +# master_bedroom_motion: +# icon: mdi:motion-sensor +# name: Master Bedroom Motion +# entities: +# - binary_sensor.master_bedroom_multisensor_motion_detection +# - binary_sensor.master_bedroom_closet_motion_switch_motion_detection -entryway_motion: - icon: mdi:motion-sensor - name: Entryway Motion - entities: - - binary_sensor.entryway_motion_switch_home_security_motion_detection - - binary_sensor.great_room_motion_switch_home_security_motion_detection - - binary_sensor.entryway_motion +# entryway_motion: +# icon: mdi:motion-sensor +# name: Entryway Motion +# entities: +# - binary_sensor.entryway_motion_switch_motion_detection +# - binary_sensor.great_room_motion_switch_motion_detection +# - binary_sensor.entryway_motion -garage_motion: - icon: mdi:motion-sensor - name: Garage Motion - entities: - - binary_sensor.garage_motion_switch_home_security_motion_detection - - binary_sensor.garage_multisensor_home_security_motion_detection +# garage_motion: +# icon: mdi:motion-sensor +# name: Garage Motion +# entities: +# - binary_sensor.garage_motion_switch_motion_detection +# - binary_sensor.garage_multisensor_motion_detection -workshop_motion: - icon: mdi:motion-sensor - name: Workshop Motion - entities: - - binary_sensor.workshop_person_occupancy - - binary_sensor.garage_multisensor_home_security_motion_detection +# workshop_motion: +# icon: mdi:motion-sensor +# name: Workshop Motion +# entities: +# - binary_sensor.workshop_person_occupancy +# - binary_sensor.garage_multisensor_motion_detection -front_porch_motion: - icon: mdi:motion-sensor - name: Front Porch Motion - entities: - - binary_sensor.front_porch_motion +# front_porch_motion: +# icon: mdi:motion-sensor +# name: Front Porch Motion +# entities: +# - binary_sensor.front_porch_motion -back_yard_motion: - icon: mdi:motion-sensor - name: Back Yard Motion - entities: - - binary_sensor.frigate_cam14_person_occupancy +# back_yard_motion: +# icon: mdi:motion-sensor +# name: Back Yard Motion +# entities: +# - binary_sensor.frigate_cam14_person_occupancy -front_yard_motion: - icon: mdi:motion-sensor - name: Front Yard Motion - entities: - - binary_sensor.frigate_cam19_person_occupancy - - binary_sensor.front_porch_motion +# front_yard_motion: +# icon: mdi:motion-sensor +# name: Front Yard Motion +# entities: +# - binary_sensor.frigate_cam19_person_occupancy +# - binary_sensor.front_porch_motion person_clint: name: Clint @@ -235,17 +235,17 @@ person_household: - input_boolean.ebin_home - input_boolean.guest_home -my_exterior_doors: - name: My Exterior Doors - icon: hass:door - entities: - - binary_sensor.front_door_contact - - binary_sensor.garage_door - # - binary_sensor.outer_garage_door - - binary_sensor.outer_garage_door_contact - - binary_sensor.patio_door_contact - # - binary_sensor.inner_garage_door - - binary_sensor.inner_garage_door_contact +# my_exterior_doors: +# name: My Exterior Doors +# icon: hass:door +# entities: +# - binary_sensor.front_door_contact +# - binary_sensor.garage_door +# # - binary_sensor.outer_garage_door +# - binary_sensor.outer_garage_door_contact +# - binary_sensor.patio_door_contact +# # - binary_sensor.inner_garage_door +# - binary_sensor.inner_garage_door_contact my_hvac_affecting_openings: name: My HVAC Affecting Openings @@ -261,15 +261,15 @@ my_hvac_affecting_openings: - binary_sensor.boys_room_window_contact - binary_sensor.entryway_window_contact -my_garage_doors: - name: My Garage Doors - icon: hass:door - entities: - - binary_sensor.garage_door - # - binary_sensor.outer_garage_door - - binary_sensor.outer_garage_door_contact - # - binary_sensor.inner_garage_door - - binary_sensor.inner_garage_door_contact +# my_garage_doors: +# name: My Garage Doors +# icon: hass:door +# entities: +# - binary_sensor.garage_door +# # - binary_sensor.outer_garage_door +# - binary_sensor.outer_garage_door_contact +# # - binary_sensor.inner_garage_door +# - binary_sensor.inner_garage_door_contact my_exterior_windows: name: My Exterior Windows @@ -291,7 +291,7 @@ my_lights: - light.computer_area_hue - light.great_room_hue # - light.dining_room_hue - - light.dining_room_switch + - light.dining_room - light.entryway_hue - light.front_room_hue - light.kitchen_hue diff --git a/lovelace/cameras/view-camera-01.yaml b/lovelace/cameras/view-camera-01.yaml index a0dbe94..65e193a 100644 --- a/lovelace/cameras/view-camera-01.yaml +++ b/lovelace/cameras/view-camera-01.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam01_sub_opus + stream: cam01_sub icon: mdi:earth title: Boys Room id: boys_room @@ -72,7 +72,7 @@ card: opacity: 0% - type: state-icon - entity: group.boys_room_motion + entity: binary_sensor.boys_room_motion style: left: 8% top: 95% @@ -184,4 +184,4 @@ card: entity: light.accent style: left: 6% - top: 49% \ No newline at end of file + top: 49% diff --git a/lovelace/cameras/view-camera-03.yaml b/lovelace/cameras/view-camera-03.yaml index 5bdd406..4cd2f1b 100644 --- a/lovelace/cameras/view-camera-03.yaml +++ b/lovelace/cameras/view-camera-03.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam03_sub_opus + stream: cam03_sub icon: mdi:desktop-classic title: Computer Area id: computer_area @@ -45,7 +45,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -71,7 +71,7 @@ card: height: 100% opacity: 0% - type: state-icon - entity: group.computer_area_motion + entity: binary_sensor.computer_area_motion style: left: 8% top: 95% diff --git a/lovelace/cameras/view-camera-04.yaml b/lovelace/cameras/view-camera-04.yaml index b7e65ed..f607a6b 100644 --- a/lovelace/cameras/view-camera-04.yaml +++ b/lovelace/cameras/view-camera-04.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam04_sub_opus + stream: cam04_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -69,7 +69,7 @@ card: opacity: 0% - type: state-icon - entity: group.garage_motion + entity: binary_sensor.garage_motion style: left: 8% top: 95% diff --git a/lovelace/cameras/view-camera-06.yaml b/lovelace/cameras/view-camera-06.yaml index a724fe5..2d7b6ba 100644 --- a/lovelace/cameras/view-camera-06.yaml +++ b/lovelace/cameras/view-camera-06.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam06_sub_opus + stream: cam06_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -69,7 +69,7 @@ card: opacity: 0% - type: state-icon - entity: group.master_bedroom_motion + entity: binary_sensor.bedroom_motion style: left: 8% top: 95% @@ -79,14 +79,14 @@ card: left: 50% top: 95% - type: state-icon - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied tap_action: action: toggle style: left: 70% top: 95% - type: state-icon - entity: binary_sensor.master_bedroom_occupied + entity: binary_sensor.bedroom_occupied style: top: 95% left: 92% diff --git a/lovelace/cameras/view-camera-07.yaml b/lovelace/cameras/view-camera-07.yaml index 69fd4da..fd5958f 100644 --- a/lovelace/cameras/view-camera-07.yaml +++ b/lovelace/cameras/view-camera-07.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam07_sub_opus + stream: cam07_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -69,7 +69,7 @@ card: opacity: 0% - type: state-icon - entity: group.master_bedroom_motion + entity: binary_sensor.bedroom_motion style: left: 8% top: 95% @@ -79,14 +79,14 @@ card: left: 50% top: 95% - type: state-icon - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied tap_action: action: toggle style: left: 70% top: 95% - type: state-icon - entity: binary_sensor.master_bedroom_occupied + entity: binary_sensor.bedroom_occupied style: top: 95% left: 92% diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml index 7f7f0e8..866a70c 100644 --- a/lovelace/cameras/view-camera-08.yaml +++ b/lovelace/cameras/view-camera-08.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam08_sub_opus + stream: cam08_sub live: preload: true draggable: true diff --git a/lovelace/cameras/view-camera-12.yaml b/lovelace/cameras/view-camera-12.yaml index 62bd7e4..ba20ca8 100644 --- a/lovelace/cameras/view-camera-12.yaml +++ b/lovelace/cameras/view-camera-12.yaml @@ -11,26 +11,38 @@ card: dimensions: layout: fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam12 live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam12_sub_opus - cast: - method: dashboard - dashboard: - dashboard_path: camera-casting-yml - view_path: kitchen-camera + stream: cam12_sub live: preload: true draggable: true show_image_during_load: false lazy_load: false + controls: + title: + mode: none + timeline: + mode: none + thumbnails: + mode: none + menu: + buttons: + frigate: + enabled: false + style: none + media_viewer: + draggable: false + lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -57,7 +69,7 @@ card: opacity: 0% - type: state-icon - entity: group.kitchen_motion + entity: binary_sensor.kitchen_motion style: left: 8% top: 95% diff --git a/lovelace/cameras/view-camera-13.yaml b/lovelace/cameras/view-camera-13.yaml index 22089ca..a487cb6 100644 --- a/lovelace/cameras/view-camera-13.yaml +++ b/lovelace/cameras/view-camera-13.yaml @@ -1,8 +1,8 @@ type: conditional conditions: - condition: state - entity: sensor.frigate_cam13_camera_fps - state_not: "0" + entity: sensor.frigate_cam12_camera_fps + state_not: "500" card: type: vertical-stack cards: @@ -14,12 +14,12 @@ card: status_bar: style: none cameras: - - camera_entity: camera.frigate_cam13 + - camera_entity: camera.frigate_cam12 live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam13_sub_opus + stream: cam13_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -53,23 +53,23 @@ card: width: 100% height: 10% opacity: 70% - - type: image - entity: camera.frigate_cam13 - image: /local/title-dark-double.png - aspect_ratio: 100% - tap_action: - action: navigate - navigation_path: /ai-yml/ai-cam13 - style: - transform: initial - top: 0px - left: 0px - width: 100% - height: 100% - opacity: 0% + # - type: image + # entity: camera.frigate_cam13 + # image: /local/title-dark-double.png + # aspect_ratio: 100% + # tap_action: + # action: navigate + # navigation_path: /ai-yml/ai-cam13 + # style: + # transform: initial + # top: 0px + # left: 0px + # width: 100% + # height: 100% + # opacity: 0% - type: state-icon - entity: group.front_room_motion + entity: binary_sensor.front_room_motion style: left: 8% top: 95% diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index 8c140f6..5be33ee 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -1,8 +1,8 @@ type: conditional conditions: - condition: state - entity: sensor.frigate_cam14_camera_fps - state_not: "0" + entity: sensor.frigate_cam12_camera_fps + state_not: "500" card: type: vertical-stack cards: @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam14_sub_opus + stream: cam14_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -69,7 +69,7 @@ card: opacity: 0% - type: state-icon - entity: group.back_yard_motion + entity: binary_sensor.back_yard_motion style: left: 8% top: 95% @@ -86,13 +86,13 @@ card: top: 95% left: 92% - - type: conditional - conditions: - - entity: binary_sensor.back_yard_person_occupancy - state: "on" - elements: - - type: state-icon - entity: binary_sensor.back_yard_person_occupancy - style: - top: 45% - left: 45% + # - type: conditional + # conditions: + # - entity: binary_sensor.back_yard_person_occupancy + # state: "on" + # elements: + # - type: state-icon + # entity: binary_sensor.back_yard_person_occupancy + # style: + # top: 45% + # left: 45% diff --git a/lovelace/cameras/view-camera-18.yaml b/lovelace/cameras/view-camera-18.yaml index 14914f7..5b44b81 100644 --- a/lovelace/cameras/view-camera-18.yaml +++ b/lovelace/cameras/view-camera-18.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam18_sub_opus + stream: cam18_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -183,4 +183,4 @@ card: top: 80% left: 98% tap_action: - action: toggle \ No newline at end of file + action: toggle diff --git a/lovelace/cameras/view-camera-19.yaml b/lovelace/cameras/view-camera-19.yaml index d62714e..63c5ef1 100644 --- a/lovelace/cameras/view-camera-19.yaml +++ b/lovelace/cameras/view-camera-19.yaml @@ -19,7 +19,7 @@ card: go2rtc: modes: - webrtc - stream: cam19_sub_opus + stream: cam19_sub live: preload: true draggable: true @@ -42,7 +42,7 @@ card: lazy_load: false dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' + aspect_ratio: "16:9" elements: - type: image image: /local/title-dark-double.png @@ -91,7 +91,6 @@ card: top: 95% left: 92% - - type: conditional conditions: - entity: binary_sensor.driveway_vehicle_occupancy @@ -175,4 +174,4 @@ card: top: 3% left: 50% tap_action: - action: toggle \ No newline at end of file + action: toggle diff --git a/lovelace/cameras/view-camera-mbr.yaml b/lovelace/cameras/view-camera-mbr.yaml index 8d47333..6f80f95 100644 --- a/lovelace/cameras/view-camera-mbr.yaml +++ b/lovelace/cameras/view-camera-mbr.yaml @@ -28,7 +28,7 @@ card: disable_except: - live go2rtc: - stream: cam06_sub_opus + stream: cam06_sub modes: - webrtc title: MBR Left @@ -46,7 +46,7 @@ card: disable_except: - live go2rtc: - stream: cam07_sub_opus + stream: cam07_sub modes: - webrtc title: MBR Right @@ -88,5 +88,4 @@ card: mode: single dimensions: aspect_ratio_mode: static - aspect_ratio: '16:9' - + aspect_ratio: "16:9" diff --git a/lovelace/stretch-cameras/back-yard-card.yaml b/lovelace/casting-cams/back-yard-card.yaml similarity index 97% rename from lovelace/stretch-cameras/back-yard-card.yaml rename to lovelace/casting-cams/back-yard-card.yaml index bc7ac27..470fa9b 100644 --- a/lovelace/stretch-cameras/back-yard-card.yaml +++ b/lovelace/casting-cams/back-yard-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam14_sub_opus + stream: cam14_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/casting-cams/back-yard-view.yaml b/lovelace/casting-cams/back-yard-view.yaml new file mode 100644 index 0000000..398f8c7 --- /dev/null +++ b/lovelace/casting-cams/back-yard-view.yaml @@ -0,0 +1,8 @@ +title: Birds Eye View +path: birds-eve-view +icon: mdi:bird +type: panel +cards: + - type: horizontal-stack + cards: + - !include /config/lovelace/casting-cams/birds-eye-card.yaml diff --git a/lovelace/stretch-cameras/computer-area-card.yaml b/lovelace/casting-cams/birds-eye-card.yaml similarity index 92% rename from lovelace/stretch-cameras/computer-area-card.yaml rename to lovelace/casting-cams/birds-eye-card.yaml index 8d536ef..7681c6a 100644 --- a/lovelace/stretch-cameras/computer-area-card.yaml +++ b/lovelace/casting-cams/birds-eye-card.yaml @@ -14,15 +14,15 @@ cards: enabled: false style: none cameras: - - camera_entity: camera.frigate_cam03 + - camera_entity: camera.birdseye live_provider: go2rtc - id: frigate-cam03 + id: birdseye capabilities: disable: [] disable_except: - live go2rtc: - stream: cam03_sub_opus + stream: birdseye modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/casting-cams/birds-eye-view.yaml b/lovelace/casting-cams/birds-eye-view.yaml new file mode 100644 index 0000000..b156f61 --- /dev/null +++ b/lovelace/casting-cams/birds-eye-view.yaml @@ -0,0 +1,6 @@ +title: Front Porch Camera +path: front-porch-camera +icon: mdi:doorbell +type: panel +cards: + - !include /config/lovelace/casting-cams/front-porch-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/boys-room-card.yaml b/lovelace/casting-cams/boys-room-card.yaml similarity index 95% rename from lovelace/stretch-cameras/boys-room-card.yaml rename to lovelace/casting-cams/boys-room-card.yaml index 23fe719..db284a7 100644 --- a/lovelace/stretch-cameras/boys-room-card.yaml +++ b/lovelace/casting-cams/boys-room-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam01_sub_opus + stream: cam01_sub modes: - webrtc always_error_if_entity_unavailable: false @@ -62,4 +62,4 @@ cards: mode: single dimensions: aspect_ratio_mode: static - aspect_ratio: '16:10' \ No newline at end of file + aspect_ratio: "16:10" diff --git a/lovelace/stretch-cameras/boys-room-view.yaml b/lovelace/casting-cams/boys-room-view.yaml similarity index 55% rename from lovelace/stretch-cameras/boys-room-view.yaml rename to lovelace/casting-cams/boys-room-view.yaml index f138224..ae6a505 100644 --- a/lovelace/stretch-cameras/boys-room-view.yaml +++ b/lovelace/casting-cams/boys-room-view.yaml @@ -3,4 +3,4 @@ path: boys-room-camera icon: mdi:earth type: panel cards: - - !include /config/lovelace/stretch-cameras/boys-room-card.yaml + - !include /config/lovelace/casting-cams/boys-room-card.yaml diff --git a/lovelace/casting-cams/computer-area-card.yaml b/lovelace/casting-cams/computer-area-card.yaml new file mode 100644 index 0000000..780f813 --- /dev/null +++ b/lovelace/casting-cams/computer-area-card.yaml @@ -0,0 +1,22 @@ +type: vertical-stack +cards: + - type: custom:advanced-camera-card + cameras: + - live_provider: go2rtc + go2rtc: + url: https://cams.clintweaver.com + stream: cam03_sub + modes: + - webrtc + camera_entity: camera.frigate_cam03 + cast: {} + profiles: + - casting + menu: + style: overlay + buttons: + media_player: + enabled: true + mute: + enabled: false + diff --git a/lovelace/stretch-cameras/computer-area-view.yaml b/lovelace/casting-cams/computer-area-view.yaml similarity index 59% rename from lovelace/stretch-cameras/computer-area-view.yaml rename to lovelace/casting-cams/computer-area-view.yaml index 93b1ac6..a2afc5c 100644 --- a/lovelace/stretch-cameras/computer-area-view.yaml +++ b/lovelace/casting-cams/computer-area-view.yaml @@ -3,4 +3,4 @@ path: computer-area-camera icon: mdi:desktop-classic type: panel cards: - - !include /config/lovelace/stretch-cameras/computer-area-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/computer-area-card.yaml \ No newline at end of file diff --git a/lovelace/casting-cams/dual-camera-view.yaml b/lovelace/casting-cams/dual-camera-view.yaml new file mode 100644 index 0000000..053a6ce --- /dev/null +++ b/lovelace/casting-cams/dual-camera-view.yaml @@ -0,0 +1,12 @@ +title: Dual Cameras +path: dual-cameras +icon: mdi:home-switch +#panel: true +type: panel +cards: + - type: horizontal-stack + cards: + - !include /config/lovelace/casting-cams/indoor-camera-cycler.yaml + - !include /config/lovelace/casting-cams/outdoor-camera-cycler.yaml + # - !include /config/lovelace/casting-cams/indoor-camera-view.yaml + # - !include /config/lovelace/casting-cams/outdoor-camera-view.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/front-porch-card.yaml b/lovelace/casting-cams/front-porch-card.yaml similarity index 97% rename from lovelace/stretch-cameras/front-porch-card.yaml rename to lovelace/casting-cams/front-porch-card.yaml index 30f0df7..c1e7899 100644 --- a/lovelace/stretch-cameras/front-porch-card.yaml +++ b/lovelace/casting-cams/front-porch-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam19_sub_opus + stream: cam19_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/front-porch-view.yaml b/lovelace/casting-cams/front-porch-view.yaml similarity index 57% rename from lovelace/stretch-cameras/front-porch-view.yaml rename to lovelace/casting-cams/front-porch-view.yaml index 55e8be6..b156f61 100644 --- a/lovelace/stretch-cameras/front-porch-view.yaml +++ b/lovelace/casting-cams/front-porch-view.yaml @@ -3,4 +3,4 @@ path: front-porch-camera icon: mdi:doorbell type: panel cards: - - !include /config/lovelace/stretch-cameras/front-porch-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/front-porch-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/front-room-card.yaml b/lovelace/casting-cams/front-room-card.yaml similarity index 94% rename from lovelace/stretch-cameras/front-room-card.yaml rename to lovelace/casting-cams/front-room-card.yaml index c02f7b3..a6fb774 100644 --- a/lovelace/stretch-cameras/front-room-card.yaml +++ b/lovelace/casting-cams/front-room-card.yaml @@ -14,7 +14,7 @@ cards: enabled: false style: none cameras: - - camera_entity: camera.frigate_cam13 + - camera_entity: camera.frigate_cam12 live_provider: go2rtc id: frigate-cam13 capabilities: @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam13_sub_opus + stream: cam13_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/front-room-view.yaml b/lovelace/casting-cams/front-room-view.yaml similarity index 57% rename from lovelace/stretch-cameras/front-room-view.yaml rename to lovelace/casting-cams/front-room-view.yaml index b25d174..14acaa0 100644 --- a/lovelace/stretch-cameras/front-room-view.yaml +++ b/lovelace/casting-cams/front-room-view.yaml @@ -3,4 +3,4 @@ path: front-room-camera icon: mdi:television type: panel cards: - - !include /config/lovelace/stretch-cameras/front-room-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/front-room-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/front-yard-card.yaml b/lovelace/casting-cams/front-yard-card.yaml similarity index 97% rename from lovelace/stretch-cameras/front-yard-card.yaml rename to lovelace/casting-cams/front-yard-card.yaml index 2790557..4ad67b1 100644 --- a/lovelace/stretch-cameras/front-yard-card.yaml +++ b/lovelace/casting-cams/front-yard-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam18_sub_opus + stream: cam18_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/front-yard-view.yaml b/lovelace/casting-cams/front-yard-view.yaml similarity index 56% rename from lovelace/stretch-cameras/front-yard-view.yaml rename to lovelace/casting-cams/front-yard-view.yaml index 5544bac..a2aa776 100644 --- a/lovelace/stretch-cameras/front-yard-view.yaml +++ b/lovelace/casting-cams/front-yard-view.yaml @@ -3,4 +3,4 @@ path: front-yard-camera icon: mdi:grass type: panel cards: - - !include /config/lovelace/stretch-cameras/front-yard-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/front-yard-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/garage-card.yaml b/lovelace/casting-cams/garage-card.yaml similarity index 97% rename from lovelace/stretch-cameras/garage-card.yaml rename to lovelace/casting-cams/garage-card.yaml index c33ebb7..14711e6 100644 --- a/lovelace/stretch-cameras/garage-card.yaml +++ b/lovelace/casting-cams/garage-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam04_sub_opus + stream: cam04_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/garage-view.yaml b/lovelace/casting-cams/garage-view.yaml similarity index 55% rename from lovelace/stretch-cameras/garage-view.yaml rename to lovelace/casting-cams/garage-view.yaml index dcfb882..98a5d2b 100644 --- a/lovelace/stretch-cameras/garage-view.yaml +++ b/lovelace/casting-cams/garage-view.yaml @@ -3,4 +3,4 @@ path: garage-camera icon: mdi:garage type: panel cards: - - !include /config/lovelace/stretch-cameras/garage-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/garage-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/girls-room-card.yaml b/lovelace/casting-cams/girls-room-card.yaml similarity index 97% rename from lovelace/stretch-cameras/girls-room-card.yaml rename to lovelace/casting-cams/girls-room-card.yaml index 5091849..cf73283 100644 --- a/lovelace/stretch-cameras/girls-room-card.yaml +++ b/lovelace/casting-cams/girls-room-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam08_sub_opus + stream: cam08_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/girls-room-view.yaml b/lovelace/casting-cams/girls-room-view.yaml similarity index 57% rename from lovelace/stretch-cameras/girls-room-view.yaml rename to lovelace/casting-cams/girls-room-view.yaml index c7cb4f5..93d0435 100644 --- a/lovelace/stretch-cameras/girls-room-view.yaml +++ b/lovelace/casting-cams/girls-room-view.yaml @@ -3,4 +3,4 @@ path: girls-room-camera icon: mdi:teddy-bear type: panel cards: - - !include /config/lovelace/stretch-cameras/girls-room-card.yaml + - !include /config/lovelace/casting-cams/girls-room-card.yaml diff --git a/lovelace/stretch-cameras/indoor-camera-cycler.yaml b/lovelace/casting-cams/indoor-camera-cycler.yaml similarity index 95% rename from lovelace/stretch-cameras/indoor-camera-cycler.yaml rename to lovelace/casting-cams/indoor-camera-cycler.yaml index df824ba..7f673cd 100644 --- a/lovelace/stretch-cameras/indoor-camera-cycler.yaml +++ b/lovelace/casting-cams/indoor-camera-cycler.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam03_sub_opus + stream: cam03_sub modes: - webrtc always_error_if_entity_unavailable: false @@ -38,7 +38,7 @@ cards: disable_except: - live go2rtc: - stream: cam04_sub_opus + stream: cam04_sub modes: - webrtc always_error_if_entity_unavailable: false @@ -54,7 +54,7 @@ cards: disable_except: - live go2rtc: - stream: cam12_sub_opus + stream: cam12_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/indoor-camera-view.yaml b/lovelace/casting-cams/indoor-camera-view.yaml similarity index 52% rename from lovelace/stretch-cameras/indoor-camera-view.yaml rename to lovelace/casting-cams/indoor-camera-view.yaml index c2ecec7..a904799 100644 --- a/lovelace/stretch-cameras/indoor-camera-view.yaml +++ b/lovelace/casting-cams/indoor-camera-view.yaml @@ -3,4 +3,4 @@ path: indoor-cameras icon: mdi:home panel: true cards: - - !include /config/lovelace/stretch-cameras/indoor-camera-cycler.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/indoor-camera-cycler.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/kitchen-card.yaml b/lovelace/casting-cams/kitchen-card.yaml similarity index 97% rename from lovelace/stretch-cameras/kitchen-card.yaml rename to lovelace/casting-cams/kitchen-card.yaml index 7842b03..95b96ca 100644 --- a/lovelace/stretch-cameras/kitchen-card.yaml +++ b/lovelace/casting-cams/kitchen-card.yaml @@ -23,7 +23,7 @@ cards: disable_except: - live go2rtc: - stream: cam12_sub_opus + stream: cam12_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/kitchen-view.yaml b/lovelace/casting-cams/kitchen-view.yaml similarity index 55% rename from lovelace/stretch-cameras/kitchen-view.yaml rename to lovelace/casting-cams/kitchen-view.yaml index 7f9835b..6c74cb6 100644 --- a/lovelace/stretch-cameras/kitchen-view.yaml +++ b/lovelace/casting-cams/kitchen-view.yaml @@ -3,4 +3,4 @@ path: kitchen-camera icon: mdi:fridge type: panel cards: - - !include /config/lovelace/stretch-cameras/kitchen-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/kitchen-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/master-bedroom-card.yaml b/lovelace/casting-cams/master-bedroom-card.yaml similarity index 96% rename from lovelace/stretch-cameras/master-bedroom-card.yaml rename to lovelace/casting-cams/master-bedroom-card.yaml index 3be5bf8..bf2e681 100644 --- a/lovelace/stretch-cameras/master-bedroom-card.yaml +++ b/lovelace/casting-cams/master-bedroom-card.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam06_sub_opus + stream: cam06_sub modes: - webrtc title: MBR Left @@ -40,7 +40,7 @@ cards: disable_except: - live go2rtc: - stream: cam07_sub_opus + stream: cam07_sub modes: - webrtc title: MBR Right diff --git a/lovelace/stretch-cameras/master-bedroom-view.yaml b/lovelace/casting-cams/master-bedroom-view.yaml similarity index 54% rename from lovelace/stretch-cameras/master-bedroom-view.yaml rename to lovelace/casting-cams/master-bedroom-view.yaml index addcae3..4311c5d 100644 --- a/lovelace/stretch-cameras/master-bedroom-view.yaml +++ b/lovelace/casting-cams/master-bedroom-view.yaml @@ -3,4 +3,4 @@ path: mbr-camera icon: mdi:bed-king panel: true cards: - - !include /config/lovelace/stretch-cameras/master-bedroom-card.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/master-bedroom-card.yaml \ No newline at end of file diff --git a/lovelace/stretch-cameras/outdoor-camera-cycler.yaml b/lovelace/casting-cams/outdoor-camera-cycler.yaml similarity index 95% rename from lovelace/stretch-cameras/outdoor-camera-cycler.yaml rename to lovelace/casting-cams/outdoor-camera-cycler.yaml index 2955467..0df57b6 100644 --- a/lovelace/stretch-cameras/outdoor-camera-cycler.yaml +++ b/lovelace/casting-cams/outdoor-camera-cycler.yaml @@ -22,7 +22,7 @@ cards: disable_except: - live go2rtc: - stream: cam18_sub_opus + stream: cam18_sub modes: - webrtc always_error_if_entity_unavailable: false @@ -38,7 +38,7 @@ cards: disable_except: - live go2rtc: - stream: cam04_sub_opus + stream: cam04_sub modes: - webrtc always_error_if_entity_unavailable: false @@ -54,7 +54,7 @@ cards: disable_except: - live go2rtc: - stream: cam19_sub_opus + stream: cam19_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/stretch-cameras/outdoor-camera-view.yaml b/lovelace/casting-cams/outdoor-camera-view.yaml similarity index 54% rename from lovelace/stretch-cameras/outdoor-camera-view.yaml rename to lovelace/casting-cams/outdoor-camera-view.yaml index 74d67ec..67b1017 100644 --- a/lovelace/stretch-cameras/outdoor-camera-view.yaml +++ b/lovelace/casting-cams/outdoor-camera-view.yaml @@ -3,4 +3,4 @@ path: outdoor-cameras icon: mdi:home-outline panel: true cards: - - !include /config/lovelace/stretch-cameras/outdoor-camera-cycler.yaml \ No newline at end of file + - !include /config/lovelace/casting-cams/outdoor-camera-cycler.yaml \ No newline at end of file diff --git a/lovelace/details/view-batteries.yaml b/lovelace/details/view-batteries.yaml index 94556f9..f1b5d0c 100644 --- a/lovelace/details/view-batteries.yaml +++ b/lovelace/details/view-batteries.yaml @@ -28,15 +28,15 @@ cards: - type: entities title: Hue Batteries entities: - - entity: sensor.bar_battery + - entity: sensor.bar_hue_motion_sensor_battery name: Bar Motion Sensor - - entity: sensor.entryway_battery + - entity: sensor.entryway_hue_motion_sensor_battery name: Entryway Motion Sensor - - entity: sensor.front_room_battery + - entity: sensor.front_room_hue_motion_sensor_battery name: Front Room Motion Sensor - - entity: sensor.front_porch_battery + - entity: sensor.front_porch_hue_motion_sensor_battery name: Front Porch Motion Sensor - - entity: sensor.deck_battery + - entity: sensor.deck_hue_motion_sensor_battery name: Deck Motion Sensor - type: entities title: Window Batteries diff --git a/lovelace/details/view-people-frigate.yaml b/lovelace/details/view-people-frigate.yaml index 817bb94..0cea62e 100644 --- a/lovelace/details/view-people-frigate.yaml +++ b/lovelace/details/view-people-frigate.yaml @@ -10,7 +10,7 @@ cards: - camera_entity: camera.frigate_cam03 live_provider: webrtc-card webrtc_card: - url: rtsp://192.168.1.7:8554/cam03_sub_opus + url: rtsp://192.168.1.7:8554/cam03_sub - frigate: camera_name: frigate_cam03 label: person @@ -30,13 +30,13 @@ cards: zone: dining_room image: {} - - type: custom:advanced-camera-card - cameras: - - camera_entity: camera.frigate_cam13 - live_provider: frigate-jsmpeg - dependencies: - all_cameras: false - frigate: - label: person - zone: front_room - image: {} + # - type: custom:advanced-camera-card + # cameras: + # - camera_entity: camera.frigate_cam13 + # live_provider: frigate-jsmpeg + # dependencies: + # all_cameras: false + # frigate: + # label: person + # zone: front_room + # image: {} diff --git a/lovelace/details/view-people.yaml b/lovelace/details/view-people.yaml index 5c819d9..0beb435 100644 --- a/lovelace/details/view-people.yaml +++ b/lovelace/details/view-people.yaml @@ -278,79 +278,79 @@ cards: image_entity: image.frigate_cam12_person entity: binary_sensor.front_room_person_occupancy - - type: entity-filter - entities: - - binary_sensor.frigate_cam13_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: horizontal-stack - cards: - - type: entity-filter - entities: - - binary_sensor.kitchen_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: picture-glance - title: Kitchen - camera_view: auto - entities: [] - image_entity: image.frigate_cam13_person - entity: binary_sensor.kitchen_person_occupancy + # - type: entity-filter + # entities: + # - binary_sensor.frigate_cam13_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: horizontal-stack + # cards: + # - type: entity-filter + # entities: + # - binary_sensor.kitchen_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: picture-glance + # title: Kitchen + # camera_view: auto + # entities: [] + # image_entity: image.frigate_cam13_person + # entity: binary_sensor.kitchen_person_occupancy - - type: entity-filter - entities: - - binary_sensor.dining_room_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: picture-glance - title: Dining Room - camera_view: auto - entities: [] - image_entity: image.frigate_cam13_person - entity: binary_sensor.dining_room_person_occupancy + # - type: entity-filter + # entities: + # - binary_sensor.dining_room_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: picture-glance + # title: Dining Room + # camera_view: auto + # entities: [] + # image_entity: image.frigate_cam13_person + # entity: binary_sensor.dining_room_person_occupancy - - type: entity-filter - entities: - - binary_sensor.front_room_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: picture-glance - title: Front Room - camera_view: auto - entities: [] - image_entity: image.frigate_cam13_person - entity: binary_sensor.front_room_person_occupancy + # - type: entity-filter + # entities: + # - binary_sensor.front_room_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: picture-glance + # title: Front Room + # camera_view: auto + # entities: [] + # image_entity: image.frigate_cam13_person + # entity: binary_sensor.front_room_person_occupancy - - type: entity-filter - entities: - - binary_sensor.frigate_cam14_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: horizontal-stack - cards: - - type: entity-filter - entities: - - binary_sensor.back_yard_person_occupancy - show_empty: false - state_filter: - - "on" - card: - type: picture-glance - title: Back Yard - camera_view: auto - entities: [] - image_entity: image.frigate_cam14_person - entity: binary_sensor.back_yard_person_occupancy + # - type: entity-filter + # entities: + # - binary_sensor.frigate_cam14_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: horizontal-stack + # cards: + # - type: entity-filter + # entities: + # - binary_sensor.back_yard_person_occupancy + # show_empty: false + # state_filter: + # - "on" + # card: + # type: picture-glance + # title: Back Yard + # camera_view: auto + # entities: [] + # image_entity: image.frigate_cam14_person + # entity: binary_sensor.back_yard_person_occupancy - type: entity-filter entities: diff --git a/lovelace/details/view-weather.yaml b/lovelace/details/view-weather.yaml index 40c3078..540a12d 100644 --- a/lovelace/details/view-weather.yaml +++ b/lovelace/details/view-weather.yaml @@ -36,13 +36,13 @@ cards: moonset: true moon_phase: true - type: weather-forecast - entity: weather.kbiv + entity: weather.home name: Next 5 Hours show_current: true show_forecast: true forecast_type: hourly - type: weather-forecast - entity: weather.thermostat + entity: weather.home name: Next 5 Days show_current: true show_forecast: true diff --git a/lovelace/frigate/view-ai-cam01.yaml b/lovelace/frigate/view-ai-cam01.yaml index e60fada..3e583d9 100644 --- a/lovelace/frigate/view-ai-cam01.yaml +++ b/lovelace/frigate/view-ai-cam01.yaml @@ -51,7 +51,7 @@ cards: camera_name: frigate_cam01 zone: boys_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -94,7 +94,7 @@ cards: camera_name: frigate_cam01 zone: furnace_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam03.yaml b/lovelace/frigate/view-ai-cam03.yaml index 08898ca..88be1c2 100644 --- a/lovelace/frigate/view-ai-cam03.yaml +++ b/lovelace/frigate/view-ai-cam03.yaml @@ -55,7 +55,7 @@ cards: camera_name: frigate_cam03 zone: computer_area label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -97,7 +97,7 @@ cards: go2rtc: modes: - webrtc - stream: cam03_sub_opus + stream: cam03_sub frigate: camera_name: frigate_cam03 zone: great_room diff --git a/lovelace/frigate/view-ai-cam04.yaml b/lovelace/frigate/view-ai-cam04.yaml index a404090..f067f9a 100644 --- a/lovelace/frigate/view-ai-cam04.yaml +++ b/lovelace/frigate/view-ai-cam04.yaml @@ -52,7 +52,7 @@ cards: camera_name: frigate_cam04 zone: walkway label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -87,7 +87,7 @@ cards: camera_name: frigate_cam04 zone: workshop label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -130,7 +130,7 @@ cards: camera_name: frigate_cam04 zone: east_side label: vehicle - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -165,7 +165,7 @@ cards: camera_name: frigate_cam04 zone: west_side label: vehicle - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam06.yaml b/lovelace/frigate/view-ai-cam06.yaml index b35ac7d..8dbfb2a 100644 --- a/lovelace/frigate/view-ai-cam06.yaml +++ b/lovelace/frigate/view-ai-cam06.yaml @@ -51,7 +51,7 @@ cards: camera_name: frigate_cam06 zone: master_bedroom label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -86,7 +86,7 @@ cards: camera_name: frigate_cam06 zone: master_bed label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam07.yaml b/lovelace/frigate/view-ai-cam07.yaml index cf74ccc..085f4e6 100644 --- a/lovelace/frigate/view-ai-cam07.yaml +++ b/lovelace/frigate/view-ai-cam07.yaml @@ -51,7 +51,7 @@ cards: camera_name: frigate_cam07 zone: master_bedroom label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -86,7 +86,7 @@ cards: camera_name: frigate_cam07 zone: master_bed label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam08.yaml b/lovelace/frigate/view-ai-cam08.yaml index e0361e6..df689fe 100644 --- a/lovelace/frigate/view-ai-cam08.yaml +++ b/lovelace/frigate/view-ai-cam08.yaml @@ -52,7 +52,7 @@ cards: camera_name: frigate_cam08 zone: girls_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam12.yaml b/lovelace/frigate/view-ai-cam12.yaml index ece2eea..076a2b2 100644 --- a/lovelace/frigate/view-ai-cam12.yaml +++ b/lovelace/frigate/view-ai-cam12.yaml @@ -52,7 +52,7 @@ cards: camera_name: frigate_cam12 zone: kitchen label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -95,7 +95,7 @@ cards: camera_name: frigate_cam12 zone: dining_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -138,7 +138,7 @@ cards: camera_name: frigate_cam12 zone: front_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam13.yaml b/lovelace/frigate/view-ai-cam13.yaml index 9638cd9..c18ebb6 100644 --- a/lovelace/frigate/view-ai-cam13.yaml +++ b/lovelace/frigate/view-ai-cam13.yaml @@ -16,24 +16,24 @@ cards: - type: glance title: Front Room entities: [] - - type: glance - show_state: false - columns: 4 - entities: - - name: Contrast - entity: switch.frigate_cam13_improve_contrast - tap_action: - action: toggle - - name: Snapshots - entity: switch.frigate_cam13_snapshots - tap_action: - action: toggle - - name: Detect - entity: switch.frigate_cam13_detect - tap_action: - action: toggle - - name: Occupancy - entity: binary_sensor.frigate_cam13_all_occupancy + # - type: glance + # show_state: false + # columns: 4 + # entities: + # - name: Contrast + # entity: switch.frigate_cam13_improve_contrast + # tap_action: + # action: toggle + # - name: Snapshots + # entity: switch.frigate_cam13_snapshots + # tap_action: + # action: toggle + # - name: Detect + # entity: switch.frigate_cam13_detect + # tap_action: + # action: toggle + # - name: Occupancy + # entity: binary_sensor.frigate_cam13_all_occupancy - type: entities title: Kitchen show_header_toggle: false @@ -49,10 +49,10 @@ cards: icon: mdi:fridge live_provider: ha frigate: - camera_name: frigate_cam13 + camera_name: frigate_cam12 zone: kitchen label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -92,10 +92,10 @@ cards: icon: mdi:table-chair live_provider: ha frigate: - camera_name: frigate_cam13 + camera_name: frigate_cam12 zone: dining_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -138,7 +138,7 @@ cards: camera_name: frigate_cam13 zone: front_room label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: diff --git a/lovelace/frigate/view-ai-cam14.yaml b/lovelace/frigate/view-ai-cam14.yaml index 47bae39..a01affd 100644 --- a/lovelace/frigate/view-ai-cam14.yaml +++ b/lovelace/frigate/view-ai-cam14.yaml @@ -20,42 +20,42 @@ cards: show_state: true columns: 5 entities: - - name: Contrast - entity: switch.frigate_cam14_improve_contrast - tap_action: - action: toggle - - name: Snapshots - entity: switch.frigate_cam14_snapshots - tap_action: - action: toggle - - name: Detect - entity: switch.frigate_cam14_detect - tap_action: - action: toggle - - name: Occupancy - entity: binary_sensor.frigate_cam14_all_occupancy + # - name: Contrast + # entity: switch.frigate_cam14_improve_contrast + # tap_action: + # action: toggle + # - name: Snapshots + # entity: switch.frigate_cam14_snapshots + # tap_action: + # action: toggle + # - name: Detect + # entity: switch.frigate_cam14_detect + # tap_action: + # action: toggle + # - name: Occupancy + # entity: binary_sensor.frigate_cam14_all_occupancy - type: horizontal-stack cards: - - type: glance - title: People - show_icon: false - columns: 1 - entities: - - name: Count - entity: sensor.frigate_cam14_person_count - - name: Occupancy - entity: binary_sensor.frigate_cam14_person_occupancy + # - type: glance + # title: People + # show_icon: false + # columns: 1 + # entities: + # - name: Count + # entity: sensor.frigate_cam14_person_count + # - name: Occupancy + # entity: binary_sensor.frigate_cam14_person_occupancy - type: custom:advanced-camera-card cameras: - camera_entity: camera.frigate_cam12 - # - camera_entity: camera.frigate_cam14 + # - camera_entity: camera.frigate_cam14 title: Person icon: mdi:slide live_provider: ha frigate: camera_name: frigate_cam14 label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -100,7 +100,7 @@ cards: # frigate: # camera_name: frigate_cam14 # label: animal - # url: http://192.168.1.11:5000 + # url: http://192.168.1.7:5000 # view: # default: snapshots # event_gallery: diff --git a/lovelace/frigate/view-ai-cam18.yaml b/lovelace/frigate/view-ai-cam18.yaml index 93fafb1..bca4856 100644 --- a/lovelace/frigate/view-ai-cam18.yaml +++ b/lovelace/frigate/view-ai-cam18.yaml @@ -56,7 +56,7 @@ cards: frigate: camera_name: frigate_cam18 label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -101,7 +101,7 @@ cards: frigate: camera_name: frigate_cam18 label: vehicle - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -146,7 +146,7 @@ cards: # frigate: # camera_name: frigate_cam18 # label: animal - # url: http://192.168.1.11:5000 + # url: http://192.168.1.7:5000 # view: # default: snapshots # event_gallery: diff --git a/lovelace/frigate/view-ai-cam19.yaml b/lovelace/frigate/view-ai-cam19.yaml index cfa1be9..ed69791 100644 --- a/lovelace/frigate/view-ai-cam19.yaml +++ b/lovelace/frigate/view-ai-cam19.yaml @@ -56,7 +56,7 @@ cards: frigate: camera_name: frigate_cam19 label: person - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -101,7 +101,7 @@ cards: frigate: camera_name: frigate_cam19 label: vehicle - url: http://192.168.1.11:5000 + url: http://192.168.1.7:5000 view: default: snapshots event_gallery: @@ -146,7 +146,7 @@ cards: # frigate: # camera_name: frigate_cam19 # label: animal - # url: http://192.168.1.11:5000 + # url: http://192.168.1.7:5000 # view: # default: snapshots # event_gallery: diff --git a/lovelace/phone/back-yard.yaml b/lovelace/phone/back-yard.yaml index 8ab0684..2e3cefd 100644 --- a/lovelace/phone/back-yard.yaml +++ b/lovelace/phone/back-yard.yaml @@ -14,7 +14,7 @@ cards: - hours_to_show: 24 graph: line type: sensor - entity: sensor.deck_temperature + entity: sensor.deck_hue_motion_sensor_temperature detail: 1 name: Temperature - hours_to_show: 24 @@ -42,7 +42,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.deck_light_level + entity: sensor.deck_hue_motion_sensor_illuminance name: Deck - type: custom:mushroom-entity-card entity: input_number.deck_light_level_trigger @@ -69,15 +69,15 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.back_yard_motion + entity: binary_sensor.back_yard_motion name: Motion layout: vertical secondary_info: none - - type: custom:mushroom-entity-card - entity: binary_sensor.back_yard_person_occupancy - name: Person - layout: vertical - secondary_info: none + # - type: custom:mushroom-entity-card + # entity: binary_sensor.back_yard_person_occupancy + # name: Person + # layout: vertical + # secondary_info: none - type: horizontal-stack cards: - type: custom:mushroom-entity-card @@ -89,4 +89,4 @@ cards: cards: - type: custom:mushroom-title-card subtitle: Cameras - - !include /config/lovelace/cameras/view-camera-14.yaml \ No newline at end of file + - !include /config/lovelace/cameras/view-camera-14.yaml diff --git a/lovelace/phone/boys-room.yaml b/lovelace/phone/boys-room.yaml index 7587bab..8cf0fda 100644 --- a/lovelace/phone/boys-room.yaml +++ b/lovelace/phone/boys-room.yaml @@ -113,7 +113,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.boys_room_motion + entity: binary_sensor.boys_room_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/cctv.yaml b/lovelace/phone/cctv.yaml index 8f5a95a..2ec9a3d 100644 --- a/lovelace/phone/cctv.yaml +++ b/lovelace/phone/cctv.yaml @@ -12,24 +12,15 @@ cards: columns: 1 cards: - !include /config/lovelace/cameras/view-camera-08.yaml - - - !include /config/lovelace/cameras/view-camera-12.yaml - - - !include /config/lovelace/cameras/view-camera-13.yaml - - - !include /config/lovelace/cameras/view-camera-03.yaml - - # - !include /config/lovelace/cameras/view-camera-06.yaml - - !include /config/lovelace/stretch-cameras/master-bedroom-card.yaml - # - !include /config/lovelace/cameras/view-camera-07.yaml - - !include /config/lovelace/cameras/view-camera-01.yaml - + - !include /config/lovelace/cameras/view-camera-12.yaml + - !include /config/lovelace/cameras/view-camera-03.yaml + #- !include /config/lovelace/cameras/view-camera-13.yaml + # - !include /config/lovelace/cameras/view-camera-06.yaml + - !include /config/lovelace/casting-cams/master-bedroom-card.yaml + # - !include /config/lovelace/cameras/view-camera-07.yaml - !include /config/lovelace/cameras/view-camera-04.yaml - - !include /config/lovelace/cameras/view-camera-18.yaml - - - !include /config/lovelace/cameras/view-camera-14.yaml - + #- !include /config/lovelace/cameras/view-camera-14.yaml - !include /config/lovelace/cameras/view-camera-19.yaml diff --git a/lovelace/phone/computer-area.yaml b/lovelace/phone/computer-area.yaml index c0c8461..a5128cf 100644 --- a/lovelace/phone/computer-area.yaml +++ b/lovelace/phone/computer-area.yaml @@ -79,7 +79,7 @@ cards: cards: - type: custom:mushroom-entity-card entity: >- - binary_sensor.computer_area_multisensor_home_security_motion_detection + binary_sensor.computer_area_multisensor_motion_detection name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/dining-room.yaml b/lovelace/phone/dining-room.yaml index 575077f..e5bc780 100644 --- a/lovelace/phone/dining-room.yaml +++ b/lovelace/phone/dining-room.yaml @@ -30,7 +30,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-light-card - entity: light.dining_room_switch + entity: light.dining_room name: Main Light tap_action: action: toggle @@ -68,7 +68,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.dining_room_motion + entity: binary_sensor.dining_room_motion name: Motion layout: vertical secondary_info: none @@ -88,4 +88,4 @@ cards: cards: - type: custom:mushroom-title-card subtitle: Cameras - - !include /config/lovelace/cameras/view-camera-13.yaml \ No newline at end of file + - !include /config/lovelace/cameras/view-camera-13.yaml diff --git a/lovelace/phone/entryway.yaml b/lovelace/phone/entryway.yaml index f01d554..04d7dd4 100644 --- a/lovelace/phone/entryway.yaml +++ b/lovelace/phone/entryway.yaml @@ -14,7 +14,7 @@ cards: - hours_to_show: 24 graph: line type: sensor - entity: sensor.entryway_temperature + entity: sensor.entryway_hue_motion_sensor_temperature detail: 1 name: Temperature - hours_to_show: 24 @@ -69,7 +69,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.entryway_motion + entity: binary_sensor.entryway_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/front-room.yaml b/lovelace/phone/front-room.yaml index d64e434..b0e9543 100644 --- a/lovelace/phone/front-room.yaml +++ b/lovelace/phone/front-room.yaml @@ -47,7 +47,7 @@ sections: primary: Naturally Lit secondary: >- Trigger: {{states('input_number.front_room_light_level_trigger')|int}} - Lux: {{states('sensor.front_room_light_level')}} + Lux: {{states('sensor.front_room_hue_motion_sensor_illuminance')}} icon: > {{iif(is_state('binary_sensor.front_room_naturally_lit','on'),'mdi:brightness-auto','mdi:weather-sunny-off')}} entity: input_number.front_room_light_level_trigger @@ -61,7 +61,7 @@ sections: - type: custom:mushroom-template-card entity: input_boolean.front_room_light_cycle primary: Cycle - secondary: '{{states(''input_boolean.front_room_light_cycle'') | title}}' + secondary: "{{states('input_boolean.front_room_light_cycle') | title}}" layout: vertical tap_action: action: call-service @@ -103,7 +103,7 @@ sections: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.front_room_motion + entity: binary_sensor.front_room_motion name: Motion layout: vertical secondary_info: none @@ -130,4 +130,4 @@ sections: subtitle: Cameras - !include /config/lovelace/cameras/view-camera-13.yaml - - !include /config/lovelace/templates/front-room-remote.yaml \ No newline at end of file + - !include /config/lovelace/templates/front-room-remote.yaml diff --git a/lovelace/phone/front-yard.yaml b/lovelace/phone/front-yard.yaml index 89b3c4a..5727f57 100644 --- a/lovelace/phone/front-yard.yaml +++ b/lovelace/phone/front-yard.yaml @@ -75,7 +75,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.front_porch_light_level + entity: sensor.front_porch_hue_motion_sensor_illuminance name: Porch - type: custom:mushroom-entity-card entity: input_number.front_porch_light_level_trigger @@ -105,7 +105,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.front_porch_motion + entity: binary_sensor.front_porch_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/furnace-room.yaml b/lovelace/phone/furnace-room.yaml index a627177..4862fff 100644 --- a/lovelace/phone/furnace-room.yaml +++ b/lovelace/phone/furnace-room.yaml @@ -43,7 +43,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: binary_sensor.furnace_room_water_sensor_water_alarm_water_leak_detected + entity: binary_sensor.furnace_room_water_sensor_leak name: Leak icon: mdi:water layout: vertical diff --git a/lovelace/phone/garage.yaml b/lovelace/phone/garage.yaml index 72030dc..fdbcee8 100644 --- a/lovelace/phone/garage.yaml +++ b/lovelace/phone/garage.yaml @@ -32,7 +32,7 @@ cards: - type: custom:mushroom-light-card entity: light.garage_overhead name: Garage - icon: '' + icon: "" tap_action: action: toggle hide_state: true @@ -40,7 +40,7 @@ cards: - type: custom:mushroom-light-card entity: light.driveway name: Driveway - icon: '' + icon: "" tap_action: action: toggle layout: vertical @@ -81,7 +81,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.garage_motion + entity: binary_sensor.garage_motion name: Motion layout: vertical secondary_info: none @@ -111,4 +111,4 @@ cards: cards: - type: custom:mushroom-title-card subtitle: Cameras - - !include /config/lovelace/cameras/view-camera-04.yaml \ No newline at end of file + - !include /config/lovelace/cameras/view-camera-04.yaml diff --git a/lovelace/phone/great-room.yaml b/lovelace/phone/great-room.yaml index e422f68..2eb489e 100644 --- a/lovelace/phone/great-room.yaml +++ b/lovelace/phone/great-room.yaml @@ -74,7 +74,7 @@ sections: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.great_room_motion + entity: binary_sensor.great_room_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/home.yaml b/lovelace/phone/home.yaml index 0c0cabd..1cb14f5 100644 --- a/lovelace/phone/home.yaml +++ b/lovelace/phone/home.yaml @@ -51,7 +51,7 @@ cards: action: more-info - type: template - entity: group.my_exterior_doors + entity: binary_sensor.exterior_doors icon: > {% if states('sensor.open_external_doors_count') | int(default=0) > 0 -%} {% if is_state('binary_sensor.patio_door_contact','on')-%} @@ -181,18 +181,20 @@ cards: alignment: center - - type: custom:mushroom-template-card - primary: |- - {% set time = now().hour %} - {% if (time >= 18) %} + - type: markdown + content: > + {% set time = now().hour -%} + + {% if (time >= 18) -%} Good evening, {{user}}! - {% elif (time >=12) %} + {% elif (time >=12) -%} Good afternoon, {{user}}! - {% else %} + {% else -%} Good morning, {{user}}! - {%endif%} - secondary: |- - Today should be {{states('weather.forecast_home')}}, with a high of {{states('sensor.temphigh_today')|float(0)|round(0)}} and a low of {{states('sensor.templow_today')|float(0)|round(0)}}. + {%endif-%} + Today should be {{states('sensor.home_weather_condition')}}, with a high of + {{states('sensor.temphigh_today')|float(0)|round(0)}} and a low of + {{states('sensor.templow_today')|float(0)|round(0)}}. tap_action: action: navigate navigation_path: /details-yml/weather @@ -426,7 +428,7 @@ cards: - type: custom:mushroom-template-card primary: Dining Room icon: mdi:table-chair - entity: light.dining_room_switch + entity: light.dining_room tap_action: action: navigate navigation_path: dining-room @@ -435,7 +437,7 @@ cards: secondary: |- {{states('sensor.dining_room_multisensor_air_temperature')}}°F {{states('sensor.dining_room_multisensor_humidity')}}% - icon_color: "{{iif(is_state('light.dining_room_switch','on'),'yellow')}}" + icon_color: "{{iif(is_state('light.dining_room','on'),'yellow')}}" multiline_secondary: true layout: vertical - type: horizontal-stack @@ -501,7 +503,7 @@ cards: hold_action: action: toggle secondary: |- - {{states('sensor.entryway_temperature')}}°F + {{states('sensor.entryway_hue_motion_sensor_temperature')}}°F {{states('sensor.thermostat_humidity')}}% icon_color: "{{iif(is_state('light.entryway_hue','on'),'yellow')}}" multiline_secondary: true @@ -548,7 +550,7 @@ cards: hold_action: action: toggle secondary: |- - {{states('sensor.front_porch_temperature')}}°F + {{states('sensor.front_porch_hue_motion_sensor_temperature')}}°F {{states('sensor.garage_multisensor_humidity')}}% icon_color: "{{iif(is_state('light.front_porch_overhead','on'),'yellow')}}" multiline_secondary: true diff --git a/lovelace/phone/kitchen.yaml b/lovelace/phone/kitchen.yaml index a5268cd..a766154 100644 --- a/lovelace/phone/kitchen.yaml +++ b/lovelace/phone/kitchen.yaml @@ -46,7 +46,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.bar_light_level + entity: sensor.kitchen_multisensor_illuminance name: Bar - type: custom:mushroom-entity-card entity: input_number.kitchen_light_level_trigger @@ -107,7 +107,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.kitchen_motion + entity: binary_sensor.kitchen_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/lights.yaml b/lovelace/phone/lights.yaml index 3542b6d..9c06cc9 100644 --- a/lovelace/phone/lights.yaml +++ b/lovelace/phone/lights.yaml @@ -125,7 +125,7 @@ cards: secondary: "{{states('input_select.dining_room_mode')}}" entity: input_boolean.dining_room_occupied icon: mdi:lightbulb - icon_color: "{{ iif(is_state('light.dining_room_switch', 'on'), 'yellow') }}" + icon_color: "{{ iif(is_state('light.dining_room', 'on'), 'yellow') }}" tap_action: action: toggle - type: vertical-stack @@ -149,7 +149,7 @@ cards: - type: custom:mushroom-template-card primary: Ceiling secondary: "{{states('input_select.master_bedroom_mode')}}" - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied icon: mdi:lightbulb icon_color: >- {{ iif(is_state('light.master_bedroom_hue', 'on'), 'yellow') @@ -175,7 +175,7 @@ cards: - type: custom:mushroom-template-card primary: Master Bathroom secondary: "{{states('input_select.master_bathroom_mode')}}" - entity: input_boolean.master_bathroom_occupied + entity: input_boolean.bathroom_occupied icon: mdi:lightbulb icon_color: >- {{ iif(is_state('light.master_bathroom_hue', 'on'), 'yellow') diff --git a/lovelace/phone/mancave.yaml b/lovelace/phone/mancave.yaml index d9053e8..c9f2afe 100644 --- a/lovelace/phone/mancave.yaml +++ b/lovelace/phone/mancave.yaml @@ -49,7 +49,7 @@ cards: secondary_info: none layout: vertical - type: custom:mushroom-entity-card - entity: group.mancave_motion + entity: binary_sensor.mancave_motion name: Motion secondary_info: none - layout: vertical \ No newline at end of file + layout: vertical diff --git a/lovelace/phone/master-bathroom.yaml b/lovelace/phone/master-bathroom.yaml index 39ff458..aeeee97 100644 --- a/lovelace/phone/master-bathroom.yaml +++ b/lovelace/phone/master-bathroom.yaml @@ -93,7 +93,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.master_bathroom_motion + entity: binary_sensor.bathroom_motion name: Motion layout: vertical - secondary_info: none \ No newline at end of file + secondary_info: none diff --git a/lovelace/phone/master-bedroom.yaml b/lovelace/phone/master-bedroom.yaml index d743eed..c482bad 100644 --- a/lovelace/phone/master-bedroom.yaml +++ b/lovelace/phone/master-bedroom.yaml @@ -99,7 +99,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-entity-card - entity: group.master_bedroom_motion + entity: binary_sensor.bedroom_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/phone/utility-room.yaml b/lovelace/phone/utility-room.yaml index 9d543c1..f207d55 100644 --- a/lovelace/phone/utility-room.yaml +++ b/lovelace/phone/utility-room.yaml @@ -117,7 +117,7 @@ cards: layout: vertical secondary_info: none - type: custom:mushroom-entity-card - entity: group.utility_room_motion + entity: binary_sensor.utility_room_motion name: Motion layout: vertical secondary_info: none diff --git a/lovelace/raw-cameras/back-yard-card.yaml b/lovelace/raw-cameras/back-yard-card.yaml index a70f758..ebdee45 100644 --- a/lovelace/raw-cameras/back-yard-card.yaml +++ b/lovelace/raw-cameras/back-yard-card.yaml @@ -5,7 +5,7 @@ cameras: go2rtc: modes: - webrtc - stream: cam14_sub_opus + stream: cam14_sub live: auto_mute: all preload: true diff --git a/lovelace/raw-cameras/boys-room-card.yaml b/lovelace/raw-cameras/boys-room-card.yaml index 34d58ee..d650b7c 100644 --- a/lovelace/raw-cameras/boys-room-card.yaml +++ b/lovelace/raw-cameras/boys-room-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam01_sub_opus + stream: cam01_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/computer-area-card.yaml b/lovelace/raw-cameras/computer-area-card.yaml index 3b141c1..0b35710 100644 --- a/lovelace/raw-cameras/computer-area-card.yaml +++ b/lovelace/raw-cameras/computer-area-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam03_opus + stream: cam03 modes: - webrtc # view: @@ -41,4 +41,4 @@ cameras: # - selected # transition_effect: slide # display: -# mode: single \ No newline at end of file +# mode: single diff --git a/lovelace/raw-cameras/front-porch-card.yaml b/lovelace/raw-cameras/front-porch-card.yaml index 3dd5674..8e068e7 100644 --- a/lovelace/raw-cameras/front-porch-card.yaml +++ b/lovelace/raw-cameras/front-porch-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam19_sub_opus + stream: cam19_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/front-room-card.yaml b/lovelace/raw-cameras/front-room-card.yaml index 12317d6..4335336 100644 --- a/lovelace/raw-cameras/front-room-card.yaml +++ b/lovelace/raw-cameras/front-room-card.yaml @@ -1,11 +1,11 @@ type: custom:advanced-camera-card cameras: - - camera_entity: camera.frigate_cam13 + - camera_entity: camera.frigate_cam12 live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam13_sub_opus + stream: cam13_sub live: auto_mute: all preload: true diff --git a/lovelace/raw-cameras/front-yard-card.yaml b/lovelace/raw-cameras/front-yard-card.yaml index 3f825bf..eb51043 100644 --- a/lovelace/raw-cameras/front-yard-card.yaml +++ b/lovelace/raw-cameras/front-yard-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam18_sub_opus + stream: cam18_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/garage-card.yaml b/lovelace/raw-cameras/garage-card.yaml index 69a42d6..c3b45bb 100644 --- a/lovelace/raw-cameras/garage-card.yaml +++ b/lovelace/raw-cameras/garage-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam04_sub_opus + stream: cam04_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/girls-room-card.yaml b/lovelace/raw-cameras/girls-room-card.yaml index d23a653..de6076b 100644 --- a/lovelace/raw-cameras/girls-room-card.yaml +++ b/lovelace/raw-cameras/girls-room-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam08_sub_opus + stream: cam08_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/indoor-camera-card.yaml b/lovelace/raw-cameras/indoor-camera-card.yaml index 4b96032..17ccf1c 100644 --- a/lovelace/raw-cameras/indoor-camera-card.yaml +++ b/lovelace/raw-cameras/indoor-camera-card.yaml @@ -6,7 +6,7 @@ cameras: go2rtc: modes: - webrtc - stream: cam08_sub_opus + stream: cam08_sub triggers: occupancy: false motion: false @@ -19,71 +19,71 @@ cameras: go2rtc: modes: - webrtc - stream: cam01_sub_opus + stream: cam01_sub triggers: occupancy: false motion: false entities: - - group.boys_room_motion + - binary_sensor.boys_room_motion - binary_sensor.emmetts_bed - - camera_entity: camera.frigate_cam13 - title: Front Room - live_provider: go2rtc - go2rtc: - modes: - - webrtc - stream: cam12_sub_opus - triggers: - occupancy: false - motion: false - entities: - - group.front_room_motion - - group.dining_room_motion + # - camera_entity: camera.frigate_cam13 + # title: Front Room + # live_provider: go2rtc + # go2rtc: + # modes: + # - webrtc + # stream: cam12_sub + # triggers: + # occupancy: false + # motion: false + # entities: + # - binary_sensor.front_room_motion + # - binary_sensor.dining_room_motion - camera_entity: camera.frigate_cam12 title: Kitchen live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam13_sub_opus + stream: cam13_sub triggers: occupancy: false motion: false entities: - - group.kitchen_motion + - binary_sensor.kitchen_motion - camera_entity: camera.frigate_cam03 title: Computer Desk live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam03_sub_opus + stream: cam03_sub triggers: occupancy: false motion: false entities: - binary_sensor.computer_chair_contact_occupied - - group.computer_area_motion - - group.great_room_motion + - binary_sensor.computer_area_motion + - binary_sensor.great_room_motion - camera_entity: camera.frigate_cam06 title: MBR Left live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam06_sub_opus + stream: cam06_sub triggers: occupancy: false motion: false entities: - - group.master_bedroom_motion + - binary_sensor.bedroom_motion - camera_entity: camera.frigate_cam07 title: MBR Right live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam07_sub_opus + stream: cam07_sub triggers: occupancy: false motion: false diff --git a/lovelace/raw-cameras/kitchen-card.yaml b/lovelace/raw-cameras/kitchen-card.yaml index 15355a2..a736b4b 100644 --- a/lovelace/raw-cameras/kitchen-card.yaml +++ b/lovelace/raw-cameras/kitchen-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam12_sub_opus + stream: cam12_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/master-bedroom-left-card.yaml b/lovelace/raw-cameras/master-bedroom-left-card.yaml index 8e0cf89..4361e54 100644 --- a/lovelace/raw-cameras/master-bedroom-left-card.yaml +++ b/lovelace/raw-cameras/master-bedroom-left-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam06_sub_opus + stream: cam06_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/master-bedroom-right-card.yaml b/lovelace/raw-cameras/master-bedroom-right-card.yaml index 06cd786..83d6751 100644 --- a/lovelace/raw-cameras/master-bedroom-right-card.yaml +++ b/lovelace/raw-cameras/master-bedroom-right-card.yaml @@ -15,7 +15,7 @@ cameras: disable_except: - live go2rtc: - stream: cam07_sub_opus + stream: cam07_sub modes: - webrtc view: @@ -41,4 +41,4 @@ live: - selected transition_effect: slide display: - mode: single \ No newline at end of file + mode: single diff --git a/lovelace/raw-cameras/outdoor-camera-card.yaml b/lovelace/raw-cameras/outdoor-camera-card.yaml index e977cf2..96d576e 100644 --- a/lovelace/raw-cameras/outdoor-camera-card.yaml +++ b/lovelace/raw-cameras/outdoor-camera-card.yaml @@ -6,25 +6,25 @@ cameras: go2rtc: modes: - webrtc - stream: cam04_sub_opus + stream: cam04_sub # - camera_entity: camera.frigate_cam14 # title: Back Yard # live_provider: go2rtc # go2rtc: # modes: # - webrtc - # stream: cam14_sub_opus + # stream: cam14_sub - camera_entity: camera.frigate_cam18 title: Front Yard live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam18_sub_opus + stream: cam18_sub - camera_entity: camera.frigate_cam19 title: Front Porch live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam19_sub_opus + stream: cam19_sub diff --git a/lovelace/resources.yaml b/lovelace/resources.yaml index 943edf5..e1c14fa 100644 --- a/lovelace/resources.yaml +++ b/lovelace/resources.yaml @@ -1,4 +1,3 @@ -# trying to figure out where the webrtc bullshit should go... - url: /webrtc/webrtc-camera.js type: module @@ -17,9 +16,6 @@ - url: /hacsfiles/mini-graph-card/mini-graph-card-bundle.js type: module -- url: /hacsfiles/roku-card/roku-card.js - type: module - # Button Card - url: /hacsfiles/button-card/button-card.js type: module @@ -36,9 +32,6 @@ - url: /hacsfiles/lovelace-mushroom/mushroom.js type: module -- url: /hacsfiles/surveillance-card/surveillance-card.js - type: module - - url: /hacsfiles/lovelace-hourly-weather/hourly-weather.js type: module diff --git a/lovelace/room_cards/back_yard.yaml b/lovelace/room_cards/back_yard.yaml index 6f15f5d..11dad0e 100644 --- a/lovelace/room_cards/back_yard.yaml +++ b/lovelace/room_cards/back_yard.yaml @@ -52,7 +52,7 @@ elements: left: 76% top: 9% # - type: state-icon - # entity: group.back_yard_motion + # entity: binary_sensor.back_yard_motion # style: # left: 76% # top: 9% diff --git a/lovelace/room_cards/boys_room.yaml b/lovelace/room_cards/boys_room.yaml index 981bb4f..40aef20 100644 --- a/lovelace/room_cards/boys_room.yaml +++ b/lovelace/room_cards/boys_room.yaml @@ -59,7 +59,7 @@ elements: left: 60% top: 9% # - type: state-icon - # entity: group.boys_room_motion + # entity: binary_sensor.boys_room_motion # style: # left: 60% # top: 9% diff --git a/lovelace/room_cards/computer_area.yaml b/lovelace/room_cards/computer_area.yaml index 1db730d..f82fa17 100644 --- a/lovelace/room_cards/computer_area.yaml +++ b/lovelace/room_cards/computer_area.yaml @@ -60,7 +60,7 @@ elements: #top left icon #2 spot # - type: state-icon - # entity: group.computer_area_motion + # entity: binary_sensor.computer_area_motion # style: # left: 68% # top: 9% @@ -177,7 +177,6 @@ elements: - width: 45px - height: 45px - - type: "custom:button-card" color: auto entity: camera.frigate_cam03 @@ -218,9 +217,8 @@ elements: - height: 45px tap_action: action: more-info - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/dining_room.yaml b/lovelace/room_cards/dining_room.yaml index 7260b4a..ddec761 100644 --- a/lovelace/room_cards/dining_room.yaml +++ b/lovelace/room_cards/dining_room.yaml @@ -13,9 +13,9 @@ elements: top: 88% - type: custom:mushroom-template-card - primary: '{{states(''sensor.dining_room_multisensor_air_temperature'')}} °F' - secondary: '' - icon: '' + primary: "{{states('sensor.dining_room_multisensor_air_temperature')}} °F" + secondary: "" + icon: "" entity: sensor.dining_room_multisensor_air_temperature tap_action: action: more-info @@ -30,9 +30,9 @@ elements: # top: 35% # font-size: 180% - type: custom:mushroom-template-card - primary: '{{states(''sensor.dining_room_multisensor_humidity'')}}%' - secondary: '' - icon: '' + primary: "{{states('sensor.dining_room_multisensor_humidity')}}%" + secondary: "" + icon: "" entity: sensor.dining_room_multisensor_humidity tap_action: action: more-info @@ -64,7 +64,7 @@ elements: top: 9% #top left icon #2 spot # - type: state-icon - # entity: group.dining_room_motion + # entity: binary_sensor.dining_room_motion # style: # left: 68% # top: 9% @@ -98,7 +98,7 @@ elements: #button #2 - type: "custom:button-card" color: auto - entity: light.dining_room_switch + entity: light.dining_room show_name: false style: left: 25% @@ -183,9 +183,8 @@ elements: tap_action: action: navigate navigation_path: /ai-yml/ai-cam12 - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/entryway.yaml b/lovelace/room_cards/entryway.yaml index 630a03a..faaac2c 100644 --- a/lovelace/room_cards/entryway.yaml +++ b/lovelace/room_cards/entryway.yaml @@ -3,7 +3,7 @@ type: picture-elements image: /local/bg500x225.png elements: - type: custom:mushroom-template-card - primary: '{{states(''input_select.entryway_mode'')}}' + primary: "{{states('input_select.entryway_mode')}}" entity: input_select.entryway_mode tap_action: action: more-info @@ -29,7 +29,7 @@ elements: top: 88% - type: state-label - entity: sensor.entryway_temperature + entity: sensor.entryway_hue_motion_sensor_temperature style: left: 15% top: 35% @@ -43,7 +43,7 @@ elements: text-align: right #Card title - type: custom:mushroom-title-card - title: 'Entryway' + title: "Entryway" style: font-size: 130% left: -2% @@ -88,7 +88,7 @@ elements: action: more-info #button #4 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.entryway_hue show_name: false @@ -129,10 +129,8 @@ elements: action: navigate navigation_path: /ai-yml/ai-cam19 - - #button #4 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.driveway show_name: false @@ -153,7 +151,7 @@ elements: action: more-info #button #4 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.front_porch_overhead show_name: false @@ -172,9 +170,8 @@ elements: action: toggle hold_action: action: more-info - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/front_room.yaml b/lovelace/room_cards/front_room.yaml index 94cbddb..2a3b640 100644 --- a/lovelace/room_cards/front_room.yaml +++ b/lovelace/room_cards/front_room.yaml @@ -38,7 +38,7 @@ elements: left: 68% top: 9% # - type: state-icon - # entity: group.front_room_motion + # entity: binary_sensor.front_room_motion # style: # left: 68% # top: 9% @@ -138,9 +138,8 @@ elements: - height: 45px tap_action: action: more-info - # 12,31,50,69,8 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/front_yard.yaml b/lovelace/room_cards/front_yard.yaml index fa46a0b..9692667 100644 --- a/lovelace/room_cards/front_yard.yaml +++ b/lovelace/room_cards/front_yard.yaml @@ -58,7 +58,7 @@ elements: left: 60% top: 9% # - type: state-icon - # entity: group.front_yard_motion + # entity: binary_sensor.front_yard_motion # style: # left: 60% # top: 9% diff --git a/lovelace/room_cards/furnace_room.yaml b/lovelace/room_cards/furnace_room.yaml index 9f1261e..9cb4f72 100644 --- a/lovelace/room_cards/furnace_room.yaml +++ b/lovelace/room_cards/furnace_room.yaml @@ -30,7 +30,7 @@ elements: left: 76% top: 9% # - type: state-icon - # entity: group.furnace_room_motion + # entity: binary_sensor.furnace_room_motion # style: # left: 76% # top: 9% @@ -94,7 +94,7 @@ elements: action: more-info - type: custom:mushroom-template-card - primary: "{{ states('sensor.hvac_delta_temperature') | float | round(2) }}" + primary: "{{ states('sensor.hvac_delta_temperature') | float(default=0) | round(2) }}" entity: sensor.hvac_delta_temperature tap_action: action: more-info @@ -125,7 +125,7 @@ elements: #button #3 - type: "custom:button-card" color: auto - entity: binary_sensor.furnace_room_water_sensor_water_alarm_water_leak_detected + entity: binary_sensor.furnace_room_water_sensor_leak show_name: false show_entity_picture: true style: diff --git a/lovelace/room_cards/garage.yaml b/lovelace/room_cards/garage.yaml index 8f7cf9c..3d965ce 100644 --- a/lovelace/room_cards/garage.yaml +++ b/lovelace/room_cards/garage.yaml @@ -30,7 +30,7 @@ elements: left: 60% top: 9% # - type: state-icon - # entity: group.garage_motion + # entity: binary_sensor.garage_motion # style: # left: 60% # top: 9% diff --git a/lovelace/room_cards/great_room.yaml b/lovelace/room_cards/great_room.yaml index 2cef969..659f99a 100644 --- a/lovelace/room_cards/great_room.yaml +++ b/lovelace/room_cards/great_room.yaml @@ -3,7 +3,7 @@ type: picture-elements image: /local/bg500x225.png elements: - type: custom:mushroom-template-card - primary: '{{states(''input_select.great_room_mode'')}}' + primary: "{{states('input_select.great_room_mode')}}" entity: input_select.great_room_mode tap_action: action: more-info @@ -26,7 +26,7 @@ elements: text-align: right #Card title - type: custom:mushroom-title-card - title: 'Great Room' + title: "Great Room" style: font-size: 130% left: -2% @@ -39,7 +39,7 @@ elements: left: 68% top: 9% # - type: state-icon - # entity: group.great_room_motion + # entity: binary_sensor.great_room_motion # style: # left: 60% # top: 9% @@ -70,7 +70,7 @@ elements: action: more-info #button #2 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.great_room_hue show_name: false @@ -92,7 +92,7 @@ elements: action: more-info #button #4 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: media_player.downstairs_roku show_name: false @@ -111,7 +111,7 @@ elements: tap_action: action: more-info #button #5 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: media_player.great_room show_name: false @@ -129,10 +129,8 @@ elements: - height: 45px tap_action: action: more-info - - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/kitchen.yaml b/lovelace/room_cards/kitchen.yaml index 41df3c2..dc8bffb 100644 --- a/lovelace/room_cards/kitchen.yaml +++ b/lovelace/room_cards/kitchen.yaml @@ -41,7 +41,7 @@ elements: top: 9% #top left icon #2 spot # - type: state-icon - # entity: group.kitchen_motion + # entity: binary_sensor.kitchen_motion # style: # left: 44% # top: 9% @@ -123,9 +123,8 @@ elements: tap_action: action: navigate navigation_path: /ai-yml/ai-cam12 - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/mancave.yaml b/lovelace/room_cards/mancave.yaml index f8830a6..4a454fb 100644 --- a/lovelace/room_cards/mancave.yaml +++ b/lovelace/room_cards/mancave.yaml @@ -3,7 +3,7 @@ type: picture-elements image: /local/bg500x225.png elements: - type: custom:mushroom-template-card - primary: '{{states(''input_select.mancave_mode'')}}' + primary: "{{states('input_select.mancave_mode')}}" entity: input_select.mancave_mode tap_action: action: more-info @@ -27,7 +27,7 @@ elements: text-align: right #Card title - type: custom:mushroom-title-card - title: 'Mancave' + title: "Mancave" style: font-size: 130% left: -2% @@ -40,7 +40,7 @@ elements: left: 76% top: 9% # - type: state-icon - # entity: group.mancave_motion + # entity: binary_sensor.mancave_motion # style: # left: 76% # top: 9% @@ -61,7 +61,7 @@ elements: hold_action: action: more-info - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.mancave show_name: false @@ -81,9 +81,8 @@ elements: action: toggle hold_action: action: more-info - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/master_bathroom.yaml b/lovelace/room_cards/master_bathroom.yaml index 321cf0f..9babd58 100644 --- a/lovelace/room_cards/master_bathroom.yaml +++ b/lovelace/room_cards/master_bathroom.yaml @@ -3,7 +3,7 @@ type: picture-elements image: /local/bg500x225.png elements: - type: custom:mushroom-template-card - primary: '{{states(''input_select.master_bathroom_mode'')}}' + primary: "{{states('input_select.master_bathroom_mode')}}" entity: input_select.master_bathroom_mode tap_action: action: more-info @@ -27,7 +27,7 @@ elements: text-align: right #Card title - type: custom:mushroom-title-card - title: 'Master Bathroom' + title: "Master Bathroom" style: font-size: 130% left: -2% @@ -35,12 +35,12 @@ elements: transform: initial #top left icon spot - type: state-icon - entity: binary_sensor.master_bathroom_occupied + entity: binary_sensor.bathroom_occupied style: left: 68% top: 9% # - type: state-icon - # entity: group.master_bathroom_motion + # entity: binary_sensor.master_bathroom_motion # style: # left: 68% # top: 9% @@ -55,7 +55,7 @@ elements: left: 76% top: 9% - type: state-icon - entity: switch.bathroom_vent_switch + entity: switch.master_bathroom_vent_switch style: left: 84% top: 9% @@ -65,7 +65,7 @@ elements: action: more-info #top icon spot #3 - type: state-icon - entity: input_boolean.master_bathroom_occupied + entity: input_boolean.bathroom_occupied style: left: 92% top: 9% @@ -75,7 +75,7 @@ elements: action: more-info #button #4 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.master_bathroom_hue show_name: false @@ -96,7 +96,7 @@ elements: action: more-info #button #5 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: media_player.bathroom_mini show_name: false @@ -114,9 +114,8 @@ elements: - height: 45px tap_action: action: more-info - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/room_cards/master_bedroom.yaml b/lovelace/room_cards/master_bedroom.yaml index 77eabd7..a39003f 100644 --- a/lovelace/room_cards/master_bedroom.yaml +++ b/lovelace/room_cards/master_bedroom.yaml @@ -35,13 +35,13 @@ elements: transform: initial #top left icon spot - type: state-icon - entity: binary_sensor.master_bedroom_occupied + entity: binary_sensor.bedroom_occupied style: left: 60% top: 9% #top left icon #2 spot # - type: state-icon - # entity: group.master_bedroom_motion + # entity: binary_sensor.master_bedroom_motion # style: # left: 60% # top: 9% @@ -73,7 +73,7 @@ elements: action: more-info #top icon spot #4 - type: state-icon - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied style: left: 92% top: 9% diff --git a/lovelace/room_cards/utility_room.yaml b/lovelace/room_cards/utility_room.yaml index 1c8f9b9..734b54d 100644 --- a/lovelace/room_cards/utility_room.yaml +++ b/lovelace/room_cards/utility_room.yaml @@ -3,7 +3,7 @@ type: picture-elements image: /local/bg500x225.png elements: - type: custom:mushroom-template-card - primary: '{{states(''input_select.utility_room_mode'')}}' + primary: "{{states('input_select.utility_room_mode')}}" entity: input_select.utility_room_mode tap_action: action: more-info @@ -13,13 +13,13 @@ elements: top: 88% - type: state-label - entity: sensor.utility_room_thermostat_temperature + entity: sensor.utility_room_multisensor_air_temperature style: left: 15% top: 35% font-size: 180% - type: state-label - entity: sensor.utility_room_thermostat_humidity + entity: sensor.utility_room_multisensor_relative_humidity style: left: 85% top: 35% @@ -27,7 +27,7 @@ elements: text-align: right #Card title - type: custom:mushroom-title-card - title: 'Utility Room' + title: "Utility Room" style: font-size: 130% left: -2% @@ -41,7 +41,7 @@ elements: top: 9% #top left icon #2 spot # - type: state-icon - # entity: group.utility_room_motion + # entity: binary_sensor.utility_room_motion # style: # left: 68% # top: 9% @@ -76,7 +76,7 @@ elements: action: more-info #button #1 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: light.utility_room_vanity show_name: false @@ -97,7 +97,7 @@ elements: hold_action: action: more-info #button #2 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: binary_sensor.washing_machine show_name: false @@ -116,7 +116,7 @@ elements: tap_action: action: more-info #button #3 - - type: 'custom:button-card' + - type: "custom:button-card" color: auto entity: binary_sensor.tumble_dryer show_name: false @@ -134,10 +134,8 @@ elements: - height: 30px tap_action: action: more-info - - # 12,31,50,69,88 # 14,38,62,86 # 25,50,75 # 33,66 -# 50 \ No newline at end of file +# 50 diff --git a/lovelace/stretch-cameras/back-yard-view.yaml b/lovelace/stretch-cameras/back-yard-view.yaml deleted file mode 100644 index 2f75986..0000000 --- a/lovelace/stretch-cameras/back-yard-view.yaml +++ /dev/null @@ -1,8 +0,0 @@ -title: Back Yard Camera -path: back-yard-camera -icon: mdi:slide -type: panel -cards: - - type: horizontal-stack - cards: - - !include /config/lovelace/stretch-cameras/back-yard-card.yaml diff --git a/lovelace/stretch-cameras/dual-camera-view.yaml b/lovelace/stretch-cameras/dual-camera-view.yaml deleted file mode 100644 index b7d0492..0000000 --- a/lovelace/stretch-cameras/dual-camera-view.yaml +++ /dev/null @@ -1,12 +0,0 @@ -title: Dual Cameras -path: dual-cameras -icon: mdi:home-switch -#panel: true -type: panel -cards: - - type: horizontal-stack - cards: - - !include /config/lovelace/stretch-cameras/indoor-camera-cycler.yaml - - !include /config/lovelace/stretch-cameras/outdoor-camera-cycler.yaml - # - !include /config/lovelace/stretch-cameras/indoor-camera-view.yaml - # - !include /config/lovelace/stretch-cameras/outdoor-camera-view.yaml \ No newline at end of file diff --git a/lovelace/templates/room-selector-vertical.yaml b/lovelace/templates/room-selector-vertical.yaml index eafc301..28e077c 100644 --- a/lovelace/templates/room-selector-vertical.yaml +++ b/lovelace/templates/room-selector-vertical.yaml @@ -76,4 +76,4 @@ cards: tap_action: action: navigate navigation_path: /cams-yml/mbr-camera - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied diff --git a/lovelace/templates/room-selector.yaml b/lovelace/templates/room-selector.yaml index fbddda2..7165fba 100644 --- a/lovelace/templates/room-selector.yaml +++ b/lovelace/templates/room-selector.yaml @@ -31,7 +31,7 @@ cards: tap_action: action: navigate navigation_path: /cams-yml/mbr-camera - entity: input_boolean.master_bedroom_occupied + entity: input_boolean.bedroom_occupied - show_name: true show_icon: true type: button diff --git a/lovelace/view-charts.yaml b/lovelace/view-charts.yaml index 81a40de..c49f3e4 100644 --- a/lovelace/view-charts.yaml +++ b/lovelace/view-charts.yaml @@ -330,7 +330,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.front_room_light_level + entity: sensor.front_room_hue_motion_sensor_illuminance name: Front Room icon_type: none - type: custom:mushroom-entity-card @@ -349,7 +349,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.entryway_light_level + entity: sensor.entryway_hue_motion_sensor_illuminance name: Entryway icon_type: none - type: custom:mushroom-entity-card @@ -425,7 +425,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.front_porch_light_level + entity: sensor.front_porch_hue_motion_sensor_illuminance name: Front Porch icon_type: none - type: custom:mushroom-entity-card @@ -444,7 +444,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.front_porch_light_level + entity: sensor.front_porch_hue_motion_sensor_illuminance name: Front Porch icon_type: none - type: custom:mushroom-entity-card @@ -463,7 +463,7 @@ cards: cards: - type: custom:mushroom-entity-card layout: vertical - entity: sensor.deck_light_level + entity: sensor.deck_hue_motion_sensor_illuminance name: Deck icon_type: none - type: custom:mushroom-entity-card diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index 4fcff80..1f0818f 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -52,9 +52,9 @@ cards: - input_boolean.kitchen_occupied - input_boolean.girls_room_occupied - input_boolean.girls_room_closet_occupied - - input_boolean.master_bedroom_occupied - - input_boolean.master_bathroom_occupied - - input_boolean.master_bedroom_closet_occupied + - input_boolean.bedroom_occupied + - input_boolean.bathroom_occupied + - input_boolean.bedroom_closet_occupied - input_boolean.garage_occupied - input_boolean.computer_area_occupied - input_boolean.great_room_occupied @@ -87,7 +87,7 @@ cards: class: bin-false - entities: - - binary_sensor.furnace_room_water_sensor_water_alarm_water_leak_detected + - binary_sensor.furnace_room_water_sensor_leak states: - state: "on" class: water-wet @@ -359,7 +359,7 @@ cards: - entities: - sensor.front_room_thermostat_temperature - sensor.front_room_ecobee_temperature - - sensor.entryway_temperature + - sensor.entryway_hue_motion_sensor_temperature - sensor.girls_room_multisensor_air_temperature - sensor.master_bedroom_multisensor_air_temperature - sensor.thermostat_temperature @@ -373,7 +373,7 @@ cards: - sensor.great_room_multisensor_air_temperature - sensor.dining_room_multisensor_air_temperature - sensor.furnace_room_thermostat_temperature - - sensor.front_room_hue_temperature + - sensor.front_room_hue_motion_sensor_temperature - sensor.upstairs_mean_temperature - sensor.downstairs_mean_temperature # text_template: '${entity.state ? entity.state : "unknown"} F' @@ -398,8 +398,8 @@ cards: # Outside is expected to be colder/hotter - entities: - sensor.front_yard_thermostat_temperature - - sensor.front_porch_temperature - - sensor.deck_temperature + - sensor.front_porch_hue_motion_sensor_temperature + - sensor.deck_hue_motion_sensor_temperature - sensor.garage_multisensor_air_temperature # - sensor.hvac_supply_temperature # - sensor.hvac_return_temperature @@ -541,15 +541,15 @@ cards: ' - entities: - - sensor.entryway_light_level - - sensor.front_porch_light_level - - sensor.deck_light_level + - sensor.entryway_hue_motion_sensor_illuminance + - sensor.front_porch_hue_motion_sensor_illuminance + - sensor.deck_hue_motion_sensor_illuminance - sensor.girls_room_multisensor_illuminance - sensor.master_bedroom_multisensor_illuminance - sensor.computer_area_multisensor_illuminance - sensor.great_room_multisensor_illuminance - sensor.garage_multisensor_illuminance - - sensor.front_room_light_level + - sensor.front_room_hue_motion_sensor_illuminance - sensor.kitchen_multisensor_illuminance - sensor.boys_room_multisensor_illuminance - sensor.dining_room_multisensor_illuminance @@ -604,7 +604,7 @@ cards: - light.front_room_splash_right - light.black_bed_wled - light.white_bed_wled - - light.dining_room_switch + - light.dining_room - light.master_bedroom_hue - light.computer_area_hue - light.great_room_hue @@ -628,7 +628,7 @@ cards: - light.furnace_room - light.storage_room - switch.utility_room_vent_switch - - switch.bathroom_vent_switch + - switch.master_bathroom_vent_switch states: - state: "on" class: "light-on" @@ -687,13 +687,13 @@ cards: class: "doorbell-off" - entities: - - binary_sensor.kitchen_motion_sensor_home_security_motion_detection - - binary_sensor.kitchen_multisensor_home_security_motion_detection + - binary_sensor.kitchen_motion_sensor_motion_detection + - binary_sensor.kitchen_multisensor_motion_detection - binary_sensor.girls_room_multisensor_motion_detection - - binary_sensor.master_bedroom_multisensor_home_security_motion_detection - - binary_sensor.master_bathroom_motion_switch_home_security_motion_detection - - binary_sensor.computer_area_multisensor_home_security_motion_detection - - binary_sensor.front_room_motion_sensor_home_security_motion_detection + - binary_sensor.master_bedroom_multisensor_motion_detection + - binary_sensor.master_bathroom_motion_switch_motion_detection + - binary_sensor.computer_area_multisensor_motion_detection + - binary_sensor.front_room_motion_sensor_motion_detection - binary_sensor.dining_room_multisensor_motion_detection - binary_sensor.front_porch_motion - binary_sensor.deck_motion @@ -707,20 +707,20 @@ cards: - binary_sensor.frigate_cam12_person_occupancy - binary_sensor.frigate_cam18_person_occupancy - binary_sensor.frigate_cam19_person_occupancy - - binary_sensor.great_room_multisensor_home_security_motion_detection - - binary_sensor.garage_multisensor_home_security_motion_detection - - binary_sensor.master_bedroom_closet_motion_switch_home_security_motion_detection + - binary_sensor.great_room_multisensor_motion_detection + - binary_sensor.garage_multisensor_motion_detection + - binary_sensor.master_bedroom_closet_motion_switch_motion_detection - binary_sensor.girls_room_closet_motion_switch_motion_detection - - binary_sensor.great_room_motion_switch_home_security_motion_detection - - binary_sensor.entryway_motion_switch_home_security_motion_detection - - binary_sensor.garage_motion_switch_home_security_motion_detection - - binary_sensor.front_room_motion_switch_home_security_motion_detection - - binary_sensor.utility_room_motion_switch_home_security_motion_detection - - binary_sensor.mancave_motion_switch_home_security_motion_detection - - binary_sensor.dining_room_motion_switch_home_security_motion_detection + - binary_sensor.great_room_motion_switch_motion_detection + - binary_sensor.entryway_motion_switch_motion_detection + - binary_sensor.garage_motion_switch_motion_detection + - binary_sensor.front_room_motion_switch_motion_detection + - binary_sensor.utility_room_motion_switch_motion_detection + - binary_sensor.mancave_motion_switch_motion_detection + - binary_sensor.dining_room_motion_switch_motion_detection - binary_sensor.boys_room_multisensor_motion_detection - binary_sensor.boys_room_motion_switch_motion_detection - - binary_sensor.furnace_room_motion_switch_home_security_motion_detection + - binary_sensor.furnace_room_motion_switch_motion_detection - binary_sensor.front_room_motion states: diff --git a/lovelace/view-information.yaml b/lovelace/view-information.yaml index c26a9e0..8a3cda0 100644 --- a/lovelace/view-information.yaml +++ b/lovelace/view-information.yaml @@ -48,7 +48,7 @@ cards: entities: - entity: input_select.master_bedroom_mode name: Master Bedroom - - entity: input_boolean.master_bedroom_occupied + - entity: input_boolean.bedroom_occupied name: Occupied tap_action: action: toggle @@ -60,7 +60,7 @@ cards: action: toggle - entity: input_select.master_bathroom_mode name: Master Bathroom - - entity: input_boolean.master_bathroom_occupied + - entity: input_boolean.bathroom_occupied name: Occupied tap_action: action: toggle diff --git a/lovelace/view-inputs.yaml b/lovelace/view-inputs.yaml index c758090..9eb6e63 100644 --- a/lovelace/view-inputs.yaml +++ b/lovelace/view-inputs.yaml @@ -5,163 +5,161 @@ visible: - user: 24a4bd075e7f41a497dd0390a1dd4a9f - user: cad46dedf86f454ebbd7f697a58730f2 cards: + - type: entities + title: Toggles for Automations + show_header_toggle: false + entities: + - input_boolean.bedtime + - input_boolean.teens_bedtime + - input_boolean.kids_bedtime + - input_boolean.asleep + - input_boolean.teens_asleep + - input_boolean.kids_asleep + - input_boolean.adults_away + - input_boolean.kids_away + - input_boolean.all_away + - input_boolean.home_occupied + - input_boolean.vacation_mode + - input_boolean.clint_home_alone + - input_select.weaver_kids + - input_select.podein_kids + - type: divider + #style: + # height: 3px + # width: 100% + # margin-left: auto + # margin-right: auto + # background: "var(--divider-color)" + - input_boolean.lighting_automations + - input_boolean.brightness_automations + - input_boolean.lights_off_manually + - type: divider + - input_boolean.guest_mode + - input_boolean.alarm_mode -- type: entities - title: Toggles for Automations - show_header_toggle: false - entities: - - input_boolean.bedtime - - input_boolean.teens_bedtime - - input_boolean.kids_bedtime - - input_boolean.asleep - - input_boolean.teens_asleep - - input_boolean.kids_asleep - - input_boolean.adults_away - - input_boolean.kids_away - - input_boolean.all_away - - input_boolean.home_occupied - - input_boolean.vacation_mode - - input_boolean.clint_home_alone - - input_select.weaver_kids - - input_select.podein_kids - - type: divider - #style: - # height: 3px - # width: 100% - # margin-left: auto - # margin-right: auto - # background: "var(--divider-color)" - - input_boolean.lighting_automations - - input_boolean.brightness_automations - - input_boolean.lights_off_manually - - type: divider - - input_boolean.guest_mode - - input_boolean.alarm_mode + - type: glance + title: Toggles for People Automations + columns: 3 + entities: + - entity: input_boolean.clint_home + tap_action: + action: toggle + - entity: input_boolean.clint_in_bed + tap_action: + action: toggle + - entity: input_boolean.clint_is_awake + tap_action: + action: toggle + - entity: input_boolean.emmett_home + tap_action: + action: toggle + - entity: input_boolean.emmett_in_bed + tap_action: + action: toggle + - entity: input_boolean.emmett_is_awake + tap_action: + action: toggle + - entity: input_boolean.bridget_home + tap_action: + action: toggle + - entity: input_boolean.bridget_in_bed + tap_action: + action: toggle + - entity: input_boolean.bridget_is_awake + tap_action: + action: toggle + - entity: input_boolean.kristy_home + tap_action: + action: toggle + - entity: input_boolean.kristy_in_bed + tap_action: + action: toggle + - entity: input_boolean.kristy_is_awake + tap_action: + action: toggle + - entity: input_boolean.marshall_home + tap_action: + action: toggle + - entity: input_boolean.marshall_in_bed + tap_action: + action: toggle + - entity: input_boolean.marshall_is_awake + tap_action: + action: toggle + - entity: input_boolean.tess_home + tap_action: + action: toggle + - entity: input_boolean.tess_in_bed + tap_action: + action: toggle + - entity: input_boolean.tess_is_awake + tap_action: + action: toggle + - entity: input_boolean.ebin_home + tap_action: + action: toggle + - entity: input_boolean.ebin_in_bed + tap_action: + action: toggle + - entity: input_boolean.ebin_is_awake + tap_action: + action: toggle + - entity: input_boolean.guest_home + tap_action: + action: toggle + - entity: input_boolean.guest_in_bed + tap_action: + action: toggle + - entity: input_boolean.guest_is_awake + tap_action: + action: toggle -- type: glance - title: Toggles for People Automations - columns: 3 - entities: - - entity: input_boolean.clint_home - tap_action: - action: toggle - - entity: input_boolean.clint_in_bed - tap_action: - action: toggle - - entity: input_boolean.clint_is_awake - tap_action: - action: toggle - - entity: input_boolean.emmett_home - tap_action: - action: toggle - - entity: input_boolean.emmett_in_bed - tap_action: - action: toggle - - entity: input_boolean.emmett_is_awake - tap_action: - action: toggle - - entity: input_boolean.bridget_home - tap_action: - action: toggle - - entity: input_boolean.bridget_in_bed - tap_action: - action: toggle - - entity: input_boolean.bridget_is_awake - tap_action: - action: toggle - - entity: input_boolean.kristy_home - tap_action: - action: toggle - - entity: input_boolean.kristy_in_bed - tap_action: - action: toggle - - entity: input_boolean.kristy_is_awake - tap_action: - action: toggle - - entity: input_boolean.marshall_home - tap_action: - action: toggle - - entity: input_boolean.marshall_in_bed - tap_action: - action: toggle - - entity: input_boolean.marshall_is_awake - tap_action: - action: toggle - - entity: input_boolean.tess_home - tap_action: - action: toggle - - entity: input_boolean.tess_in_bed - tap_action: - action: toggle - - entity: input_boolean.tess_is_awake - tap_action: - action: toggle - - entity: input_boolean.ebin_home - tap_action: - action: toggle - - entity: input_boolean.ebin_in_bed - tap_action: - action: toggle - - entity: input_boolean.ebin_is_awake - tap_action: - action: toggle - - entity: input_boolean.guest_home - tap_action: - action: toggle - - entity: input_boolean.guest_in_bed - tap_action: - action: toggle - - entity: input_boolean.guest_is_awake - tap_action: - action: toggle + - type: entities + title: People + show_header_toggle: false + entities: + - input_select.clint_status_dropdown + - input_select.emmett_status_dropdown + - input_select.bridget_status_dropdown + - input_select.kristy_status_dropdown + - input_select.marshall_status_dropdown + - input_select.tess_status_dropdown + - input_select.ebin_status_dropdown + - input_select.guest_status_dropdown -- type: entities - title: People - show_header_toggle: false - entities: - - input_select.clint_status_dropdown - - input_select.emmett_status_dropdown - - input_select.bridget_status_dropdown - - input_select.kristy_status_dropdown - - input_select.marshall_status_dropdown - - input_select.tess_status_dropdown - - input_select.ebin_status_dropdown - - input_select.guest_status_dropdown + - type: entities + title: Selections for Automations + show_header_toggle: false + entities: + - input_select.season + - sensor.season + - type: entities + title: Light Levels + show_header_toggle: false + entities: + - binary_sensor.is_dark + - binary_sensor.is_dim + - binary_sensor.is_daylight + - sensor.front_porch_hue_motion_sensor_illuminance -- type: entities - title: Selections for Automations - show_header_toggle: false - entities: - - input_select.season - - sensor.season + - type: glance + title: White Noise + entities: + - entity: input_boolean.master_bedroom_asleep + tap_action: + action: toggle + - entity: input_boolean.girls_room_asleep + tap_action: + action: toggle -- type: entities - title: Light Levels - show_header_toggle: false - entities: - - binary_sensor.is_dark - - binary_sensor.is_dim - - binary_sensor.is_daylight - - sensor.front_porch_light_level - -- type: glance - title: White Noise - entities: - - entity: input_boolean.master_bedroom_asleep - tap_action: - action: toggle - - entity: input_boolean.girls_room_asleep - tap_action: - action: toggle - -- type: entities - title: Misc - show_header_toggle: false - entities: - - input_boolean.allow_announcements - - input_boolean.out_of_bed_alert - - input_boolean.announce_bedtime - - input_boolean.guest_mode - - input_boolean.guest_home - - input_boolean.debug_snapshots \ No newline at end of file + - type: entities + title: Misc + show_header_toggle: false + entities: + - input_boolean.allow_announcements + - input_boolean.out_of_bed_alert + - input_boolean.announce_bedtime + - input_boolean.guest_mode + - input_boolean.guest_home + - input_boolean.debug_snapshots diff --git a/lovelace/view-more-charts.yaml b/lovelace/view-more-charts.yaml index 35bcd24..509de16 100644 --- a/lovelace/view-more-charts.yaml +++ b/lovelace/view-more-charts.yaml @@ -133,11 +133,11 @@ cards: name: Master Bedroom - entity: sensor.girls_room_multisensor_illuminance name: Nursery - - entity: sensor.front_room_light_level + - entity: sensor.front_room_hue_motion_sensor_illuminance name: Front Room - entity: sensor.dining_room_multisensor_illuminance name: Dining Room - - entity: sensor.entryway_light_level + - entity: sensor.entryway_hue_motion_sensor_illuminance name: Entryway - entity: sensor.kitchen_multisensor_illuminance name: Kitchen @@ -159,8 +159,8 @@ cards: type: history-graph - entities: - - entity: sensor.front_porch_light_level - - entity: sensor.deck_light_level + - entity: sensor.front_porch_hue_motion_sensor_illuminance + - entity: sensor.deck_hue_motion_sensor_illuminance hours_to_show: 12 refresh_interval: 60 title: Outdoor Light Level diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 4b3ec66..23cd2dc 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -9,7 +9,7 @@ badges: alignment: center chips: - type: weather - entity: weather.forecast_home + entity: weather.home show_conditions: true show_temperature: true tap_action: @@ -482,7 +482,7 @@ badges: state_not: "0" chip: type: template - entity: group.my_exterior_doors + entity: binary_sensor.exterior_doors icon: > {% if is_state('binary_sensor.patio_door_contact','on')-%} mdi:door-sliding-open @@ -1143,7 +1143,7 @@ cards: - entity: binary_sensor.utility_room_door_contact name: Utility - - entity: sensor.bathroom_vent_switch_node_status + - entity: sensor.master_bathroom_vent_switch_node_status name: Bathroom Vent - entity: sensor.boys_room_closet_switch_node_status @@ -1208,7 +1208,7 @@ cards: - entity: sensor.girls_room_multisensor_node_status name: Nursery MultiSensor - - entity: sensor.shower_switch_node_status + - entity: sensor.master_bathroom_switch_node_status name: Shower Switch - entity: sensor.storage_room_switch_node_status @@ -1233,8 +1233,8 @@ cards: name: Nursery - entity: camera.frigate_cam12 name: Kitchen - - entity: camera.frigate_cam13 - name: Front Room + # - entity: camera.frigate_cam13 + # name: Front Room # - entity: camera.frigate_cam14 # name: Back Yard - entity: camera.frigate_cam18 @@ -1382,13 +1382,13 @@ cards: camera_entity: camera.mail_usps_camera - type: custom:hourly-weather - entity: weather.kbiv + entity: weather.home icons: true name: "" hide_hours: false - type: custom:clock-weather-card - entity: weather.thermostat + entity: weather.home weather_icon_type: fill time_format: 12 date_pattern: DDDD diff --git a/scripts/cameras/cam03_sub_computer_area.yaml b/scripts/cameras/cam03_sub_computer_area.yaml index 1dcd8b9..9d9828e 100644 --- a/scripts/cameras/cam03_sub_computer_area.yaml +++ b/scripts/cameras/cam03_sub_computer_area.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.computer_area_hub - url: cam03_sub_opus + url: cam03_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/cam08_computer_area.yaml b/scripts/cameras/cam08_computer_area.yaml index 55dea5f..4883aba 100644 --- a/scripts/cameras/cam08_computer_area.yaml +++ b/scripts/cameras/cam08_computer_area.yaml @@ -3,6 +3,6 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.computer_area_hub - url: cam08_sub_opus + url: cam08_sub extra: mode: webrtc diff --git a/scripts/cameras/cam08_front_room.yaml b/scripts/cameras/cam08_front_room.yaml index 3ae8571..fc0112a 100644 --- a/scripts/cameras/cam08_front_room.yaml +++ b/scripts/cameras/cam08_front_room.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.front_room_hub - url: cam08_sub_opus + url: cam08_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/cam13_computer_area.yaml b/scripts/cameras/cam13_computer_area.yaml index dfc3dd7..9913142 100644 --- a/scripts/cameras/cam13_computer_area.yaml +++ b/scripts/cameras/cam13_computer_area.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.computer_area_hub - url: cam13_sub_opus + url: cam13_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/cam13_front_room.yaml b/scripts/cameras/cam13_front_room.yaml index dd7ad28..de102b8 100644 --- a/scripts/cameras/cam13_front_room.yaml +++ b/scripts/cameras/cam13_front_room.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.front_room_hub - url: cam13_sub_opus + url: cam13_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/cam19_computer_area.yaml b/scripts/cameras/cam19_computer_area.yaml index 23b4b5e..3cfeb09 100644 --- a/scripts/cameras/cam19_computer_area.yaml +++ b/scripts/cameras/cam19_computer_area.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.computer_area_hub - url: cam19_sub_opus + url: cam19_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/cam19_front_room.yaml b/scripts/cameras/cam19_front_room.yaml index 386a9fa..82409ff 100644 --- a/scripts/cameras/cam19_front_room.yaml +++ b/scripts/cameras/cam19_front_room.yaml @@ -3,7 +3,7 @@ sequence: - action: webrtc.dash_cast data: entity_id: media_player.front_room_hub - url: cam19_sub_opus + url: cam19_sub force: true extra: mode: webrtc diff --git a/scripts/cameras/create_camera_link.yaml b/scripts/cameras/create_camera_link.yaml index 7035628..859de55 100644 --- a/scripts/cameras/create_camera_link.yaml +++ b/scripts/cameras/create_camera_link.yaml @@ -8,7 +8,7 @@ sequence: link_id: "{{ link_id }}" # create a random or permanent link ID # url: rtsp://rtsp:12345678@192.168.1.123:554/av_stream/ch0 # entity: camera.sonoff # you can use camera entity_id or url - url: rtsp://192.168.1.7:8554/cam03_sub_opus + url: rtsp://192.168.1.7:8554/cam03_sub open_limit: 1 # how many times a link can be opened (0 - unlimit, 1 - default) time_to_live: 60 # how many seconds will the link live (0 - unlimit, 60 - default) diff --git a/scripts/house_alert.yaml b/scripts/house_alert.yaml index f2d9f52..c042106 100644 --- a/scripts/house_alert.yaml +++ b/scripts/house_alert.yaml @@ -24,7 +24,7 @@ sequence: data: media_player_entity_id: media_player.master_bedroom_clock message: >- - The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} + {{ (expand('binary_sensor.exterior_doors') | selectattr('state', 'eq', 'off')) | map(attribute='name') | list }} - delay: "00:00:02" # Wait for it to stop playing (2 minute timeout) - wait_template: "{{ is_state('media_player.master_bedroom_clock','idle') }}" diff --git a/ui-camera-cast.yaml b/ui-camera-cast.yaml deleted file mode 100644 index 1090aa8..0000000 --- a/ui-camera-cast.yaml +++ /dev/null @@ -1,18 +0,0 @@ -title: Camera Casting -icon: mdi:camcorder - -#custom_header: !include lovelace/custom_header.yaml -views: - - !include lovelace/stretch-cameras/dual-camera-view.yaml - - !include lovelace/stretch-cameras/girls-room-view.yaml - - !include lovelace/stretch-cameras/front-room-view.yaml - - !include lovelace/stretch-cameras/kitchen-view.yaml - - !include lovelace/stretch-cameras/computer-area-view.yaml - - !include lovelace/stretch-cameras/boys-room-view.yaml - - !include lovelace/stretch-cameras/garage-view.yaml - - !include lovelace/stretch-cameras/front-porch-view.yaml - - !include lovelace/stretch-cameras/front-yard-view.yaml - - !include lovelace/stretch-cameras/back-yard-view.yaml - - !include lovelace/stretch-cameras/master-bedroom-view.yaml - - !include lovelace/stretch-cameras/indoor-camera-view.yaml - - !include lovelace/stretch-cameras/outdoor-camera-view.yaml diff --git a/ui-cast.yaml b/ui-cast.yaml new file mode 100644 index 0000000..4e691f7 --- /dev/null +++ b/ui-cast.yaml @@ -0,0 +1,19 @@ +title: Casting +icon: mdi:cast + +#custom_header: !include lovelace/custom_header.yaml +views: + - !include lovelace/casting-cams/birds-eye-view.yaml + - !include lovelace/casting-cams/dual-camera-view.yaml + - !include lovelace/casting-cams/girls-room-view.yaml + - !include lovelace/casting-cams/front-room-view.yaml + - !include lovelace/casting-cams/kitchen-view.yaml + - !include lovelace/casting-cams/computer-area-view.yaml + - !include lovelace/casting-cams/boys-room-view.yaml + - !include lovelace/casting-cams/garage-view.yaml + - !include lovelace/casting-cams/front-porch-view.yaml + - !include lovelace/casting-cams/front-yard-view.yaml + - !include lovelace/casting-cams/back-yard-view.yaml + - !include lovelace/casting-cams/master-bedroom-view.yaml + - !include lovelace/casting-cams/indoor-camera-view.yaml + - !include lovelace/casting-cams/outdoor-camera-view.yaml diff --git a/www/floorplan/computer_area.svg b/www/floorplan/computer_area.svg index bd8c594..a139b0b 100644 --- a/www/floorplan/computer_area.svg +++ b/www/floorplan/computer_area.svg @@ -1072,7 +1072,7 @@ + inkscape:label="input_boolean.bathroom_occupied" /> + inkscape:label="input_boolean.bedroom_occupied" /> + inkscape:label="input_boolean.bedroom_closet_occupied" /> + inkscape:label="switch.master_bathroom_vent_switch"> + inkscape:label="binary_sensor.furnace_room_water_sensor_leak" /> ----------- @@ -3602,7 +3602,7 @@ sodipodi:arc-type="slice" />