diff --git a/.gitignore b/.gitignore index cbbb60b..312bace 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,7 @@ rtl_433/ tts/ /lovelace/private model_cache/ +www/mail_and_packages/* secrets.yaml google_calendars.yaml diff --git a/automations/people/Clint/Clint_home.yaml b/automations/people/Clint/Clint_home.yaml index ce5ebc3..8183b1f 100644 --- a/automations/people/Clint/Clint_home.yaml +++ b/automations/people/Clint/Clint_home.yaml @@ -34,16 +34,16 @@ action: above: 0 value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_clint', 'entity_id'))|list)|groupby('state'))['home']|count }}" - condition: state - entity_id: sensor.pixel_10_pro_wifi_connection + entity_id: sensor.pixel_10_pro_wi_fi_connection state: "DreamWeaver" - condition: state - entity_id: sensor.pixel_10_pro_wifi_connection + entity_id: sensor.pixel_10_pro_wi_fi_connection state: "DreamIoT-2G" - condition: state - entity_id: sensor.pixel_10_pro_wifi_connection + entity_id: sensor.pixel_10_pro_wi_fi_connection state: "pozfam" - condition: state - entity_id: sensor.pixel_10_pro_wifi_connection + entity_id: sensor.pixel_10_pro_wi_fi_connection state: "pozfam-2.4G" - condition: trigger id: "car_home" diff --git a/automations/people/Clint/wake_clint.yaml b/automations/people/Clint/wake_clint.yaml index 237ec3a..ee0e0ca 100644 --- a/automations/people/Clint/wake_clint.yaml +++ b/automations/people/Clint/wake_clint.yaml @@ -37,16 +37,22 @@ action: target: entity_id: input_select.master_bedroom_mode + - action: media_player.shuffle_set + target: + entity_id: media_player.ma_bedroom_hub + data: + shuffle: true + - action: music_assistant.play_media target: #entity_id: media_player.ma_home_assistant_voice_097b44_media_player entity_id: media_player.ma_bedroom_hub data: media_type: playlist - #media_id: library://playlist/7 - media_id: > - {% set playlists = ['library://playlist/33','library://playlist/32','library://playlist/21','library://playlist/28','library://playlist/27','library://playlist/22','library://playlist/29','library://playlist/36','library://playlist/23','library://playlist/12','library://playlist/34','library://playlist/35','library://playlist/19'] %} - {{ playlists|random }} + media_id: library://playlist/7 + #media_id: > + # {% set playlists = ['library://playlist/32','library://playlist/9'] %} + # {{ playlists|random }} enqueue: replace - action: script.wake_the_bedroom diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index 856a69d..1d22810 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -30,6 +30,7 @@ recorder: - sensor.mail_updated - light.upstairs_public - sensor.nws_alerts_last_updated + - sensor.pixel_7_active_notification_count - sensor.pixel_10_pro_active_notification_count entity_globs: - sensor.*_text diff --git a/components/packages/lovelace.yaml b/components/packages/lovelace.yaml index f2945d0..932e9ad 100644 --- a/components/packages/lovelace.yaml +++ b/components/packages/lovelace.yaml @@ -1,5 +1,5 @@ lovelace: - mode: yaml + resource_mode: yaml resources: !include ../../lovelace/resources.yaml dashboards: lovelace-yaml: @@ -7,7 +7,7 @@ lovelace: title: Daddy's House icon: mdi:home show_in_sidebar: true - filename: ui-lovelace.yaml + filename: ui-cleverhome.yaml data-yml: mode: yaml title: Data @@ -37,7 +37,7 @@ lovelace: title: Casting icon: mdi:cast show_in_sidebar: false - filename: ui-cast.yaml + filename: ui-casting.yaml details-yml: mode: yaml title: Details diff --git a/components/packages/template_binary_sensors.yaml b/components/packages/template_binary_sensors.yaml index 5d1f392..28ce28d 100644 --- a/components/packages/template_binary_sensors.yaml +++ b/components/packages/template_binary_sensors.yaml @@ -3,7 +3,7 @@ template: - unique_id: templatebinarysensor.pixel_10_pro_connected_to_traverse default_entity_id: binary_sensor.pixel_10_pro_connected_to_traverse icon: mdi:cellphone-key - name: Pixel 7 Connected to Traverse + name: Pixel 10 Connected to Traverse state: "{{ '30:C3:D9:B0:CA:E4 (Chevrolet MyLink)' in state_attr('sensor.pixel_10_pro_bluetooth_connection','connected_paired_devices') }}" - unique_id: templatebinarysensor.humidity_too_low diff --git a/esphome/home-assistant-voice-097b44.yaml b/esphome/home-assistant-voice-097b44.yaml index 6f72272..efccaa3 100644 --- a/esphome/home-assistant-voice-097b44.yaml +++ b/esphome/home-assistant-voice-097b44.yaml @@ -16,40 +16,55 @@ esphome: name_add_mac_suffix: false friendly_name: ${friendly_name} +api: + reboot_timeout: 15min + encryption: + key: !secret api-encryption-key + +ota: + - platform: esphome + password: !secret ota-password + +captive_portal: + button: - id: !remove local_restart_button +sensor: + - id: !remove heap_free_sensor + - id: !remove loop_time_sensor + # forget all of this extending bullshit and implement this: # https://www.home-assistant.io/integrations/universal/ -switch: - - platform: template - name: "External Power Switch" - id: external_power_switch - turn_on_action: - - logger.log: "External Power Switch turned on" - - media_player.turn_on: - id: external_media_player - # - lambda: return; - turn_off_action: - - logger.log: "External Power Switch turned off" - - media_player.turn_off: - id: external_media_player - # - lambda: return; +# switch: +# - platform: template +# name: "External Power Switch" +# id: external_power_switch +# turn_on_action: +# - logger.log: "External Power Switch turned on" +# - media_player.turn_on: +# id: external_media_player +# # - lambda: return; +# turn_off_action: +# - logger.log: "External Power Switch turned off" +# - media_player.turn_off: +# id: external_media_player +# # - lambda: return; -media_player: - - id: !extend external_media_player +# media_player: +# - id: !extend external_media_player - # Define the actions Home Assistant will call - on_turn_on: - - logger.log: "Media Player Turned On via on_turn_on action" - # - lambda: |- - # // No action needed, Home Assistant can call this service - # return; +# # Define the actions Home Assistant will call +# on_turn_on: +# - logger.log: "Media Player Turned On via on_turn_on action" +# # - lambda: |- +# # // No action needed, Home Assistant can call this service +# # return; - on_turn_off: - - logger.log: "Media Player Turned Off via on_turn_off action" - # - lambda: |- - # // No action needed, Home Assistant can call this service - # return; \ No newline at end of file +# on_turn_off: +# - logger.log: "Media Player Turned Off via on_turn_off action" +# # - lambda: |- +# # // No action needed, Home Assistant can call this service +# # return; \ No newline at end of file diff --git a/lovelace/details/view-batteries.yaml b/lovelace/details/view-batteries.yaml index f1b5d0c..993ebfc 100644 --- a/lovelace/details/view-batteries.yaml +++ b/lovelace/details/view-batteries.yaml @@ -9,8 +9,10 @@ cards: - type: entities title: Smart Devices entities: + - entity: sensor.pixel_10_pro_battery_level + name: Pixel 10 Pro - entity: sensor.pixel_7_battery_level - name: Clint's Phone + name: Pixel 7 - type: entities title: Ecowitt Batteries entities: diff --git a/lovelace/details/view-mobile-app.yaml b/lovelace/details/view-mobile-app.yaml index 55fd3b4..e7fa1cc 100644 --- a/lovelace/details/view-mobile-app.yaml +++ b/lovelace/details/view-mobile-app.yaml @@ -26,3 +26,15 @@ cards: - entity: sensor.pixel_10_pro_charger_type - entity: binary_sensor.pixel_10_pro_android_auto title: Phone + header: + type: buttons + entities: + - entity: script.pixel_7_to_silent + icon: mdi:volume-mute + name: Silent + - entity: script.pixel_7_to_vibrate + icon: mdi:vibrate + name: Vibrate + - entity: script.pixel_10_to_normal_mode + icon: mdi:phone-ring + name: Normal diff --git a/lovelace/details/view-watchman.yaml b/lovelace/details/view-watchman.yaml index 7a39dc4..137331c 100644 --- a/lovelace/details/view-watchman.yaml +++ b/lovelace/details/view-watchman.yaml @@ -21,8 +21,8 @@ sections: cards: - type: markdown content: >- -

Missing Services: {{ states.sensor.watchman_missing_services.state }}

- {%- for item in state_attr("sensor.watchman_missing_services","entities") %} +

Missing Actions: {{ states.sensor.watchman_missing_actions.state }}

+ {%- for item in state_attr("sensor.watchman_missing_actions","entities") %}
{{item.id }} {{item.occurrences.split('/')[-1].split(':')[0]}}
@@ -59,7 +59,7 @@ badges: show_name: true show_state: true show_icon: true - entity: sensor.watchman_missing_services - name: Missing Services + entity: sensor.watchman_missing_actions + name: Missing Actions tap_action: action: none diff --git a/lovelace/room_cards/master_bathroom.yaml b/lovelace/room_cards/master_bathroom.yaml index 9babd58..b71620c 100644 --- a/lovelace/room_cards/master_bathroom.yaml +++ b/lovelace/room_cards/master_bathroom.yaml @@ -50,7 +50,7 @@ elements: # left: 76% # top: 9% - type: state-icon - entity: binary_sensor.master_bathroom_too_humid + entity: binary_sensor.bathroom_multisensor_too_humid style: left: 76% top: 9% diff --git a/lovelace/room_cards/utility_room.yaml b/lovelace/room_cards/utility_room.yaml index 734b54d..a3cd334 100644 --- a/lovelace/room_cards/utility_room.yaml +++ b/lovelace/room_cards/utility_room.yaml @@ -51,7 +51,7 @@ elements: # left: 76% # top: 9% - type: state-icon - entity: binary_sensor.utility_room_too_humid + entity: binary_sensor.utility_room_multisensor_too_humid style: left: 76% top: 9% diff --git a/lovelace/view-ha-floorplan.yaml b/lovelace/view-ha-floorplan.yaml index fc3391b..053dbe8 100644 --- a/lovelace/view-ha-floorplan.yaml +++ b/lovelace/view-ha-floorplan.yaml @@ -386,7 +386,7 @@ cards: var temp = parseFloat(entity.state.replace("°", "")); if (temp < 58) return "temp-freeze"; - else if (temp < 64) + else if (temp < 68) return "temp-low"; else if (temp < 75) return "temp-medium"; diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 3533996..977eb21 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -447,13 +447,13 @@ badges: - type: conditional conditions: - - entity: sensor.watchman_missing_services + - entity: sensor.watchman_missing_actions state_not: unavailable - - entity: sensor.watchman_missing_services + - entity: sensor.watchman_missing_actions state_not: "0" chip: type: entity - entity: sensor.watchman_missing_services + entity: sensor.watchman_missing_actions tap_action: action: navigate navigation_path: /details-yml/watchman diff --git a/ui-cast.yaml b/ui-casting.yaml similarity index 100% rename from ui-cast.yaml rename to ui-casting.yaml diff --git a/ui-lovelace.yaml b/ui-cleverhome.yaml similarity index 100% rename from ui-lovelace.yaml rename to ui-cleverhome.yaml diff --git a/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d.gif b/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d.gif deleted file mode 100644 index 94e230c..0000000 Binary files a/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d.gif and /dev/null differ diff --git a/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d_grid.png b/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d_grid.png deleted file mode 100644 index 3404dca..0000000 Binary files a/www/mail_and_packages/0eb48ea5-95c1-4db5-81d3-81450c08f48d_grid.png and /dev/null differ diff --git a/www/mail_and_packages/fedex/f0ed786f-014e-4d93-bb60-8e239e9d450e.jpg b/www/mail_and_packages/fedex/f0ed786f-014e-4d93-bb60-8e239e9d450e.jpg deleted file mode 100644 index 6ce288e..0000000 Binary files a/www/mail_and_packages/fedex/f0ed786f-014e-4d93-bb60-8e239e9d450e.jpg and /dev/null differ