diff --git a/automations/people/almost_bedtime_tts.yaml b/automations/people/almost_bedtime_tts.yaml index 9edaac1..ccaf360 100644 --- a/automations/people/almost_bedtime_tts.yaml +++ b/automations/people/almost_bedtime_tts.yaml @@ -2,8 +2,10 @@ alias: 'Almost Bedtime TTS' id: automation_almost_bedtime_tts initial_state: off trigger: - platform: time - at: input_datetime.kids_five_minute_warning_time + trigger: time + at: + entity_id: input_datetime.kids_bedtime_announcement_time + offset: "-300" condition: - condition: state entity_id: input_boolean.announce_bedtime diff --git a/automations/rooms/master_bedroom/master_bedroom_light_cycle.yaml b/automations/rooms/master_bedroom/master_bedroom_light_cycle.yaml index 4edd17d..e9de225 100644 --- a/automations/rooms/master_bedroom/master_bedroom_light_cycle.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_light_cycle.yaml @@ -34,7 +34,7 @@ action: sequence: - service: light.turn_on target: - entity_id: light.master_bedroom_ceiling_hue + entity_id: light.master_bedroom_hue data: brightness: '{{ states("input_number.master_bedroom_light_cycle_brightness") | int }}' transition: '{{ states("input_number.master_bedroom_light_cycle_transition") | int }}' diff --git a/automations/rooms/nursery/nursery_light_cycle.yaml b/automations/rooms/nursery/nursery_light_cycle.yaml index 8a93370..17a7d53 100644 --- a/automations/rooms/nursery/nursery_light_cycle.yaml +++ b/automations/rooms/nursery/nursery_light_cycle.yaml @@ -34,7 +34,7 @@ action: sequence: - service: light.turn_on target: - entity_id: light.nursery_ceiling_hue + entity_id: light.nursery_hue data: brightness: '{{ states("input_number.nursery_light_cycle_brightness") | int }}' transition: '{{ states("input_number.nursery_light_cycle_transition") | int }}' diff --git a/automations/time_of_day/early_afternoon_on.yaml b/automations/time_of_day/early_afternoon_on.yaml index 28269dd..0e6f01d 100644 --- a/automations/time_of_day/early_afternoon_on.yaml +++ b/automations/time_of_day/early_afternoon_on.yaml @@ -19,9 +19,9 @@ condition: state: Early Afternoon action: - - service: homeassistant.turn_on - entity_id: - - input_boolean.clint_needs_pm_meds + # - service: homeassistant.turn_on + # entity_id: + # - input_boolean.clint_needs_pm_meds - service: input_select.select_option data: diff --git a/components/binary_sensors/template.yaml b/components/binary_sensors/template.yaml index 92570e3..c797efa 100644 --- a/components/binary_sensors/template.yaml +++ b/components/binary_sensors/template.yaml @@ -66,7 +66,7 @@ sensors: unique_id: templatebinarysensor.kids_possible friendly_name: Kids Possible icon_template: mdi:human-male-female-child - value_template: "{{ is_state('binary_sensor.have_custody','on') or is_state('input_boolean.kristy_home','on') or is_state('input_boolean.ebin_home','on') or is_state('input_select.weaver_kids','Home') or is_state('input_select.podein_kids','Home') }}" + value_template: "{{ is_state('binary_sensor.have_custody','on') or is_state('binary_sensor.even_week','on') or is_state('input_boolean.kristy_home','on') or is_state('input_boolean.ebin_home','on') or is_state('input_select.weaver_kids','Home') or is_state('input_select.podein_kids','Home') }}" double_planter_needs_water: unique_id: templatebinarysensor.double_planter_needs_water @@ -654,14 +654,14 @@ sensors: master_bedroom_light_left_on: unique_id: templatebinarysensor.master_bedroom_light_left_on friendly_name: Master Bedroom Light Left On - value_template: "{{ is_state('light.master_bedroom_ceiling_hue','on') and is_state('input_boolean.master_bedroom_occupied','off') }}" + value_template: "{{ is_state('light.master_bedroom_hue','on') and is_state('input_boolean.master_bedroom_occupied','off') }}" delay_on: seconds: 30 nursery_light_left_on: unique_id: templatebinarysensor.nursery_light_left_on friendly_name: Nursery Light Left On - value_template: "{{ is_state('light.nursery_ceiling_hue','on') and is_state('input_boolean.nursery_occupied','off') }}" + value_template: "{{ is_state('light.nursery_hue','on') and is_state('input_boolean.nursery_occupied','off') }}" delay_on: seconds: 30 @@ -723,3 +723,4 @@ sensors: icon_template: mdi:fridge-variant delay_on: minutes: 3 + diff --git a/components/input_datetime/sleepy_clock.yaml b/components/input_datetime/sleepy_clock.yaml index b5184db..e630b95 100644 --- a/components/input_datetime/sleepy_clock.yaml +++ b/components/input_datetime/sleepy_clock.yaml @@ -8,9 +8,3 @@ kids_bedtime_announcement_time: name: Kids Bedtime has_date: false has_time: true - - -kids_five_minute_warning_time: - name: Kids Warning Time - has_date: false - has_time: true diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index e5866cd..96deeef 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -33,6 +33,7 @@ recorder: - input_select.outdoor_camera_cycle - input_select.indoor_camera_cycle - sensor.nws_alerts_last_updated + - sensor.pixel_7_active_notification_count entity_globs: - sensor.*_text - sensor.*_last_motion diff --git a/components/packages/esphome_devices.yaml b/components/packages/esphome_devices.yaml index aeff13f..a24c1a9 100644 --- a/components/packages/esphome_devices.yaml +++ b/components/packages/esphome_devices.yaml @@ -1,37 +1,44 @@ -template: - - binary_sensor: - - name: White Bed Occupied - state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}" - icon: > - {% if is_state("binary_sensor.white_bed_occupied", "on") %} - mdi:bed-single - {% else %} - mdi:bed-single-outline - {% endif %} - - - name: Master Bed Occupied - state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}" - icon: > - {% if is_state("binary_sensor.master_bed_occupied", "on") %} - mdi:bed-king - {% else %} - mdi:bed-king-outline - {% endif %} - - - name: Master Bed Left Occupied - state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_left', 'on') }}" - icon: > - {% if is_state("binary_sensor.master_bed_left_occupied", "on") %} - mdi:bed-king - {% else %} - mdi:bed-king-outline - {% endif %} - - - name: Master Bed Right Occupied - state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_right', 'on') }}" - icon: > - {% if is_state("binary_sensor.master_bed_right_occupied", "on") %} - mdi:bed-king - {% else %} - mdi:bed-king-outline - {% endif %} \ No newline at end of file +template: + - binary_sensor: + - name: White Bed Occupied + state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}" + icon: > + {% if is_state("binary_sensor.white_bed_occupied", "on") %} + mdi:bed-single + {% else %} + mdi:bed-single-outline + {% endif %} + + - name: Master Bed Occupied + state: "{{ is_state('binary_sensor.bed_presence_2d14a4_bed_occupied_either', 'on') }}" + icon: > + {% if is_state("binary_sensor.master_bed_occupied", "on") %} + mdi:bed-king + {% else %} + mdi:bed-king-outline + {% endif %} + + - name: Master Bed Left Occupied + state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_left', 'on') }}" + icon: > + {% if is_state("binary_sensor.master_bed_left_occupied", "on") %} + mdi:bed-king + {% else %} + mdi:bed-king-outline + {% endif %} + + - name: Master Bed Right Occupied + state: "{{ is_state('binary_sensor.bed_presence_c175a4_bed_occupied_right', 'on') }}" + icon: > + {% if is_state("binary_sensor.master_bed_right_occupied", "on") %} + mdi:bed-king + {% else %} + mdi:bed-king-outline + {% endif %} + + - sensor: + - name: ESPHome Pending Updates + state: "{{ states.update | selectattr('state', 'eq', 'on') | map(attribute='entity_id') | select ('in',integration_entities('esphome')) | list | count }}" + icon: mdi:chip + attributes: + devices: "{{ states.update | selectattr('state', 'eq', 'on') | map(attribute='entity_id') | select ('in',integration_entities('esphome')) | list }}" \ No newline at end of file diff --git a/components/packages/logger.yaml b/components/packages/logger.yaml index 0dd6e14..2c85149 100644 --- a/components/packages/logger.yaml +++ b/components/packages/logger.yaml @@ -4,7 +4,7 @@ logger: logs: # WebRTC issues - custom_components.webrtc: debug + # custom_components.webrtc: debug # Grocy issues # pygrocy.grocy_api_client: debug @@ -47,7 +47,7 @@ logger: pychromecast.socket_client: - ".*socket.*" - ".*Failed to connect to service.*" - custom_components.grocy: - - ".*last_used.*" + # custom_components.grocy: + # - ".*last_used.*" homeassistant.components.roku.coordinator: - ".*Timeout occurred.*" \ No newline at end of file diff --git a/components/packages/lovelace.yaml b/components/packages/lovelace.yaml index dea57a0..c6f1976 100644 --- a/components/packages/lovelace.yaml +++ b/components/packages/lovelace.yaml @@ -27,20 +27,20 @@ lovelace: show_in_sidebar: true filename: ui-phone.yaml cams-yml: - mode: yaml - title: Cams - icon: mdi:camcorder - show_in_sidebar: false - filename: ui-cams.yaml + mode: yaml + title: Cams + icon: mdi:camcorder + show_in_sidebar: false + filename: ui-cams.yaml camera-casting-yml: - mode: yaml - title: Camera Casting - icon: mdi:cast - show_in_sidebar: false - filename: ui-camera-cast.yaml + mode: yaml + title: Camera Casting + icon: mdi:cast + show_in_sidebar: false + filename: ui-camera-cast.yaml details-yml: - mode: yaml - title: Details - icon: mdi:magnify - show_in_sidebar: false - filename: ui-details.yaml \ No newline at end of file + mode: yaml + title: Details + icon: mdi:magnify + show_in_sidebar: false + filename: ui-details.yaml \ No newline at end of file diff --git a/customizations/entities/lights.yaml b/customizations/entities/lights.yaml index 0e6b221..b9ea8b2 100644 --- a/customizations/entities/lights.yaml +++ b/customizations/entities/lights.yaml @@ -24,10 +24,10 @@ light.dining_room_3: light.entryway_hue: icon: mdi:ceiling-light -light.nursery_ceiling_hue: +light.nursery_hue: icon: mdi:ceiling-fan-light -light.master_bedroom_ceiling_hue: +light.master_bedroom_hue: icon: mdi:ceiling-fan-light light.front_room_hue: diff --git a/groups.yaml b/groups.yaml index 5e156ad..bba6845 100644 --- a/groups.yaml +++ b/groups.yaml @@ -297,7 +297,7 @@ my_lights: - light.front_room_hue - light.kitchen_hue - light.master_bathroom_hue - - light.master_bedroom_accent + - light.master_bedroom_hue - light.nursery_hue - light.black_bed_wled - light.white_bed_wled diff --git a/lovelace/cameras/view-camera-08.yaml b/lovelace/cameras/view-camera-08.yaml index d7cf880..c74e248 100644 --- a/lovelace/cameras/view-camera-08.yaml +++ b/lovelace/cameras/view-camera-08.yaml @@ -136,7 +136,7 @@ card: top: 16% - type: state-icon - entity: light.nursery_ceiling_hue + entity: light.nursery_hue style: left: 50% top: 3% diff --git a/lovelace/phone/master-bedroom.yaml b/lovelace/phone/master-bedroom.yaml index 6ee495a..dfe89de 100644 --- a/lovelace/phone/master-bedroom.yaml +++ b/lovelace/phone/master-bedroom.yaml @@ -53,14 +53,14 @@ cards: tap_action: action: toggle layout: vertical - - type: custom:mushroom-light-card - entity: light.master_bedroom_strips_hue - name: Strips - icon: mdi:led-strip-variant - hide_state: true - tap_action: - action: toggle - layout: vertical + # - type: custom:mushroom-light-card + # entity: light.master_bedroom_strips_hue + # name: Strips + # icon: mdi:led-strip-variant + # hide_state: true + # tap_action: + # action: toggle + # layout: vertical - type: horizontal-stack cards: - type: custom:mushroom-entity-card diff --git a/lovelace/resources.yaml b/lovelace/resources.yaml index 2ad5879..b01775e 100644 --- a/lovelace/resources.yaml +++ b/lovelace/resources.yaml @@ -5,18 +5,6 @@ - url: /hacsfiles/HA-Firemote/HA-Firemote.js type: module -# - url: /hacsfiles/webrtc/webrtc-camera.js -# type: module - -# - type: module -# url: /hacsfiles/webrtc-custom/webrtc-camera.js - -# - type: module -# url: /hacsfiles/webrtc-community/webrtc-camera.js - -# - type: module -# url: /hacsfiles/webrtc-full-community/webrtc-camera.js - # https://github.com/kalkih/mini-media-player - url: /hacsfiles/mini-media-player/mini-media-player-bundle.js type: module @@ -25,12 +13,6 @@ - type: module url: /local/floorplan/floorplan-card.js -# - url: /hacsfiles/power-flow-card-plus/power-flow-card-plus.js -# type: module - -# - type: module -# url: /local/webrtc/webrtc-camera.js - # HACS mini graph card - url: /hacsfiles/mini-graph-card/mini-graph-card-bundle.js type: module @@ -51,9 +33,6 @@ - url: /hacsfiles/lovelace-horizon-card/lovelace-horizon-card.js type: module -# - url: /hacsfiles/frigate-hass-card/frigate-hass-card.js -# type: module - - url: /hacsfiles/Home-Assistant-Mail-And-Packages-Custom-Card/Home-Assistant-Mail-And-Packages-Custom-Card.js type: module diff --git a/lovelace/room_cards/master_bedroom.yaml b/lovelace/room_cards/master_bedroom.yaml index 2ebbd32..49c4e7c 100644 --- a/lovelace/room_cards/master_bedroom.yaml +++ b/lovelace/room_cards/master_bedroom.yaml @@ -85,7 +85,7 @@ elements: #button #1 - type: "custom:button-card" color: auto - entity: light.master_bedroom_ceiling_hue + entity: light.master_bedroom_hue show_name: false style: left: 12% diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 8aad801..4ef84db 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -808,6 +808,8 @@ badges: # name: Frigate - entity: binary_sensor.need_to_open_something_too_warm_or_cold name: Open Something + show_name: true + show_state: false tap_action: action: navigate navigation_path: /details-yml/hvac @@ -815,6 +817,8 @@ badges: action: more-info - entity: binary_sensor.something_open_too_warm_or_cold name: Close Something + show_name: true + show_state: false tap_action: action: navigate navigation_path: /details-yml/hvac @@ -1049,10 +1053,6 @@ cards: name: Front Room TV - entity: media_player.downstairs_roku name: Downstairs Roku - - entity: light.master_bedroom_strips_hue - name: MBR Strips - tap_action: - action: toggle - entity: light.nursery_closet name: Nursery Closet tap_action: @@ -1317,30 +1317,47 @@ cards: card: type: vertical-stack cards: + # - type: entity-filter + # entities: + # - input_text.person_clint + # - input_text.person_kristy + # - input_text.person_emmett + # - input_text.person_bridget + # - input_text.person_marshall + # - input_text.person_tess + # - input_text.person_ebin + # - input_text.person_guest + # state_filter: + # - Home + # card: + # type: glance + # show_name: false + # show_state: true - type: horizontal-stack cards: - type: custom:mushroom-entity-card entity: input_boolean.out_of_bed_alert + icon: mdi:bed-empty secondary_info: none fill_container: false tap_action: action: toggle - name: Goodnight Kids + name: Alert - type: custom:mushroom-entity-card entity: input_boolean.announce_bedtime secondary_info: none fill_container: false tap_action: action: toggle - name: Announce Bedtime - - type: horizontal-stack - cards: - - type: entity - name: Warning - entity: input_datetime.kids_five_minute_warning_time - - type: entity name: Bedtime + - type: custom:mushroom-entity-card entity: input_datetime.kids_bedtime_announcement_time + icon: mdi:bed-clock + secondary_info: state + fill_container: false + tap_action: + action: more-info + name: Bedtime - type: glance show_name: false entities: diff --git a/lovelace/view-surveillance.yaml b/lovelace/view-surveillance.yaml index f54332a..7efe5e0 100644 --- a/lovelace/view-surveillance.yaml +++ b/lovelace/view-surveillance.yaml @@ -42,7 +42,7 @@ cards: # 11 and 12 - - !include /config/lovelace/cameras/view-camera-14.yaml + #- !include /config/lovelace/cameras/view-camera-14.yaml - !include /config/lovelace/cameras/view-camera-18.yaml - !include /config/lovelace/cameras/view-camera-19.yaml diff --git a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml index 1e9c76b..39367cf 100644 --- a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml +++ b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml @@ -20,7 +20,7 @@ sequence: - action: google_generative_ai_conversation.generate_content metadata: {} data: - prompt: Say something to help me wake up and get ready for work. Use up to two sentences. + prompt: Say something to help me wake up and get ready for work. Use up to three sentences. response_variable: response - action: media_player.play_media