diff --git a/automations/cameras/camera6_presets.yaml b/automations/cameras/camera6_presets.yaml deleted file mode 100644 index 2c264ff..0000000 --- a/automations/cameras/camera6_presets.yaml +++ /dev/null @@ -1,52 +0,0 @@ -alias: Camera06 Preset -id: automation_camera06_preset -mode: restart - -trigger: - - platform: state - entity_id: input_select.camera_06 - - - platform: homeassistant - event: start - - - platform: time_pattern - minutes: "/30" - -action: - - choose: - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Static" - sequence: - - action: shell_command.master_bedroom_left_preset_1 - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Door" - sequence: - - action: shell_command.master_bedroom_left_preset_3 - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Bed" - sequence: - - action: shell_command.master_bedroom_left_preset_3 - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Window" - sequence: - - action: shell_command.master_bedroom_left_preset_2 - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Floor" - sequence: - - action: shell_command.master_bedroom_left_preset_4 - - conditions: - - condition: state - entity_id: input_select.camera_06 - state: "Privacy" - sequence: - - action: shell_command.master_bedroom_left_preset_5 diff --git a/automations/cameras/camera7_presets.yaml b/automations/cameras/camera7_presets.yaml deleted file mode 100644 index 45fd681..0000000 --- a/automations/cameras/camera7_presets.yaml +++ /dev/null @@ -1,52 +0,0 @@ -alias: Camera07 Preset -id: automation_camera07_preset -mode: restart - -trigger: - - platform: state - entity_id: input_select.camera_07 - - - platform: homeassistant - event: start - - - platform: time_pattern - minutes: "/30" - -action: - - choose: - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Static" - sequence: - - action: shell_command.master_bedroom_right_preset_2 - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Door" - sequence: - - action: shell_command.master_bedroom_right_preset_1 - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Bed" - sequence: - - action: shell_command.master_bedroom_right_preset_3 - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Window" - sequence: - - action: shell_command.master_bedroom_right_preset_2 - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Floor" - sequence: - - action: shell_command.master_bedroom_right_preset_4 - - conditions: - - condition: state - entity_id: input_select.camera_07 - state: "Privacy" - sequence: - - action: shell_command.master_bedroom_right_preset_5 diff --git a/automations/cameras/frigate_recordings.yaml b/automations/cameras/frigate_recordings.yaml deleted file mode 100644 index d935e9c..0000000 --- a/automations/cameras/frigate_recordings.yaml +++ /dev/null @@ -1,108 +0,0 @@ -alias: Frigate Recordings -id: automation_frigate_recordings -mode: restart - -trigger: - - platform: homeassistant - event: start - - - id: automatic - platform: time_pattern - minutes: "/10" - - - id: boolean - platform: state - entity_id: input_boolean.debug_recordings - - - id: indoors - platform: state - entity_id: input_boolean.indoor_recordings - - - id: outdoors - platform: state - entity_id: input_boolean.outdoor_recordings - -action: - - choose: - - conditions: - - condition: state - entity_id: input_boolean.debug_recordings - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam01_recordings - - switch.frigate_cam03_recordings - - switch.frigate_cam04_recordings - - switch.frigate_cam06_recordings - - switch.frigate_cam07_recordings - - switch.frigate_cam08_recordings - - switch.frigate_cam12_recordings - # - switch.frigate_cam13_recordings - # - switch.frigate_cam14_recordings - - switch.frigate_cam18_recordings - - switch.frigate_cam19_recordings - - - choose: - - conditions: - - condition: state - entity_id: input_boolean.indoor_recordings - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam01_recordings - - switch.frigate_cam03_recordings - - switch.frigate_cam06_recordings - - switch.frigate_cam07_recordings - - switch.frigate_cam08_recordings - - switch.frigate_cam12_recordings - # - switch.frigate_cam13_recordings - - conditions: - - condition: state - entity_id: input_boolean.indoor_recordings - state: "off" - sequence: - - action: switch.turn_off - data: {} - target: - entity_id: - - switch.frigate_cam01_recordings - - switch.frigate_cam03_recordings - - switch.frigate_cam06_recordings - - switch.frigate_cam07_recordings - - switch.frigate_cam08_recordings - - switch.frigate_cam12_recordings - # - switch.frigate_cam13_recordings - - - choose: - - conditions: - - condition: state - entity_id: input_boolean.outdoor_recordings - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam04_recordings - # - switch.frigate_cam14_recordings - - switch.frigate_cam18_recordings - - switch.frigate_cam19_recordings - - conditions: - - condition: state - entity_id: input_boolean.outdoor_recordings - state: "off" - sequence: - - action: switch.turn_off - data: {} - target: - entity_id: - - switch.frigate_cam04_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 deleted file mode 100644 index 44c2922..0000000 --- a/automations/cameras/frigate_snapshots.yaml +++ /dev/null @@ -1,108 +0,0 @@ -alias: Frigate Snapshots -id: automation_frigate_snapshots -mode: restart - -trigger: - - platform: homeassistant - event: start - - - id: automatic - platform: time_pattern - minutes: "/10" - - - id: boolean - platform: state - entity_id: input_boolean.debug_snapshots - - - id: indoors - platform: state - entity_id: input_boolean.indoor_snapshots - - - id: outdoors - platform: state - entity_id: input_boolean.outdoor_snapshots - -action: - - choose: - - conditions: - - condition: state - entity_id: input_boolean.debug_snapshots - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam01_snapshots - - switch.frigate_cam03_snapshots - - switch.frigate_cam04_snapshots - - switch.frigate_cam06_snapshots - - switch.frigate_cam07_snapshots - - switch.frigate_cam08_snapshots - - switch.frigate_cam12_snapshots - # - switch.frigate_cam13_snapshots - # - switch.frigate_cam14_snapshots - - switch.frigate_cam18_snapshots - - switch.frigate_cam19_snapshots - - - choose: - - conditions: - - condition: state - entity_id: input_boolean.indoor_snapshots - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam01_snapshots - - switch.frigate_cam03_snapshots - - switch.frigate_cam06_snapshots - - switch.frigate_cam07_snapshots - - switch.frigate_cam08_snapshots - - switch.frigate_cam12_snapshots - # - switch.frigate_cam13_snapshots - - conditions: - - condition: state - entity_id: input_boolean.indoor_snapshots - state: "off" - sequence: - - action: switch.turn_off - data: {} - target: - entity_id: - - switch.frigate_cam01_snapshots - - switch.frigate_cam03_snapshots - - switch.frigate_cam06_snapshots - - switch.frigate_cam07_snapshots - - switch.frigate_cam08_snapshots - - switch.frigate_cam12_snapshots - # - switch.frigate_cam13_snapshots - - - choose: - - conditions: - - condition: state - entity_id: input_boolean.outdoor_snapshots - state: "on" - sequence: - - action: switch.turn_on - data: {} - target: - entity_id: - - switch.frigate_cam04_snapshots - # - switch.frigate_cam14_snapshots - - switch.frigate_cam18_snapshots - - switch.frigate_cam19_snapshots - - conditions: - - condition: state - entity_id: input_boolean.outdoor_snapshots - state: "off" - sequence: - - action: switch.turn_off - data: {} - target: - entity_id: - - switch.frigate_cam04_snapshots - # - switch.frigate_cam14_snapshots - - switch.frigate_cam18_snapshots - - switch.frigate_cam19_snapshots diff --git a/automations/people/Clint/Clint_WFH.yaml b/automations/people/Clint/Clint_WFH.yaml index f2ff9b2..11932fa 100644 --- a/automations/people/Clint/Clint_WFH.yaml +++ b/automations/people/Clint/Clint_WFH.yaml @@ -18,6 +18,8 @@ action: sequence: - action: homeassistant.turn_on entity_id: input_boolean.clint_work_from_home + - action: homeassistant.turn_off + entity_id: input_boolean.allow_announcements - conditions: - condition: state entity_id: binary_sensor.clint_work_from_home @@ -25,3 +27,5 @@ action: sequence: - action: homeassistant.turn_off entity_id: input_boolean.clint_work_from_home + - action: homeassistant.turn_on + entity_id: input_boolean.allow_announcements 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 74c3937..ae0e6f1 100644 --- a/automations/rooms/boys_room/boys_room_out_of_bed.yaml +++ b/automations/rooms/boys_room/boys_room_out_of_bed.yaml @@ -95,31 +95,28 @@ action: entity_id: binary_sensor.computer_area_occupied state: "on" sequence: - - action: media_player.play_media - target: - entity_id: media_player.computer_area_hub + - action: dash_cast.load_url 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 + force: true + url: http://192.168.1.7:1984/stream.html?src=cam01_sub + # - action: media_player.play_media + # target: # entity_id: media_player.computer_area_hub - # url: cam01_sub - # 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 - choose: - conditions: @@ -127,67 +124,31 @@ action: entity_id: binary_sensor.front_room_occupied state: "on" sequence: - - action: media_player.play_media - target: - entity_id: media_player.front_room_hub + - action: dash_cast.load_url 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 + force: true + url: http://192.168.1.7:1984/stream.html?src=cam01_sub + # - action: media_player.play_media + # target: # entity_id: media_player.front_room_hub - # url: cam01_sub - # 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 - delay: "00:10:00" - action: media_player.turn_off entity_id: media_player.front_room_hub, media_player.computer_area_hub - # - alias: "Flash some lights" - # repeat: - # count: 6 - # sequence: - # - delay: 1 - # - action: light.toggle - # target: - # entity_id: - # - light.entryway_hue - # - light.computer_area_hue - # - light.front_room_hue - #- delay: '00:00:02' - - # - alias: "Fix computer area lights" - # action: automation.trigger - # target: - # entity_id: "automation.computer_area_lights_to_{{ computer_area }}" - # data: - # skip_condition: true - - # - alias: "Fix front room lights" - # action: automation.trigger - # target: - # entity_id: "automation.front_room_lights_to_{{ front_room }}" - # data: - # skip_condition: true - - # - alias: "Fix entryway lights" - # action: automation.trigger - # target: - # entity_id: "automation.entryway_lights_to_{{ entryway }}" - # data: - # skip_condition: true 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 f1f2a35..cadea7e 100644 --- a/automations/rooms/girls_room/girls_room_out_of_bed.yaml +++ b/automations/rooms/girls_room/girls_room_out_of_bed.yaml @@ -10,11 +10,6 @@ trigger: from: "on" to: "off" for: "00:00:05" - - trigger: state - entity_id: binary_sensor.white_bed_occupied - from: "on" - to: "off" - for: "00:00:05" - trigger: state entity_id: binary_sensor.girls_room_door from: "off" @@ -100,13 +95,37 @@ action: entity_id: binary_sensor.computer_area_occupied state: "on" sequence: - - action: webrtc.dash_cast + - action: dash_cast.load_url data: entity_id: media_player.computer_area_hub - url: cam08_sub force: true - extra: - mode: webrtc + url: http://192.168.1.7:1984/stream.html?src=cam03_sub + + # - action: media_player.play_media + # target: + # entity_id: media_player.computer_area_hub + # data: + # media: + # media_content_id: media-source://camera/camera.frigate_cam03 + # media_content_type: image/jpeg + # metadata: + # title: Frigate Cam03 + # thumbnail: /api/camera_proxy/camera.frigate_cam03 + # 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: cam08_sub + # force: true + # extra: + # mode: webrtc - choose: - conditions: @@ -114,13 +133,36 @@ action: entity_id: binary_sensor.front_room_occupied state: "on" sequence: - - action: webrtc.dash_cast + - action: dash_cast.load_url data: entity_id: media_player.front_room_hub - url: cam08_sub force: true - extra: - mode: webrtc + url: http://192.168.1.7:1984/stream.html?src=cam03_sub + # - action: media_player.play_media + # target: + # entity_id: media_player.front_room_hub + # data: + # media: + # media_content_id: media-source://camera/camera.frigate_cam08 + # media_content_type: image/jpeg + # metadata: + # title: Frigate Cam08 + # thumbnail: /api/camera_proxy/camera.frigate_cam08 + # 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: cam08_sub + # force: true + # extra: + # mode: webrtc - delay: "00:10:00" diff --git a/blueprints/automation/clevertwain/adaptive_lights.yaml b/blueprints/automation/clevertwain/adaptive_lights.yaml new file mode 100644 index 0000000..5db4992 --- /dev/null +++ b/blueprints/automation/clevertwain/adaptive_lights.yaml @@ -0,0 +1,56 @@ +# alias: "Adaptive Lights: Kitchen" +# description: "" +# triggers: +# - trigger: state +# entity_id: +# - binary_sensor.kitchen_motion +# - binary_sensor.kitchen_presence +# to: +# - "on" +# id: Motion or Presence +# alias: Motion or Presence +# - trigger: event +# event_type: timer.finished +# event_data: +# entity_id: timer.kitchen_lights +# id: Timer finished +# alias: Kitchen Lights Timer Finished +# conditions: [] +# actions: +# - alias: Turn on the lights, start the timer, or turn off the lights? +# choose: +# - conditions: +# - condition: trigger +# id: +# - Motion or Presence +# sequence: +# - if: +# - condition: state +# entity_id: switch.adaptive_lighting_kitchen_northern +# state: +# - "off" +# then: +# - action: switch.turn_on +# metadata: {} +# target: +# entity_id: switch.adaptive_lighting_kitchen_northern +# data: {} +# alias: Turn on the light, if needed +# - action: timer.start +# metadata: {} +# target: +# entity_id: timer.kitchen_lights +# data: {} +# alias: Occupancy with the lights off +# - conditions: +# - condition: trigger +# id: +# - Timer finished +# sequence: +# - action: switch.turn_off +# metadata: {} +# target: +# entity_id: switch.adaptive_lighting_kitchen_northern +# data: {} +# alias: Timer finished so turn off the lights +# mode: single diff --git a/components/input_selects/automatic_light_profile.yaml b/components/input_selects/automatic_light_profile.yaml index 0463eba..01360a2 100644 --- a/components/input_selects/automatic_light_profile.yaml +++ b/components/input_selects/automatic_light_profile.yaml @@ -8,4 +8,5 @@ options: - 'Dimmed' - 'Rest' - 'Nightlight' - - 'Natural light' \ No newline at end of file + - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/cameras/camera_01.yaml b/components/input_selects/cameras/camera_01.yaml deleted file mode 100644 index f10b479..0000000 --- a/components/input_selects/cameras/camera_01.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera01 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_02.yaml b/components/input_selects/cameras/camera_02.yaml deleted file mode 100644 index d97b924..0000000 --- a/components/input_selects/cameras/camera_02.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera02 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_03.yaml b/components/input_selects/cameras/camera_03.yaml deleted file mode 100644 index 2c01cbe..0000000 --- a/components/input_selects/cameras/camera_03.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera03 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_04.yaml b/components/input_selects/cameras/camera_04.yaml deleted file mode 100644 index 67700e9..0000000 --- a/components/input_selects/cameras/camera_04.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera04 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_05.yaml b/components/input_selects/cameras/camera_05.yaml deleted file mode 100644 index ec7604d..0000000 --- a/components/input_selects/cameras/camera_05.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera05 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_06.yaml b/components/input_selects/cameras/camera_06.yaml deleted file mode 100644 index 7a53322..0000000 --- a/components/input_selects/cameras/camera_06.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: Camera06 Preset -options: - - Static - - #1 Zoomed out bed - s/b door - #2 Zoomed in a bit bed -s/b bed - #3 = 1 - s/b window - #4 floor -s/b floor - #5 privacy -s/b privacy \ No newline at end of file diff --git a/components/input_selects/cameras/camera_06_and_07.yaml b/components/input_selects/cameras/camera_06_and_07.yaml deleted file mode 100644 index a922c45..0000000 --- a/components/input_selects/cameras/camera_06_and_07.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: Camera06 and Camera07 Preset -options: - - Door - - Bed - - Window - - Floor - - Privacy \ No newline at end of file diff --git a/components/input_selects/cameras/camera_07.yaml b/components/input_selects/cameras/camera_07.yaml deleted file mode 100644 index 49509b9..0000000 --- a/components/input_selects/cameras/camera_07.yaml +++ /dev/null @@ -1,9 +0,0 @@ -name: Camera07 Preset -options: - - Static - -# 1 bed - s/b door -# 2 sleeping - s/b bed -# 3 better-ish bed - s/b window -# 4 floor - s/b floor -# 5 privacy - s/b privacy \ No newline at end of file diff --git a/components/input_selects/cameras/camera_08.yaml b/components/input_selects/cameras/camera_08.yaml deleted file mode 100644 index 06552ce..0000000 --- a/components/input_selects/cameras/camera_08.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera08 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_09.yaml b/components/input_selects/cameras/camera_09.yaml deleted file mode 100644 index c84cf22..0000000 --- a/components/input_selects/cameras/camera_09.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera09 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/cameras/camera_10.yaml b/components/input_selects/cameras/camera_10.yaml deleted file mode 100644 index 6e5a614..0000000 --- a/components/input_selects/cameras/camera_10.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera 10 Preset -options: - - 'Static' \ No newline at end of file diff --git a/components/input_selects/cameras/camera_11.yaml b/components/input_selects/cameras/camera_11.yaml deleted file mode 100644 index f772670..0000000 --- a/components/input_selects/cameras/camera_11.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera 11 Preset -options: - - 'Static' \ No newline at end of file diff --git a/components/input_selects/cameras/camera_12.yaml b/components/input_selects/cameras/camera_12.yaml deleted file mode 100644 index bd4d8e5..0000000 --- a/components/input_selects/cameras/camera_12.yaml +++ /dev/null @@ -1,3 +0,0 @@ -name: Camera12 Preset -options: - - Static \ No newline at end of file diff --git a/components/input_selects/rooms/boys_room_mode.yaml b/components/input_selects/rooms/boys_room_mode.yaml index 9e83cd1..187050c 100644 --- a/components/input_selects/rooms/boys_room_mode.yaml +++ b/components/input_selects/rooms/boys_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/computer_area_mode.yaml b/components/input_selects/rooms/computer_area_mode.yaml index c01cc2a..0cb2802 100644 --- a/components/input_selects/rooms/computer_area_mode.yaml +++ b/components/input_selects/rooms/computer_area_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/dining_room_mode.yaml b/components/input_selects/rooms/dining_room_mode.yaml index ecbea86..8f858ae 100644 --- a/components/input_selects/rooms/dining_room_mode.yaml +++ b/components/input_selects/rooms/dining_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/entryway_mode.yaml b/components/input_selects/rooms/entryway_mode.yaml index 3ece25e..d93d063 100644 --- a/components/input_selects/rooms/entryway_mode.yaml +++ b/components/input_selects/rooms/entryway_mode.yaml @@ -10,4 +10,5 @@ options: - 'Relax' - 'Dimmed' - 'Nightlight' - - 'Natural light' \ No newline at end of file + - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/front_room_mode.yaml b/components/input_selects/rooms/front_room_mode.yaml index 44e5901..25dad56 100644 --- a/components/input_selects/rooms/front_room_mode.yaml +++ b/components/input_selects/rooms/front_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/girls_room_mode.yaml b/components/input_selects/rooms/girls_room_mode.yaml index f283cb4..3f59cd1 100644 --- a/components/input_selects/rooms/girls_room_mode.yaml +++ b/components/input_selects/rooms/girls_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/great_room_mode.yaml b/components/input_selects/rooms/great_room_mode.yaml index 3d648db..0fbf033 100644 --- a/components/input_selects/rooms/great_room_mode.yaml +++ b/components/input_selects/rooms/great_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/kitchen_mode.yaml b/components/input_selects/rooms/kitchen_mode.yaml index d1d4193..90f1852 100644 --- a/components/input_selects/rooms/kitchen_mode.yaml +++ b/components/input_selects/rooms/kitchen_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/mancave_mode.yaml b/components/input_selects/rooms/mancave_mode.yaml index 1239915..aefdc03 100644 --- a/components/input_selects/rooms/mancave_mode.yaml +++ b/components/input_selects/rooms/mancave_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/master_bathroom_mode.yaml b/components/input_selects/rooms/master_bathroom_mode.yaml index 77f1152..e013bfb 100644 --- a/components/input_selects/rooms/master_bathroom_mode.yaml +++ b/components/input_selects/rooms/master_bathroom_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/master_bedroom_mode.yaml b/components/input_selects/rooms/master_bedroom_mode.yaml index dd426f1..ceb5037 100644 --- a/components/input_selects/rooms/master_bedroom_mode.yaml +++ b/components/input_selects/rooms/master_bedroom_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/input_selects/rooms/utility_room_mode.yaml b/components/input_selects/rooms/utility_room_mode.yaml index b6aca00..e9c5469 100644 --- a/components/input_selects/rooms/utility_room_mode.yaml +++ b/components/input_selects/rooms/utility_room_mode.yaml @@ -11,3 +11,4 @@ options: - 'Dimmed' - 'Nightlight' - 'Natural light' + - 'Adaptive' \ No newline at end of file diff --git a/components/packages/adaptive_lighting.yaml b/components/packages/adaptive_lighting.yaml new file mode 100644 index 0000000..bb4d1d9 --- /dev/null +++ b/components/packages/adaptive_lighting.yaml @@ -0,0 +1,36 @@ +adaptive_lighting: + - name: "Southern" + lights: [] + interval: 90 + transition: 45 + initial_transition: 1 + min_brightness: 1 + max_brightness: 100 + min_color_temp: 2000 + max_color_temp: 6500 + prefer_rgb_color: false + sleep_brightness: 1 + sleep_color_temp: 1000 + min_sunrise_time: "05:30:00" + max_sunrise_time: "07:00:00" + min_sunset_time: "19:00:00" + max_sunset_time: "21:00:00" + take_over_control: true + detect_non_ha_changes: false + only_once: false + + - name: "Northern" + lights: [] + interval: 90 + transition: 45 + initial_transition: 1 + min_brightness: 1 + max_brightness: 100 + min_color_temp: 2000 + max_color_temp: 6500 + prefer_rgb_color: false + sleep_brightness: 1 + sleep_color_temp: 1000 + take_over_control: true + detect_non_ha_changes: false + only_once: false \ No newline at end of file diff --git a/components/packages/appliances/washing_machine.yaml b/components/packages/appliances/washing_machine.yaml index 6c71a41..82d60a9 100644 --- a/components/packages/appliances/washing_machine.yaml +++ b/components/packages/appliances/washing_machine.yaml @@ -1,3 +1,422 @@ +# homeassistant/device/01KC1HRV0RGW5HGPEY7WDZF2KG/config + +# { +# "dev": { +# "manufacturer": "Maytag Inc.", +# "model": "Jetclean Plus", +# "model_id": "MDB6769PAS1", +# "name": "Dishwasher", +# "identifiers": [ +# "01KC1HRV0RGW5HGPEY7WDZF2KG" +# ] +# }, +# "o": { +# "name": "MQTT subentry export" +# }, +# "cmps": { +# "0827597b25ca4e2cbf565cc5eed0ab03": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/Start Power", +# "device_class": "power", +# "entity_category": "config", +# "max": 1000.0, +# "min": 0.0, +# "mode": "auto", +# "name": "Start Power", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/Start Power", +# "step": 0.099, +# "unit_of_measurement": "W", +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_0827597b25ca4e2cbf565cc5eed0ab03", +# "qos": 0.0 +# }, +# "188b667b6b7241a28709d2fa854fa8ba": { +# "device_class": "energy", +# "entity_category": "diagnostic", +# "name": "kWh", +# "platform": "sensor", +# "state_class": "total_increasing", +# "state_topic": "esphome/power-monitor/Dishwasher_kwh", +# "unit_of_measurement": "kWh", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_188b667b6b7241a28709d2fa854fa8ba", +# "qos": 0.0 +# }, +# "2a53996ebac24fa89eddb0854b5ba6fd": { +# "device_class": "enum", +# "entity_category": "diagnostic", +# "name": null, +# "options": [ +# "Idle", +# "Running", +# "Pending", +# "Problem" +# ], +# "platform": "sensor", +# "state_topic": "cleverdevices/Dishwasher", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_2a53996ebac24fa89eddb0854b5ba6fd", +# "qos": 0.0 +# }, +# "2be0eb61a8f2411b8acae7b3b61ae358": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/End Power", +# "device_class": "power", +# "entity_category": "config", +# "max": 1000.0, +# "min": 0.0, +# "mode": "auto", +# "name": "End Power", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/End Power", +# "step": 0.1, +# "unit_of_measurement": "W", +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_2be0eb61a8f2411b8acae7b3b61ae358", +# "qos": 0.0 +# }, +# "38aff7715f8b4b7aa1f442024c18be73": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/delay_on", +# "entity_category": "config", +# "max": 7200.0, +# "min": 0.0, +# "mode": "auto", +# "name": "Delay On", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/delay_on", +# "step": 1.0, +# "unit_of_measurement": "s", +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_38aff7715f8b4b7aa1f442024c18be73", +# "qos": 0.0 +# }, +# "3d0c5e8db4de49d49a751dd8539c91e3": { +# "device_class": "opening", +# "entity_category": "diagnostic", +# "name": "Door", +# "payload_off": "True", +# "payload_on": "False", +# "platform": "binary_sensor", +# "state_topic": "zigbee2mqtt/Dishwasher Door", +# "value_template": "{{ value_json.contact }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_3d0c5e8db4de49d49a751dd8539c91e3", +# "qos": 0.0 +# }, +# "6c109f44bbae4175a14d5722c7fd007c": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/Counter", +# "entity_category": "diagnostic", +# "max": 100.0, +# "min": 0.0, +# "mode": "box", +# "name": "Run Counter", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/Counter", +# "step": 1.0, +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_6c109f44bbae4175a14d5722c7fd007c", +# "qos": 0.0 +# }, +# "78821c01898147ed99f74bbe068b13f8": { +# "device_class": "running", +# "name": null, +# "payload_off": "OFF", +# "payload_on": "ON", +# "platform": "binary_sensor", +# "state_topic": "cleverdevices/Dishwasher", +# "value_template": "{{ 'ON' if value == 'Running' else 'OFF' }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_78821c01898147ed99f74bbe068b13f8", +# "qos": 0.0 +# }, +# "80a2bcb04f824754a3af3b84e5e35f5f": { +# "device_class": "power", +# "entity_category": "diagnostic", +# "name": "Watts", +# "platform": "sensor", +# "state_class": "measurement", +# "state_topic": "esphome/power-monitor/Dishwasher_w", +# "suggested_display_precision": 1, +# "unit_of_measurement": "W", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_80a2bcb04f824754a3af3b84e5e35f5f", +# "qos": 0.0 +# }, +# "82efefd86f3245f6b0e0e19829971f3b": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/delay_off", +# "entity_category": "config", +# "max": 7200.0, +# "min": 0.0, +# "mode": "auto", +# "name": "Delay Off", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/delay_off", +# "step": 1.0, +# "unit_of_measurement": "s", +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_82efefd86f3245f6b0e0e19829971f3b", +# "qos": 0.0 +# }, +# "e78b046ca55a40849ac4646ae136574e": { +# "command_template": "{{ value }}", +# "command_topic": "cleverdevices/Dishwasher/delay_problem", +# "entity_category": "config", +# "max": 14399.999, +# "min": 0.0, +# "mode": "auto", +# "name": "Delay Problem", +# "payload_reset": "None", +# "platform": "number", +# "retain": true, +# "state_topic": "cleverdevices/Dishwasher/delay_problem", +# "step": 1.0, +# "unit_of_measurement": "s", +# "value_template": "{{ value }}", +# "unique_id": "01KC1HRV0RGW5HGPEY7WDZF2KG_e78b046ca55a40849ac4646ae136574e", +# "qos": 0.0 +# } +# } +# } + + +# mqtt: +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/Start Power +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: power +# entity_category: config +# max: 1000.0 +# min: 0.0 +# mode: auto +# name: Start Power +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/Start Power +# step: 0.099 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_0827597b25ca4e2cbf565cc5eed0ab03 +# unit_of_measurement: W +# value_template: '{{ value }}' +# - sensor: +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: energy +# entity_category: diagnostic +# name: kWh +# qos: 0.0 +# state_class: total_increasing +# state_topic: esphome/power-monitor/Dishwasher_kwh +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_188b667b6b7241a28709d2fa854fa8ba +# unit_of_measurement: kWh +# - sensor: +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: enum +# entity_category: diagnostic +# name: null +# options: +# - Idle +# - Running +# - Pending +# - Problem +# qos: 0.0 +# state_topic: cleverdevices/Dishwasher +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_2a53996ebac24fa89eddb0854b5ba6fd +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/End Power +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: power +# entity_category: config +# max: 1000.0 +# min: 0.0 +# mode: auto +# name: End Power +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/End Power +# step: 0.1 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_2be0eb61a8f2411b8acae7b3b61ae358 +# unit_of_measurement: W +# value_template: '{{ value }}' +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/delay_on +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# entity_category: config +# max: 7200.0 +# min: 0.0 +# mode: auto +# name: Delay On +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/delay_on +# step: 1.0 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_38aff7715f8b4b7aa1f442024c18be73 +# unit_of_measurement: s +# value_template: '{{ value }}' +# - binary_sensor: +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: opening +# entity_category: diagnostic +# name: Door +# payload_off: 'True' +# payload_on: 'False' +# qos: 0.0 +# state_topic: zigbee2mqtt/Dishwasher Door +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_3d0c5e8db4de49d49a751dd8539c91e3 +# value_template: '{{ value_json.contact }}' +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/Counter +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# entity_category: diagnostic +# max: 100.0 +# min: 0.0 +# mode: box +# name: Run Counter +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/Counter +# step: 1.0 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_6c109f44bbae4175a14d5722c7fd007c +# value_template: '{{ value }}' +# - binary_sensor: +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: running +# name: null +# payload_off: 'OFF' +# payload_on: 'ON' +# qos: 0.0 +# state_topic: cleverdevices/Dishwasher +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_78821c01898147ed99f74bbe068b13f8 +# value_template: '{{ ''ON'' if value == ''Running'' else ''OFF'' }}' +# - sensor: +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# device_class: power +# entity_category: diagnostic +# name: Watts +# qos: 0.0 +# state_class: measurement +# state_topic: esphome/power-monitor/Dishwasher_w +# suggested_display_precision: 1 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_80a2bcb04f824754a3af3b84e5e35f5f +# unit_of_measurement: W +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/delay_off +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# entity_category: config +# max: 7200.0 +# min: 0.0 +# mode: auto +# name: Delay Off +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/delay_off +# step: 1.0 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_82efefd86f3245f6b0e0e19829971f3b +# unit_of_measurement: s +# value_template: '{{ value }}' +# - number: +# command_template: '{{ value }}' +# command_topic: cleverdevices/Dishwasher/delay_problem +# device: +# identifiers: +# - 01KC1HRV0RGW5HGPEY7WDZF2KG +# manufacturer: Maytag Inc. +# model: Jetclean Plus +# model_id: MDB6769PAS1 +# name: Dishwasher +# entity_category: config +# max: 14399.999 +# min: 0.0 +# mode: auto +# name: Delay Problem +# payload_reset: None +# qos: 0.0 +# retain: true +# state_topic: cleverdevices/Dishwasher/delay_problem +# step: 1.0 +# unique_id: 01KC1HRV0RGW5HGPEY7WDZF2KG_e78b046ca55a40849ac4646ae136574e +# unit_of_measurement: s +# value_template: '{{ value }}' + + + + template: - binary_sensor: - name: Washing Machine diff --git a/components/packages/camera_casting.yaml b/components/packages/camera_casting.yaml index 776eec7..203df71 100644 --- a/components/packages/camera_casting.yaml +++ b/components/packages/camera_casting.yaml @@ -24,6 +24,8 @@ input_select: script: execute_cast_dropdown: alias: Press to execute + mode: parallel + max: 10 sequence: - variables: media_player: > @@ -54,7 +56,29 @@ script: {% 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 + media-source://camera/camera.frigate_cam14 + {% endif %} + url: > + {% if is_state('input_select.camera_dropdown', 'Boys Room') %} + http://192.168.1.7:1984/stream.html?src=cam01_sub + {% elif is_state('input_select.camera_dropdown', 'Kitchen') %} + http://192.168.1.7:1984/stream.html?src=cam12_sub + {% elif is_state('input_select.camera_dropdown', 'Computer Area') %} + http://192.168.1.7:1984/stream.html?src=cam03_sub + {% elif is_state('input_select.camera_dropdown', 'Garage') %} + http://192.168.1.7:1984/stream.html?src=cam04_sub + {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %} + http://192.168.1.7:1984/stream.html?src=cam06_sub + {% elif is_state('input_select.camera_dropdown', 'Girls Room') %} + http://192.168.1.7:1984/stream.html?src=cam08_sub + {% elif is_state('input_select.camera_dropdown', 'Back Yard') %} + http://192.168.1.7:1984/stream.html?src=cam14_sub + {% elif is_state('input_select.camera_dropdown', 'Front Yard') %} + http://192.168.1.7:1984/stream.html?src=cam18_sub + {% elif is_state('input_select.camera_dropdown', 'Front Door') %} + http://192.168.1.7:1984/stream.html?src=cam19_sub + {% elif is_state('input_select.camera_dropdown', 'Front Room') %} + http://192.168.1.7:1984/stream.html?src=cam14_sub {% endif %} @@ -63,13 +87,21 @@ script: entity_id: "{{ media_player }}" volume_level: 0.100 - - action: media_player.play_media - target: - entity_id: "{{ media_player }}" + # - action: media_player.play_media + # target: + # entity_id: "{{ media_player }}" + # data: + # media: + # media_content_id: "{{ camera }}" + # media_content_type: image/jpeg + + - action: dash_cast.load_url data: - media: - media_content_id: "{{ camera }}" - media_content_type: image/jpeg + entity_id: "{{ media_player }}" + force: true + url: "{{ url }}" + + # metadata: # title: Frigate Cam01 # thumbnail: /api/camera_proxy/camera.frigate_cam01 @@ -183,3 +215,13 @@ script: # {% elif is_state('input_select.camera_dropdown', 'Front Room') %} # front-room-camera # {% endif %} + - delay: + hours: 0 + minutes: 1 + seconds: 0 + milliseconds: 0 + - action: media_player.turn_off + metadata: {} + target: + entity_id: "{{ media_player }}" + data: {} \ No newline at end of file diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index 3f36acc..302168a 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -29,9 +29,6 @@ recorder: - sensor.last_boot - sensor.mail_updated - light.upstairs_public - - input_select.master_bedroom_camera - - input_select.outdoor_camera_cycle - - input_select.indoor_camera_cycle - sensor.nws_alerts_last_updated - sensor.pixel_7_active_notification_count entity_globs: diff --git a/components/packages/frigate_cameras.yaml b/components/packages/frigate_cameras.yaml new file mode 100644 index 0000000..5d297a5 --- /dev/null +++ b/components/packages/frigate_cameras.yaml @@ -0,0 +1,8 @@ +template: + - sensor: + - name: "Frigate: Offline Cameras" + unique_id: 86a8904e-5713-4dac-8d59-fd65afcc8f83 + state: "{{ states.camera | map(attribute='entity_id') | select ('in',integration_entities('frigate')) | select('is_state', 'unavailable') | list | count }}" + icon: mdi:cctv-off + attributes: + cameras: "{{ states.camera | map(attribute='entity_id') | select ('in',integration_entities('frigate')) | select('is_state', 'unavailable') | list }}" \ No newline at end of file diff --git a/lovelace/cameras/view-camera-01.yaml b/lovelace/cameras/view-camera-01.yaml index 65e193a..f2a4c88 100644 --- a/lovelace/cameras/view-camera-01.yaml +++ b/lovelace/cameras/view-camera-01.yaml @@ -20,13 +20,10 @@ card: modes: - webrtc stream: cam01_sub - icon: mdi:earth - title: Boys Room - id: boys_room live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -43,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-03.yaml b/lovelace/cameras/view-camera-03.yaml index 4cd2f1b..895c8bf 100644 --- a/lovelace/cameras/view-camera-03.yaml +++ b/lovelace/cameras/view-camera-03.yaml @@ -20,13 +20,10 @@ card: modes: - webrtc stream: cam03_sub - icon: mdi:desktop-classic - title: Computer Area - id: computer_area live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -43,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-04.yaml b/lovelace/cameras/view-camera-04.yaml index f607a6b..f813e34 100644 --- a/lovelace/cameras/view-camera-04.yaml +++ b/lovelace/cameras/view-camera-04.yaml @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-06.yaml b/lovelace/cameras/view-camera-06.yaml index 2d7b6ba..4c6a0b5 100644 --- a/lovelace/cameras/view-camera-06.yaml +++ b/lovelace/cameras/view-camera-06.yaml @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-07.yaml b/lovelace/cameras/view-camera-07.yaml index fd5958f..edf4352 100644 --- a/lovelace/cameras/view-camera-07.yaml +++ b/lovelace/cameras/view-camera-07.yaml @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml index 866a70c..5eabb88 100644 --- a/lovelace/cameras/view-camera-08.yaml +++ b/lovelace/cameras/view-camera-08.yaml @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-12.yaml b/lovelace/cameras/view-camera-12.yaml index ba20ca8..00ea93e 100644 --- a/lovelace/cameras/view-camera-12.yaml +++ b/lovelace/cameras/view-camera-12.yaml @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-13.yaml b/lovelace/cameras/view-camera-13.yaml deleted file mode 100644 index a487cb6..0000000 --- a/lovelace/cameras/view-camera-13.yaml +++ /dev/null @@ -1,126 +0,0 @@ -type: conditional -conditions: - - condition: state - entity: sensor.frigate_cam12_camera_fps - state_not: "500" -card: - type: vertical-stack - cards: - - type: custom:advanced-camera-card - cameras_global: - dimensions: - layout: - fit: fill - status_bar: - style: none - cameras: - - camera_entity: camera.frigate_cam12 - live_provider: go2rtc - go2rtc: - modes: - - webrtc - stream: cam13_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" - elements: - - type: image - image: /local/title-dark-double.png - style: - transform: initial - top: 90% - left: 0px - 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: state-icon - entity: binary_sensor.front_room_motion - style: - left: 8% - top: 95% - - type: state-icon - entity: sensor.dining_room_person_count - style: - left: 50% - top: 95% - - type: state-icon - entity: input_boolean.front_room_occupied - tap_action: - action: toggle - style: - left: 70% - top: 95% - - type: state-icon - entity: binary_sensor.front_room_occupied - style: - top: 95% - left: 92% - - - type: state-icon - entity: binary_sensor.patio_door_contact - style: - top: 29% - left: 4% - - # - type: state-icon - # entity: switch.shelly_sliding_glass_door - # style: - # top: 34% - # left: 4% - - - type: conditional - conditions: - - entity: binary_sensor.front_room_person_occupancy - state: "on" - elements: - - type: state-icon - entity: binary_sensor.front_room_person_occupancy - style: - top: 55% - left: 55% - - - type: conditional - conditions: - - entity: binary_sensor.dining_room_person_occupancy - state: "on" - elements: - - type: state-icon - entity: binary_sensor.dining_room_person_occupancy - style: - top: 33% - left: 20% diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index 5be33ee..e99113c 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -1,7 +1,7 @@ type: conditional conditions: - condition: state - entity: sensor.frigate_cam12_camera_fps + entity: sensor.frigate_cam14_camera_fps state_not: "500" card: type: vertical-stack @@ -14,7 +14,7 @@ card: status_bar: style: none cameras: - - camera_entity: camera.frigate_cam12 + - camera_entity: camera.frigate_cam14 live_provider: go2rtc go2rtc: modes: @@ -23,7 +23,7 @@ card: live: preload: true draggable: true - show_image_during_load: false + show_image_during_load: true lazy_load: false controls: title: @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" @@ -54,7 +57,7 @@ card: height: 10% opacity: 70% - type: image - entity: camera.frigate_cam12 + entity: camera.frigate_cam14 image: /local/title-dark-double.png aspect_ratio: 100% tap_action: @@ -69,19 +72,19 @@ card: opacity: 0% - type: state-icon - entity: binary_sensor.back_yard_motion + entity: binary_sensor.front_room_motion style: left: 8% top: 95% - type: state-icon - entity: input_boolean.back_yard_occupied + entity: input_boolean.front_room_occupied tap_action: action: toggle style: left: 70% top: 95% - type: state-icon - entity: binary_sensor.back_yard_occupied + entity: binary_sensor.front_room_occupied style: top: 95% left: 92% diff --git a/lovelace/cameras/view-camera-15.yaml b/lovelace/cameras/view-camera-15.yaml new file mode 100644 index 0000000..ca3246a --- /dev/null +++ b/lovelace/cameras/view-camera-15.yaml @@ -0,0 +1,149 @@ +type: conditional +conditions: + - condition: state + entity: sensor.frigate_cam15_camera_fps + state_not: "0" +card: + type: vertical-stack + cards: + - type: custom:advanced-camera-card + cameras_global: + dimensions: + layout: + fit: fill + status_bar: + style: none + cameras: + - camera_entity: camera.frigate_cam15 + live_provider: go2rtc + go2rtc: + modes: + - webrtc + stream: cam15_sub + live: + preload: true + draggable: true + show_image_during_load: true + 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 + view: + update_force: true + update_seconds: 0 + dimensions: + aspect_ratio_mode: static + aspect_ratio: "16:9" + elements: + - type: image + image: /local/title-dark-double.png + style: + transform: initial + top: 90% + left: 0px + width: 100% + height: 10% + opacity: 70% + - type: image + entity: camera.frigate_cam15 + image: /local/title-dark-double.png + aspect_ratio: 100% + tap_action: + action: navigate + navigation_path: /ai-yml/ai-cam15 + style: + transform: initial + top: 0px + left: 0px + width: 100% + height: 100% + opacity: 0% + - type: state-icon + entity: binary_sensor.computer_area_motion + style: + left: 8% + top: 95% + - type: state-icon + entity: sensor.great_room_person_count + style: + left: 50% + top: 95% + - type: state-icon + entity: input_boolean.computer_area_occupied + tap_action: + action: toggle + style: + left: 70% + top: 95% + - type: state-icon + entity: binary_sensor.computer_area_occupied + style: + top: 95% + left: 92% + + - type: conditional + conditions: + - entity: binary_sensor.great_room_person_occupancy + state: "on" + elements: + - type: state-icon + entity: binary_sensor.great_room_person_occupancy + style: + top: 20% + left: 25% + + - type: conditional + conditions: + - entity: binary_sensor.utility_room_person_occupancy + state: "on" + elements: + - type: state-icon + entity: binary_sensor.utility_room_person_occupancy + style: + top: 17% + left: 57% + + - type: conditional + conditions: + - entity: binary_sensor.entryway_person_occupancy + state: "on" + elements: + - type: state-icon + entity: binary_sensor.entryway_person_occupancy + style: + top: 25% + left: 97% + + - type: conditional + conditions: + - entity: binary_sensor.computer_area_person_occupancy + state: "on" + elements: + - type: state-icon + entity: binary_sensor.computer_area_person_occupancy + style: + top: 87% + left: 80% + + - type: conditional + conditions: + - entity: binary_sensor.computer_chair_contact_occupied + state: "on" + elements: + - type: state-icon + entity: binary_sensor.computer_chair_contact_occupied + style: + top: 35% + left: 25% diff --git a/lovelace/cameras/view-camera-18.yaml b/lovelace/cameras/view-camera-18.yaml index 5b44b81..433e234 100644 --- a/lovelace/cameras/view-camera-18.yaml +++ b/lovelace/cameras/view-camera-18.yaml @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/cameras/view-camera-19.yaml b/lovelace/cameras/view-camera-19.yaml index 63c5ef1..5098029 100644 --- a/lovelace/cameras/view-camera-19.yaml +++ b/lovelace/cameras/view-camera-19.yaml @@ -40,6 +40,9 @@ card: media_viewer: draggable: false lazy_load: false + view: + update_force: true + update_seconds: 0 dimensions: aspect_ratio_mode: static aspect_ratio: "16:9" diff --git a/lovelace/casting-cams/front-room-card.yaml b/lovelace/casting-cams/front-room-card.yaml index a6fb774..3ee2542 100644 --- a/lovelace/casting-cams/front-room-card.yaml +++ b/lovelace/casting-cams/front-room-card.yaml @@ -14,15 +14,15 @@ cards: enabled: false style: none cameras: - - camera_entity: camera.frigate_cam12 + - camera_entity: camera.frigate_cam14 live_provider: go2rtc - id: frigate-cam13 + id: frigate-cam14 capabilities: disable: [] disable_except: - live go2rtc: - stream: cam13_sub + stream: cam14_sub modes: - webrtc always_error_if_entity_unavailable: false diff --git a/lovelace/details/view-hvac.yaml b/lovelace/details/view-hvac.yaml index 7bdafa4..be4bce4 100644 --- a/lovelace/details/view-hvac.yaml +++ b/lovelace/details/view-hvac.yaml @@ -1833,7 +1833,7 @@ sections: show_points: false show_legend: false y_axis: secondary - lower_bound: 60 + lower_bound: 0 line_width: 1 hour24: true hours_to_show: 24 diff --git a/lovelace/frigate/view-ai-cam14.yaml b/lovelace/frigate/view-ai-cam14.yaml new file mode 100644 index 0000000..7d24201 --- /dev/null +++ b/lovelace/frigate/view-ai-cam14.yaml @@ -0,0 +1,164 @@ +title: AI cam14 +path: ai-cam14 +icon: mdi:television +type: sidebar +visible: + - user: 24a4bd075e7f41a497dd0390a1dd4a9f + - user: cad46dedf86f454ebbd7f697a58730f2 +cards: + - !include /config/lovelace/cameras/view-camera-14.yaml + + - type: vertical-stack + view_layout: + position: sidebar + cards: + - type: glance + title: Kitchen + entities: [] + - type: glance + show_state: false + columns: 4 + 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 + - type: entities + title: Kitchen + show_header_toggle: false + entities: + - name: Kitchen + entity: sensor.kitchen_person_count + - name: Kitchen + entity: binary_sensor.kitchen_person_occupancy + - type: custom:advanced-camera-card + cameras: + - camera_entity: camera.frigate_cam14 + title: Kitchen + icon: mdi:fridge + live_provider: ha + frigate: + camera_name: frigate_cam14 + zone: kitchen + label: person + url: http://192.168.1.7:5000 + view: + default: snapshots + event_gallery: + controls: + thumbnails: + size: 75 + menu: + style: overlay + position: top + buttons: + clips: + enabled: false + download: + enabled: false + frigate_ui: + enabled: false + frigate: + enabled: false + live: + enabled: false + media_viewer: + controls: + next_previous: + style: chevrons + - type: entities + title: Dining Room + show_header_toggle: false + entities: + - name: Dining Room + entity: sensor.dining_room_person_count + - name: Dining Room + entity: binary_sensor.dining_room_person_occupancy + - type: custom:advanced-camera-card + cameras: + - camera_entity: camera.frigate_cam14 + title: Dining Room + icon: mdi:table-chair + live_provider: ha + frigate: + camera_name: frigate_cam14 + zone: dining_room + label: person + url: http://192.168.1.7:5000 + view: + default: snapshots + event_gallery: + controls: + thumbnails: + size: 75 + menu: + style: overlay + position: top + buttons: + clips: + enabled: false + download: + enabled: false + frigate_ui: + enabled: false + frigate: + enabled: false + live: + enabled: false + media_viewer: + controls: + next_previous: + style: chevrons + - type: entities + title: Front Room + show_header_toggle: false + entities: + - name: Front Room + entity: sensor.front_room_person_count + - name: Front Room + entity: binary_sensor.front_room_person_occupancy + - type: custom:advanced-camera-card + cameras: + - camera_entity: camera.frigate_cam14 + title: Front Room + icon: mdi:television + live_provider: ha + frigate: + camera_name: frigate_cam14 + zone: front_room + label: person + url: http://192.168.1.7:5000 + view: + default: snapshots + event_gallery: + controls: + thumbnails: + size: 75 + menu: + style: overlay + position: top + buttons: + clips: + enabled: false + download: + enabled: false + frigate_ui: + enabled: false + frigate: + enabled: false + live: + enabled: false + media_viewer: + controls: + next_previous: + style: chevrons diff --git a/lovelace/frigate/view-ai-cam15.yaml b/lovelace/frigate/view-ai-cam15.yaml new file mode 100644 index 0000000..f59fc44 --- /dev/null +++ b/lovelace/frigate/view-ai-cam15.yaml @@ -0,0 +1,140 @@ +title: AI Cam15 +path: ai-cam15 +icon: mdi:desktop-classic +type: sidebar +visible: + - user: 24a4bd075e7f41a497dd0390a1dd4a9f + - user: cad46dedf86f454ebbd7f697a58730f2 +cards: + - !include /config/lovelace/cameras/view-camera-15.yaml + + - type: vertical-stack + view_layout: + position: sidebar + cards: + - type: glance + title: Computer Area + entities: [] + - type: glance + show_state: false + columns: 4 + entities: + - name: Contrast + entity: switch.frigate_cam15_improve_contrast + tap_action: + action: toggle + - name: Snapshots + entity: switch.frigate_cam15_snapshots + tap_action: + action: toggle + - name: Detect + entity: switch.frigate_cam15_detect + tap_action: + action: toggle + - name: Occupancy + entity: binary_sensor.frigate_cam15_all_occupancy + - type: entities + title: Computer Area + show_header_toggle: false + entities: + - name: Computer Area + entity: sensor.frigate_cam15_person_count + - name: Computer Area + entity: binary_sensor.frigate_cam15_person_occupancy + - type: custom:advanced-camera-card + cameras: + - camera_entity: camera.frigate_cam15 + title: Computer Area + icon: mdi:desktop-classic + live_provider: ha + frigate: + camera_name: frigate_cam15 + zone: computer_area + label: person + url: http://192.168.1.7:5000 + view: + default: snapshots + event_gallery: + controls: + thumbnails: + size: 75 + menu: + style: overlay + position: top + buttons: + clips: + enabled: false + download: + enabled: false + frigate_ui: + enabled: false + frigate: + enabled: false + live: + enabled: false + media_viewer: + controls: + next_previous: + style: chevrons + - type: entities + title: Great Room + show_header_toggle: false + entities: + - name: Great Room + entity: sensor.great_room_person_count + - name: Great Room + entity: binary_sensor.great_room_person_occupancy + - type: custom:advanced-camera-card + cameras: + - camera_entity: camera.frigate_cam15 + title: Great Room + icon: mdi:microsoft-xbox-controller + live_provider: go2rtc + go2rtc: + modes: + - webrtc + stream: cam15_sub + frigate: + camera_name: frigate_cam15 + zone: great_room + label: person + view: + default: snapshots + theme: + themes: [] + event_gallery: + controls: + thumbnails: + size: 75 + menu: + style: overlay + position: top + buttons: + clips: + enabled: false + download: + enabled: false + frigate_ui: + enabled: false + live: + enabled: false + iris: + enabled: false + snapshots: + enabled: true + cameras: + enabled: false + media_viewer: + controls: + next_previous: + style: chevrons + snapshot_click_plays_clip: false + status_bar: {} + media_gallery: + controls: + thumbnails: + size: 150 + show_details: false + show_favorite_control: false + show_timeline_control: false + show_download_control: false diff --git a/lovelace/phone/cctv.yaml b/lovelace/phone/cctv.yaml index 2ec9a3d..11aa3ce 100644 --- a/lovelace/phone/cctv.yaml +++ b/lovelace/phone/cctv.yaml @@ -14,13 +14,14 @@ cards: - !include /config/lovelace/cameras/view-camera-08.yaml - !include /config/lovelace/cameras/view-camera-01.yaml - !include /config/lovelace/cameras/view-camera-12.yaml + - !include /config/lovelace/cameras/view-camera-14.yaml - !include /config/lovelace/cameras/view-camera-03.yaml + - !include /config/lovelace/cameras/view-camera-15.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-19.yaml diff --git a/lovelace/phone/dining-room.yaml b/lovelace/phone/dining-room.yaml index e5bc780..e46c69a 100644 --- a/lovelace/phone/dining-room.yaml +++ b/lovelace/phone/dining-room.yaml @@ -88,4 +88,4 @@ cards: cards: - type: custom:mushroom-title-card subtitle: Cameras - - !include /config/lovelace/cameras/view-camera-13.yaml + - !include /config/lovelace/cameras/view-camera-14.yaml diff --git a/lovelace/phone/front-room.yaml b/lovelace/phone/front-room.yaml index b0e9543..4aa24f6 100644 --- a/lovelace/phone/front-room.yaml +++ b/lovelace/phone/front-room.yaml @@ -128,6 +128,6 @@ sections: cards: - type: custom:mushroom-title-card subtitle: Cameras - - !include /config/lovelace/cameras/view-camera-13.yaml + - !include /config/lovelace/cameras/view-camera-14.yaml - !include /config/lovelace/templates/front-room-remote.yaml diff --git a/lovelace/phone/home.yaml b/lovelace/phone/home.yaml index 1f752ee..99d0862 100644 --- a/lovelace/phone/home.yaml +++ b/lovelace/phone/home.yaml @@ -95,23 +95,29 @@ cards: - type: conditional conditions: - entity: sensor.dishwasher - state_not: "idle" + state_not: "Idle" chip: type: template entity: sensor.dishwasher icon: > - {% if is_state('sensor.dishwasher','running')-%} + {% if is_state('sensor.dishwasher','Running')-%} mdi:dishwasher - {% elif is_state('sensor.dishwasher','pending')-%} + {% elif is_state('sensor.dishwasher','Pending')-%} mdi:dishwasher-alert + {% elif is_state('sensor.dishwasher','Problem')-%} + mdi:alert + {% elif is_state('sensor.dishwasher','Idle')-%} + mdi:dishwasher-off {%- endif %} icon_color: > - {% if is_state('sensor.dishwasher','running')-%} - amber - {% elif is_state('sensor.dishwasher','pending')-%} - blue - {% else -%} + {% if is_state('sensor.dishwasher','Running')-%} + green + {% elif is_state('sensor.dishwasher','Pending')-%} + orange + {% elif is_state('sensor.dishwasher','Problem')-%} red + {% elif is_state('sensor.dishwasher','Idle')-%} + disabled {%- endif %} tap_action: action: navigate diff --git a/lovelace/raw-cameras/front-room-card.yaml b/lovelace/raw-cameras/front-room-card.yaml index 4335336..7d21fce 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_cam12 + - camera_entity: camera.frigate_cam14 live_provider: go2rtc go2rtc: modes: - webrtc - stream: cam13_sub + stream: cam14_sub live: auto_mute: all preload: true diff --git a/lovelace/room_cards/dining_room.yaml b/lovelace/room_cards/dining_room.yaml index ddec761..fd50210 100644 --- a/lovelace/room_cards/dining_room.yaml +++ b/lovelace/room_cards/dining_room.yaml @@ -167,7 +167,7 @@ elements: #button #4 - type: "custom:button-card" color: auto - entity: camera.frigate_cam12 + entity: camera.frigate_cam14 show_name: false show_entity_picture: true style: diff --git a/lovelace/room_cards/front_room.yaml b/lovelace/room_cards/front_room.yaml index 2a3b640..96251ce 100644 --- a/lovelace/room_cards/front_room.yaml +++ b/lovelace/room_cards/front_room.yaml @@ -85,25 +85,25 @@ elements: hold_action: action: more-info type: "custom:button-card" - # - type: "custom:button-card" - # color: auto - # entity: camera.frigate_cam13 - # show_name: false - # show_entity_picture: true - # style: - # left: 38% - # top: 65% - # styles: - # card: - # #- border-radius: 50px - # - width: 50px - # - height: 50px - # icon: - # - width: 45px - # - height: 45px - # tap_action: - # action: navigate - # navigation_path: /ai-yml/ai-cam13 + - type: "custom:button-card" + color: auto + entity: camera.frigate_cam14 + show_name: false + show_entity_picture: true + style: + left: 38% + top: 65% + styles: + card: + #- border-radius: 50px + - width: 50px + - height: 50px + icon: + - width: 45px + - height: 45px + tap_action: + action: navigate + navigation_path: /ai-yml/ai-cam14 - type: "custom:button-card" color: auto entity: media_player.front_room_tv diff --git a/lovelace/view-cameras.yaml b/lovelace/view-cameras.yaml index e9dc062..6aa4686 100644 --- a/lovelace/view-cameras.yaml +++ b/lovelace/view-cameras.yaml @@ -10,16 +10,12 @@ cards: square: false columns: 2 cards: + - !include /config/lovelace/cameras/view-camera-12.yaml + - !include /config/lovelace/cameras/view-camera-14.yaml + - !include /config/lovelace/cameras/view-camera-03.yaml + - !include /config/lovelace/cameras/view-camera-04.yaml - !include /config/lovelace/cameras/view-camera-08.yaml - !include /config/lovelace/cameras/view-camera-01.yaml - - # 6 and 7 - !include /config/lovelace/cameras/view-camera-06.yaml - !include /config/lovelace/cameras/view-camera-07.yaml - # 3 and 1 - - !include /config/lovelace/cameras/view-camera-03.yaml - - - !include /config/lovelace/cameras/view-camera-12.yaml - - - !include /config/lovelace/cameras/view-camera-04.yaml diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index fe733e2..c863351 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -815,8 +815,7 @@ cards: - camera.frigate_cam07 - camera.frigate_cam08 - camera.frigate_cam12 - # - camera.frigate_cam13 - # - camera.frigate_cam14 + - camera.frigate_cam14 - camera.frigate_cam18 - camera.frigate_cam19 states: diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 62656b5..1c97aaf 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -565,29 +565,29 @@ badges: - type: conditional conditions: - - entity: input_select.dishwasher_fun_status - state_not: "Hungry for more" + - entity: sensor.dishwasher + state_not: "Idle" chip: type: template - entity: input_select.dishwasher_fun_status + entity: sensor.dishwasher icon: > - {% if is_state('input_select.dishwasher_fun_status','Scrubbing')-%} + {% if is_state('sensor.dishwasher','Running')-%} mdi:dishwasher - {% elif is_state('input_select.dishwasher_fun_status','Water spots and mildew!')-%} + {% elif is_state('sensor.dishwasher','Pending')-%} mdi:dishwasher-alert - {% elif is_state('input_select.dishwasher_fun_status','Trouble')-%} + {% elif is_state('sensor.dishwasher','Problem')-%} mdi:alert - {% elif is_state('input_select.dishwasher_fun_status','Hungry for more')-%} + {% elif is_state('sensor.dishwasher','Idle')-%} mdi:dishwasher-off {%- endif %} icon_color: > - {% if is_state('input_select.dishwasher_fun_status','Scrubbing')-%} + {% if is_state('sensor.dishwasher','Running')-%} green - {% elif is_state('input_select.dishwasher_fun_status','Water spots and mildew!')-%} + {% elif is_state('sensor.dishwasher','Pending')-%} orange - {% elif is_state('input_select.dishwasher_fun_status','Trouble')-%} + {% elif is_state('sensor.dishwasher','Problem')-%} red - {% elif is_state('input_select.dishwasher_fun_status','Hungry for more')-%} + {% elif is_state('sensor.dishwasher','Idle')-%} disabled {%- endif %} tap_action: diff --git a/lovelace/view-surveillance.yaml b/lovelace/view-surveillance.yaml index f5f5e88..a1b0b90 100644 --- a/lovelace/view-surveillance.yaml +++ b/lovelace/view-surveillance.yaml @@ -17,10 +17,11 @@ cards: - !include /config/lovelace/cameras/view-camera-03.yaml - # - !include /config/lovelace/cameras/view-camera-13.yaml + - !include /config/lovelace/cameras/view-camera-15.yaml + - !include /config/lovelace/cameras/view-camera-14.yaml - !include /config/lovelace/cameras/view-camera-12.yaml #- !include /config/lovelace/cameras/view-camera-02.yaml - + - !include /config/lovelace/cameras/view-camera-06.yaml # 5 and 9 diff --git a/scripts/cameras/cam19_computer_area.yaml b/scripts/cameras/cam19_computer_area.yaml index 3cfeb09..a65278f 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 + url: rtsp://192.168.1.7:8554/cam19_sub force: true extra: mode: webrtc diff --git a/ui-cameras.yaml b/ui-cameras.yaml index 689c0fd..e449de7 100644 --- a/ui-cameras.yaml +++ b/ui-cameras.yaml @@ -7,8 +7,8 @@ views: - !include lovelace/view-cameras.yaml - !include lovelace/frigate/view-ai-cam08.yaml - !include lovelace/frigate/view-ai-cam12.yaml - #- !include lovelace/frigate/view-ai-cam13.yaml - + - !include lovelace/frigate/view-ai-cam14.yaml + - !include lovelace/frigate/view-ai-cam15.yaml - !include lovelace/frigate/view-ai-cam03.yaml @@ -17,6 +17,5 @@ views: - !include lovelace/frigate/view-ai-cam01.yaml - !include lovelace/frigate/view-ai-cam04.yaml - #- !include lovelace/frigate/view-ai-cam14.yaml - !include lovelace/frigate/view-ai-cam18.yaml - !include lovelace/frigate/view-ai-cam19.yaml \ No newline at end of file diff --git a/www/floorplan/fullsized_floorplan.svg b/www/floorplan/fullsized_floorplan.svg index 2adf7c8..8500bfb 100644 --- a/www/floorplan/fullsized_floorplan.svg +++ b/www/floorplan/fullsized_floorplan.svg @@ -38,9 +38,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.019999999" - inkscape:cx="53125.003" - inkscape:cy="33525.002" + inkscape:zoom="0.01" + inkscape:cx="29850" + inkscape:cy="41850" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -2239,24 +2239,6 @@ style="fill:#b381c9;fill-opacity:1" /> - - - - - - @@ -3857,7 +3825,7 @@ d="m 720.0222,-17679.003 a 4.5,4.5 0 0 1 4.99225,3.941 4.5,4.5 0 0 1 -3.93422,4.997 4.5,4.5 0 0 1 -5.00204,-3.928 4.5,4.5 0 0 1 3.92178,-5.007" inkscape:label="light.storage_room" sodipodi:arc-type="arc" /> - inkscape:label="light.front_porch_overhead" /> --------- + x="591.06311" + y="-16531.195">--------- --------- + x="591.06311" + y="-16520.941">--------- + transform="rotate(70.653713,13585.301,-8797.1128)" + inkscape:transform-center-x="10.294254" + inkscape:transform-center-y="2.3998316">