diff --git a/automations/people/kids_asleep.yaml b/automations/people/kids_asleep.yaml index 8701103..6f6899e 100644 --- a/automations/people/kids_asleep.yaml +++ b/automations/people/kids_asleep.yaml @@ -50,37 +50,8 @@ action: data: entity_id: input_boolean.kids_asleep - - service: logbook.log - data_template: - name: Kids Asleep Asleep - entity_id: automation.kids_asleep - message: > - {% if trigger.entity_id == 'input_select.clint_status_dropdown' %} - input_select.clint_status_dropdown - {% elif trigger.entity_id == 'input_select.emmett_status_dropdown' %} - input_select.emmett_status_dropdown - {% elif trigger.entity_id == 'input_select.bridget_status_dropdown' %} - input_select.bridget_status_dropdown - {% elif trigger.entity_id == 'input_select.kristy_status_dropdown' %} - input_select.kristy_status_dropdown - {% elif trigger.entity_id == 'input_select.marshall_status_dropdown' %} - input_select.marshall_status_dropdown - {% elif trigger.entity_id == 'input_select.tess_status_dropdown' %} - input_select.tess_status_dropdown - {% elif trigger.entity_id == 'input_select.ebin_status_dropdown' %} - input_select.ebin_status_dropdown - {% else %} - input_select.guest_status_dropdown - {% endif %} - At least one of the kids is asleep. turning on kids_asleep default: - service: input_boolean.turn_off data: entity_id: input_boolean.kids_asleep - - service: logbook.log - data_template: - name: Kids Asleep - entity_id: automation.kids_asleep - message: > - None of the kids were asleep, defaulted to turning off kids_asleep diff --git a/automations/people/teens_asleep.yaml b/automations/people/teens_asleep.yaml index 0d8baa8..da0e544 100644 --- a/automations/people/teens_asleep.yaml +++ b/automations/people/teens_asleep.yaml @@ -38,20 +38,8 @@ action: data: entity_id: input_boolean.teens_asleep - - service: logbook.log - data_template: - name: Teens Asleep - entity_id: automation.teens_asleep - message: > - At least one of the teens is asleep. turning on teens_asleep default: - service: input_boolean.turn_off data: entity_id: input_boolean.teens_asleep - - service: logbook.log - data_template: - name: Teens Asleep - entity_id: automation.teens_asleep - message: > - None of the teens were asleep, defaulted to turning off teens_asleep diff --git a/automations/things/automatic_fan_speeds.yaml b/automations/things/automatic_fan_speeds.yaml index 4089eb0..46702f3 100644 --- a/automations/things/automatic_fan_speeds.yaml +++ b/automations/things/automatic_fan_speeds.yaml @@ -77,20 +77,20 @@ action: nursery_fan_speed: "{{((states('sensor.nursery_multisensor_air_temperature') | float(default=0) - states('input_number.nursery_fan_min_temp') | float(default=0))/(states('input_number.nursery_fan_high_temp') | float(default=1) - states('input_number.nursery_fan_min_temp') | float(default=0)) * 100)|int(default=0) }}" master_bedroom_fan_speed: "{{((states('sensor.master_bedroom_multisensor_air_temperature') | float(default=0) - states('input_number.master_bedroom_fan_min_temp') | float(default=0))/(states('input_number.master_bedroom_fan_high_temp') | float(default=1) - states('input_number.master_bedroom_fan_min_temp') | float(default=0)) * 100)|int(default=0) }}" - - service: logbook.log - data_template: - name: Automatic Fan Speeds - entity_id: automation.automatic_fan_speeds - message: > - Outdoor Air Temp: {{states('sensor.lacrosse_tx141thbv2_0_54_temperature') | float(default=0)}} - Nursery Air Temp: {{states('sensor.nursery_multisensor_air_temperature') | float(default=0)}} - Nursery Min Temp: {{states('input_number.nursery_fan_min_temp') | float(default=0)}} - Nursery High Temp: {{states('input_number.nursery_fan_high_temp') | float(default=0)}} - Nursery Calculated: {{ nursery_fan_speed }} - Master Bedroom Air Temp: {{states('sensor.master_bedroom_multisensor_air_temperature') | float(default=0)}} - Master Bedroom Min Temp: {{states('input_number.master_bedroom_fan_min_temp') | float(default=0)}} - Master Bedroom High Temp: {{states('input_number.master_bedroom_fan_high_temp') | float(default=0)}} - Master Bedroom Calculated: {{ master_bedroom_fan_speed }} + # - service: logbook.log + # data_template: + # name: Automatic Fan Speeds + # entity_id: automation.automatic_fan_speeds + # message: > + # Outdoor Air Temp: {{states('sensor.lacrosse_tx141thbv2_0_54_temperature') | float(default=0)}} + # Nursery Air Temp: {{states('sensor.nursery_multisensor_air_temperature') | float(default=0)}} + # Nursery Min Temp: {{states('input_number.nursery_fan_min_temp') | float(default=0)}} + # Nursery High Temp: {{states('input_number.nursery_fan_high_temp') | float(default=0)}} + # Nursery Calculated: {{ nursery_fan_speed }} + # Master Bedroom Air Temp: {{states('sensor.master_bedroom_multisensor_air_temperature') | float(default=0)}} + # Master Bedroom Min Temp: {{states('input_number.master_bedroom_fan_min_temp') | float(default=0)}} + # Master Bedroom High Temp: {{states('input_number.master_bedroom_fan_high_temp') | float(default=0)}} + # Master Bedroom Calculated: {{ master_bedroom_fan_speed }} - alias: "Set Nursery fan speed" choose: diff --git a/blueprints/template/homeassistant/inverted_binary_sensor.yaml b/blueprints/template/homeassistant/inverted_binary_sensor.yaml new file mode 100644 index 0000000..5be1840 --- /dev/null +++ b/blueprints/template/homeassistant/inverted_binary_sensor.yaml @@ -0,0 +1,27 @@ +blueprint: + name: Invert a binary sensor + description: Creates a binary_sensor which holds the inverted value of a reference binary_sensor + domain: template + source_url: https://github.com/home-assistant/core/blob/dev/homeassistant/components/template/blueprints/inverted_binary_sensor.yaml + input: + reference_entity: + name: Binary sensor to be inverted + description: The binary_sensor which needs to have its value inverted + selector: + entity: + domain: binary_sensor +variables: + reference_entity: !input reference_entity +binary_sensor: + state: > + {% if states(reference_entity) == 'on' %} + off + {% elif states(reference_entity) == 'off' %} + on + {% else %} + {{ states(reference_entity) }} + {% endif %} + # delay_on: not_used in this example + # delay_off: not_used in this example + # auto_off: not_used in this example + availability: "{{ states(reference_entity) not in ('unknown', 'unavailable') }}" diff --git a/components/cameras/blueiris_cameras.yaml b/components/cameras/blueiris_cameras.yaml deleted file mode 100644 index 43dd06f..0000000 --- a/components/cameras/blueiris_cameras.yaml +++ /dev/null @@ -1,112 +0,0 @@ -camera: -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam01 - name: Camera01 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam02 - name: Camera02 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam03 - name: Camera03 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam04 - name: Camera04 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam05 - name: Camera05 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam06 - name: Camera06 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam07 - name: Camera07 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam08 - name: Camera08 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam09 - name: Camera09 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/WyzeCube - name: WyzeCube - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Upstairs?/video.mjpg - name: Upstairs - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/@Upstairs?/video.mjpg - name: CycleUpstairs - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Downstairs?/video.mjpg - name: Downstairs - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/@Downstairs?/video.mjpg - name: CycleDownstairs - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/All?/video.mjpg - name: AllCameras - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/@All?/video.mjpg - name: CycleAllCameras - username: !secret bi_username - password: !secret bi_password - authentication: basic \ No newline at end of file diff --git a/components/cameras/cameras.yaml b/components/cameras/cameras.yaml deleted file mode 100644 index e21fe5b..0000000 --- a/components/cameras/cameras.yaml +++ /dev/null @@ -1,106 +0,0 @@ -#binary_sensor: !include_dir_list ../cameras - -camera: -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam01 - name: Camera01 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam02 - name: Camera02 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam03 - name: Camera03 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam04 - name: Camera04 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam05 - name: Camera05 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam06 - name: Camera06 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam07 - name: Camera07 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam08 - name: Camera08 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam09 - name: Camera09 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam10 - name: Camera10 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam11 - name: Camera11 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/Cam12 - name: Camera12 - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/All?/video.mjpg - name: AllCameras - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - mjpeg_url: http://192.168.1.7:81/mjpg/@All?/video.mjpg - name: CycleAllCameras - username: !secret bi_username - password: !secret bi_password - authentication: basic - -- platform: mjpeg - name: Octoprint - still_image_url: http://192.168.1.99/webcam/?action=snapshot - mjpeg_url: http://192.168.1.99/webcam/?action=stream - diff --git a/components/cameras/deepstack_cameras.yaml b/components/cameras/deepstack_cameras.yaml deleted file mode 100644 index 856d3ef..0000000 --- a/components/cameras/deepstack_cameras.yaml +++ /dev/null @@ -1,89 +0,0 @@ -camera: -- platform: local_file - name: Cam01 Person - file_path: /config/snapshots/cam01_person/cam01_person_latest.jpg - -- platform: local_file - name: Cam02 Person - file_path: /config/snapshots/cam02_person/cam02_person_latest.jpg - -- platform: local_file - name: Cam03 Person - file_path: /config/snapshots/cam03_person/cam03_person_latest.jpg - -- platform: local_file - name: Cam04 Person - file_path: /config/snapshots/cam04_person/cam04_person_latest.jpg - -- platform: local_file - name: Cam04 Vehicle - file_path: /config/snapshots/cam04_vehicle/cam04_vehicle_latest.jpg - -- platform: local_file - name: Cam05 Person - file_path: /config/snapshots/cam05_person/cam05_person_latest.jpg - -- platform: local_file - name: Cam06 Person - file_path: /config/snapshots/cam06_person/cam06_person_latest.jpg - -- platform: local_file - name: Cam07 Person - file_path: /config/snapshots/cam07_person/cam07_person_latest.jpg - -- platform: local_file - name: Cam08 Person - file_path: /config/snapshots/cam08_person/cam08_person_latest.jpg - -- platform: local_file - name: Cam09 Person - file_path: /config/snapshots/cam09_person/cam09_person_latest.jpg - -- platform: local_file - name: WyzeCube Person - file_path: /config/snapshots/wyzecube_person/wyzecube_person_latest.jpg - -#- platform: generic -# name: Cam01 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam01?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam02 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam02?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam03 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam03?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam04 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam04?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam05 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam05?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam06 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam06?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: Cam07 Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam07?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: nursery_camera Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/nursery_camera?q=50&user=deepstack&pw=deepstack - -#- platform: generic -# name: CamCar Snapshot -# still_image_url: >- -# http://192.168.1.32:81/image/Cam04?q=50&user=deepstack&pw=deepstack \ No newline at end of file diff --git a/components/cameras/octoprint_cameras.yaml b/components/cameras/octoprint_cameras.yaml deleted file mode 100644 index f058770..0000000 --- a/components/cameras/octoprint_cameras.yaml +++ /dev/null @@ -1,4 +0,0 @@ -platform: mjpeg -name: Octoprint -still_image_url: http://192.168.1.14/webcam/?action=snapshot -mjpeg_url: http://192.168.1.14/webcam/?action=stream \ No newline at end of file diff --git a/components/packages/cameras.yaml b/components/packages/cameras.yaml index 3be9642..9d20045 100644 --- a/components/packages/cameras.yaml +++ b/components/packages/cameras.yaml @@ -1,6 +1,6 @@ #binary_sensor: !include_dir_list ../cameras -camera: +# camera: # - platform: mjpeg # name: Octoprint # still_image_url: http://192.168.1.99/webcam/?action=snapshot @@ -20,33 +20,33 @@ camera: # authentication: basic - - platform: local_file - name: Emmett - file_path: /config/image/4b8a4e30436d64121be7b0b59f857877/512x512 + # - platform: local_file + # name: Emmett + # file_path: /config/image/4b8a4e30436d64121be7b0b59f857877/512x512 - - platform: local_file - name: Bridget - file_path: /config/image/4ce4447957c07525227b0574cbb1e40b/512x512 + # - platform: local_file + # name: Bridget + # file_path: /config/image/4ce4447957c07525227b0574cbb1e40b/512x512 - - platform: local_file - name: Clint - file_path: /config/image/ca19fa93140bf891d9a871858d910c69/512x512 + # - platform: local_file + # name: Clint + # file_path: /config/image/ca19fa93140bf891d9a871858d910c69/512x512 - - platform: local_file - name: Ebin - file_path: /config/image/80720d36ba13e7993b992ee2c8c76144/512x512 + # - platform: local_file + # name: Ebin + # file_path: /config/image/80720d36ba13e7993b992ee2c8c76144/512x512 - - platform: local_file - name: Kristy - file_path: /config/image/7dde65b227b3d96cb4546c9c2447db5d/512x512 + # - platform: local_file + # name: Kristy + # file_path: /config/image/7dde65b227b3d96cb4546c9c2447db5d/512x512 - - platform: local_file - name: Tess - file_path: /config/image/929bf1b71232216f9ed31d8dbdbd7a54/512x512 + # - platform: local_file + # name: Tess + # file_path: /config/image/929bf1b71232216f9ed31d8dbdbd7a54/512x512 - - platform: local_file - name: Marshall - file_path: /config/image/29196e13641d83e1c54656d88b272c7c/512x512 + # - platform: local_file + # name: Marshall + # file_path: /config/image/29196e13641d83e1c54656d88b272c7c/512x512 # amcrest: # - name: Back Yard diff --git a/lovelace/appliances/dishwasher.yaml b/lovelace/appliances/dishwasher.yaml index 3c746e0..d442e51 100644 --- a/lovelace/appliances/dishwasher.yaml +++ b/lovelace/appliances/dishwasher.yaml @@ -73,6 +73,8 @@ cards: - type: glance entities: - entity: input_boolean.empty_dishwasher + tap_action: + action: toggle - entity: sensor.pm_dishwasher_w - entity: input_number.dishwasher_delay_on - entity: input_number.dishwasher_on diff --git a/lovelace/appliances/keurig.yaml b/lovelace/appliances/keurig.yaml index 56e5766..d302bc2 100644 --- a/lovelace/appliances/keurig.yaml +++ b/lovelace/appliances/keurig.yaml @@ -73,6 +73,8 @@ cards: - type: glance entities: - entity: input_boolean.empty_dishwasher + tap_action: + action: toggle - entity: sensor.pm_dishwasher_w - entity: input_number.dishwasher_delay_on - entity: input_number.dishwasher_on diff --git a/lovelace/appliances/tumble-dryer.yaml b/lovelace/appliances/tumble-dryer.yaml index 36d5ee8..a21211c 100644 --- a/lovelace/appliances/tumble-dryer.yaml +++ b/lovelace/appliances/tumble-dryer.yaml @@ -72,6 +72,8 @@ cards: - type: glance entities: - entity: input_boolean.fold_clothes + tap_action: + action: toggle - entity: sensor.pm_dryer_w - entity: input_number.tumble_dryer_delay_on - entity: input_number.tumble_dryer_on diff --git a/lovelace/appliances/washing-machine.yaml b/lovelace/appliances/washing-machine.yaml index 1f6f0dc..546af6a 100644 --- a/lovelace/appliances/washing-machine.yaml +++ b/lovelace/appliances/washing-machine.yaml @@ -73,6 +73,8 @@ cards: - type: glance entities: - entity: input_boolean.swap_laundry + tap_action: + action: toggle - entity: sensor.pm_laundry_plug_w - entity: input_number.washing_machine_delay_on - entity: input_number.washing_machine_on diff --git a/lovelace/cameras/view-camera-01.yaml b/lovelace/cameras/view-camera-01.yaml index f6893d2..842016b 100644 --- a/lovelace/cameras/view-camera-01.yaml +++ b/lovelace/cameras/view-camera-01.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam01 live_provider: go2rtc @@ -12,9 +18,6 @@ cards: title: Blue Room id: blue_room live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false @@ -36,7 +39,7 @@ cards: 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 @@ -148,4 +151,4 @@ cards: top: 7% left: 82% tap_action: - action: toggle \ No newline at end of file + action: toggle diff --git a/lovelace/cameras/view-camera-03.yaml b/lovelace/cameras/view-camera-03.yaml index 56773cd..e611402 100644 --- a/lovelace/cameras/view-camera-03.yaml +++ b/lovelace/cameras/view-camera-03.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam03 live_provider: go2rtc @@ -12,9 +18,6 @@ cards: title: Computer Area id: computer_area live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-04.yaml b/lovelace/cameras/view-camera-04.yaml index 92e682e..4622678 100644 --- a/lovelace/cameras/view-camera-04.yaml +++ b/lovelace/cameras/view-camera-04.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam04 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam04_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-06.yaml b/lovelace/cameras/view-camera-06.yaml index 6e0f952..e6bc263 100644 --- a/lovelace/cameras/view-camera-06.yaml +++ b/lovelace/cameras/view-camera-06.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam06 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam06_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-07.yaml b/lovelace/cameras/view-camera-07.yaml index 21a1cb9..28eb44f 100644 --- a/lovelace/cameras/view-camera-07.yaml +++ b/lovelace/cameras/view-camera-07.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam07 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam07_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml index 7268180..ccc23fc 100644 --- a/lovelace/cameras/view-camera-08.yaml +++ b/lovelace/cameras/view-camera-08.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam08 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam08_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-12.yaml b/lovelace/cameras/view-camera-12.yaml index 2551457..cd25d2d 100644 --- a/lovelace/cameras/view-camera-12.yaml +++ b/lovelace/cameras/view-camera-12.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam12 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam12_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-13.yaml b/lovelace/cameras/view-camera-13.yaml index 0aaf07a..b6a79ae 100644 --- a/lovelace/cameras/view-camera-13.yaml +++ b/lovelace/cameras/view-camera-13.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam13 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam13_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index 81e5473..7c48db6 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam14 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam14_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: false diff --git a/lovelace/cameras/view-camera-18.yaml b/lovelace/cameras/view-camera-18.yaml index 778e51e..77d423d 100644 --- a/lovelace/cameras/view-camera-18.yaml +++ b/lovelace/cameras/view-camera-18.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam18 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam18_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: true diff --git a/lovelace/cameras/view-camera-19.yaml b/lovelace/cameras/view-camera-19.yaml index 8bcd254..0ee527f 100644 --- a/lovelace/cameras/view-camera-19.yaml +++ b/lovelace/cameras/view-camera-19.yaml @@ -1,6 +1,12 @@ type: vertical-stack cards: - type: custom:frigate-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none cameras: - camera_entity: camera.frigate_cam19 live_provider: go2rtc @@ -9,9 +15,6 @@ cards: - webrtc stream: rtsp_cam19_sub live: - auto_mute: all - layout: - fit: fill preload: true draggable: true show_image_during_load: true diff --git a/lovelace/details/view-nws-alerts.yaml b/lovelace/details/view-nws-alerts.yaml index 8360abb..f9e8a23 100644 --- a/lovelace/details/view-nws-alerts.yaml +++ b/lovelace/details/view-nws-alerts.yaml @@ -18,15 +18,11 @@ cards: content: | --- # NWS First Active Alert - {% if state_attr('sensor.nws_alerts', 'title') != None and state_attr('sensor.nws_alerts', 'title').split(' - ')[0] is defined %} - ## {{ states.sensor.nws_alerts.attributes.title.split(' - ')[0] }} + ## {{ state_attr('sensor.nws_alerts', 'Alerts')[0].Headline }} - {{ state_attr('sensor.nws_alerts', 'display_desc').split('\n\n-\n\n')[0] }} + {{ state_attr('sensor.nws_alerts', 'Alerts')[0].Description }} - {% else %} - none - {% endif %} - type: conditional conditions: - entity: sensor.nws_alerts diff --git a/lovelace/view-automations_clint.yaml b/lovelace/view-automations_clint.yaml index 210912f..9034971 100644 --- a/lovelace/view-automations_clint.yaml +++ b/lovelace/view-automations_clint.yaml @@ -10,7 +10,7 @@ cards: - type: picture-glance entities: - input_boolean.clint_home - camera_image: camera.google_photos_clint_media + camera_image: camera.clint - type: entities title: Automations for Clint show_header_toggle: false diff --git a/lovelace/view-automations_kristy.yaml b/lovelace/view-automations_kristy.yaml index 0c212ad..88db091 100644 --- a/lovelace/view-automations_kristy.yaml +++ b/lovelace/view-automations_kristy.yaml @@ -10,7 +10,7 @@ cards: - type: picture-glance entities: - input_boolean.kristy_home - camera_image: camera.google_photos_kristy_media + camera_image: camera.kristy - type: entities title: Automations for Kristy show_header_toggle: false diff --git a/lovelace/view-big_kids.yaml b/lovelace/view-big_kids.yaml index 9c37962..1cb78e7 100644 --- a/lovelace/view-big_kids.yaml +++ b/lovelace/view-big_kids.yaml @@ -9,7 +9,7 @@ cards: - type: picture-glance entities: - input_boolean.marshall_home - camera_image: camera.google_photos_marshall_media + camera_image: camera.marshall - type: entities title: Marshall @@ -30,7 +30,7 @@ cards: - type: picture-glance entities: - input_boolean.tess_home - camera_image: camera.google_photos_tess_media + camera_image: camera.tess - type: entities title: Tess show_header_toggle: false diff --git a/lovelace/view-little_kids.yaml b/lovelace/view-little_kids.yaml index fa64b94..cde5f7c 100644 --- a/lovelace/view-little_kids.yaml +++ b/lovelace/view-little_kids.yaml @@ -19,7 +19,7 @@ cards: - type: picture-glance entities: - input_boolean.emmett_home - camera_image: camera.google_photos_emmett_media + camera_image: camera.emmett - type: entities title: Emmett @@ -40,7 +40,7 @@ cards: - type: picture-glance entities: - input_boolean.bridget_home - camera_image: camera.google_photos_bridget_media + camera_image: camera.bridget - type: entities title: Bridget show_header_toggle: false @@ -60,7 +60,7 @@ cards: - type: picture-glance entities: - input_boolean.ebin_home - camera_image: camera.google_photos_ebin_media + camera_image: camera.ebin - type: entities title: Ebin show_header_toggle: false diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 6147561..c3ad22f 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -743,19 +743,19 @@ badges: entities: - entity: sensor.nursery_thermal_comfort_humidex_perception name: Nursery - icon: tc:thermal-perception + icon: mdi:bunk-bed tap_action: action: navigate navigation_path: /details-yml/hvac - entity: sensor.master_bedroom_thermal_comfort_humidex_perception name: Bedroom - icon: tc:thermal-perception + icon: mdi:bed-queen tap_action: action: navigate navigation_path: /details-yml/hvac - entity: sensor.great_room_thermal_comfort_humidex_perception name: Great Room - icon: tc:thermal-perception + icon: mdi:microsoft-xbox-controller tap_action: action: navigate navigation_path: /details-yml/hvac diff --git a/lovelace/view-people.yaml b/lovelace/view-people.yaml index 22b9bea..57dc06b 100644 --- a/lovelace/view-people.yaml +++ b/lovelace/view-people.yaml @@ -14,7 +14,7 @@ cards: - input_boolean.clint_is_awake - binary_sensor.clint_work_from_home - input_boolean.clint_work_from_home - camera_image: camera.google_photos_clint_media + camera_image: camera.clint tap_action: action: call-service service: input_boolean.toggle @@ -54,7 +54,7 @@ cards: - input_boolean.emmett_is_awake - binary_sensor.emmetts_bed #image: /local/Emmett.jpg - camera_image: camera.google_photos_emmett_media + camera_image: camera.emmett tap_action: action: call-service service: input_boolean.toggle @@ -90,7 +90,7 @@ cards: - input_boolean.bridget_in_bed - input_boolean.bridget_is_awake - binary_sensor.bridgets_bed - camera_image: camera.google_photos_bridget_media + camera_image: camera.bridget tap_action: action: call-service service: input_boolean.toggle diff --git a/themes/mushroom/mushroom-square-shadow.yaml b/themes/mushroom/mushroom-square-shadow.yaml index 19d54c9..d1449af 100644 --- a/themes/mushroom/mushroom-square-shadow.yaml +++ b/themes/mushroom/mushroom-square-shadow.yaml @@ -6,8 +6,8 @@ Mushroom Square Shadow: # Home Assistant override ha-card-box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.16) ha-card-border-width: 0 - # Home Assistant override ha-card-border-radius: 6px + ha-badge-border-radius: 6px # Layout mush-spacing: 8px # Elements diff --git a/themes/mushroom/mushroom-square.yaml b/themes/mushroom/mushroom-square.yaml index 518487e..00f90c3 100644 --- a/themes/mushroom/mushroom-square.yaml +++ b/themes/mushroom/mushroom-square.yaml @@ -5,6 +5,7 @@ Mushroom Square: # Home Assistant override ha-card-border-radius: 6px + ha-badge-border-radius: 6px # Layout mush-spacing: 8px # Elements