diff --git a/automations/people/Clint/Clint_at_work.yaml b/automations/people/Clint/Clint_at_work.yaml index 2b8bf8c..8df97ae 100644 --- a/automations/people/Clint/Clint_at_work.yaml +++ b/automations/people/Clint/Clint_at_work.yaml @@ -4,7 +4,7 @@ id: automation_clint_at_work trigger: platform: state entity_id: device_tracker.pixel_7 - to: 'AGH' + to: 'WMU' action: - service: automation.turn_on entity_id: automation.clint_home_after_work diff --git a/automations/people/Clint/Clint_location_update.yaml b/automations/people/Clint/Clint_location_update.yaml index 4881e3b..bf8f2b8 100644 --- a/automations/people/Clint/Clint_location_update.yaml +++ b/automations/people/Clint/Clint_location_update.yaml @@ -10,6 +10,7 @@ trigger: entity_id: - input_select.clint_status_dropdown - input_boolean.clint_home + - device_tracker.pixel_7 condition: - condition: template diff --git a/automations/people/Clint/set_clint_next_alarm.yaml b/automations/people/Clint/set_clint_next_alarm.yaml index 341c0a5..152513b 100644 --- a/automations/people/Clint/set_clint_next_alarm.yaml +++ b/automations/people/Clint/set_clint_next_alarm.yaml @@ -28,7 +28,7 @@ action: target: entity_id: input_datetime.clint_next_alarm data: - time: "06:00:00" + time: "09:00:00" - conditions: - condition: state diff --git a/components/binary_sensors/rooms/computer_area_occupied.yaml b/components/binary_sensors/rooms/computer_area_occupied.yaml index 4d18bac..62e0834 100644 --- a/components/binary_sensors/rooms/computer_area_occupied.yaml +++ b/components/binary_sensors/rooms/computer_area_occupied.yaml @@ -8,24 +8,18 @@ observations: - entity_id: group.computer_area_motion prob_given_true: .99 - prob_given_false: 0.97 + prob_given_false: 0.5 platform: state to_state: 'on' - - entity_id: binary_sensor.computer_chair_contact_occupied - prob_given_true: .99 - prob_given_false: 0.97 - platform: state - to_state: 'on' + # - entity_id: binary_sensor.computer_chair_contact_occupied + # prob_given_true: .99 + # prob_given_false: 0.5 + # platform: state + # to_state: 'on' - entity_id: input_boolean.home_occupied platform: state - prob_given_true: .99 - prob_given_false: 0.01 + prob_given_true: .7 + prob_given_false: 0.1 to_state: 'on' - - - entity_id: binary_sensor.computer_area_person_occupancy - prob_given_true: .99 - prob_given_false: 0.97 - platform: state - to_state: 'on' \ No newline at end of file diff --git a/components/binary_sensors/template.yaml b/components/binary_sensors/template.yaml index 0c5366f..81461d0 100644 --- a/components/binary_sensors/template.yaml +++ b/components/binary_sensors/template.yaml @@ -702,7 +702,7 @@ sensors: unique_id: templatesensor.take_trash_out friendly_name: "Take Trash Out" icon_template: mdi:trash-can - value_template: "{{ is_state('calendar.trash_schedule','on') or state_attr('calendar.trash_schedule','offset_reached') and is_state('input_boolean.trash_out','off') }}" + value_template: "{{ (is_state('calendar.trash_schedule','on') or state_attr('calendar.trash_schedule','offset_reached')) and is_state('input_boolean.trash_out','off') }}" need_salt: unique_id: templatebinarysensor.need_salt @@ -724,13 +724,6 @@ sensors: value_template: "{{ states('binary_sensor.white_bed_occupied') }}" icon_template: "{{ iif(is_state('binary_sensor.white_bed_occupied','on'),'mdi:bed','mdi:bed-empty','mdi:bed-outline')}}" - should_mow: # - unique_id: templatebinarysensor.should_mow - friendly_name: Should Mow - #value_template: "{{ as_timestamp(states('sensor.chore_mow')) < as_timestamp(now()) }}" - value_template: "{{ (( now().month > 3 ) and ( now().month < 9 )) and (as_timestamp(states('sensor.chore_mow')) < as_timestamp(now())) }}" - icon_template: mdi:mower-bag - check_mail: unique_id: templatebinarysensor.check_mail friendly_name: Check Mail diff --git a/components/packages/databases.yaml b/components/packages/databases.yaml index 88a9bd7..b2dbb04 100644 --- a/components/packages/databases.yaml +++ b/components/packages/databases.yaml @@ -35,12 +35,6 @@ recorder: - automation.cam14_ptz_presets - automation.cam14_ptz_move - automation.cycle_back_yard_camera - - sensor.grocy_chores - - sensor.grocy_shopping_list - - sensor.grocy_stock - - sensor.grocy_tasks - - sensor.grocy_batteries - - sensor.grocy_meal_plan entity_globs: - sensor.*_text - sensor.*_last_motion @@ -72,7 +66,6 @@ recorder: - sensor.opus* - sensor.wt* - sensor.*cpu_usage - - binary_sensor.grocy* - sensor.fineoffset_wh1050* - sensor.ambietweather* - sensor.esic* @@ -82,6 +75,8 @@ recorder: - sensor.tfa_* - sensor.rubicscon_* - sensor.interlogix* + - sensor.*_timestamp + - sensor.everything_presence_lite*target* domains: - updater - calendar @@ -137,10 +132,8 @@ history: # - binary_sensor.55_tcl* # - binary_sensor.roku_streaming_stick* # - binary_sensor.dream_nas* - # - binary_sensor.grocy* # - binary_sensor.dream_nas* # - sensor.dream_nas* - # - sensor.grocy* # - sensor.*cpu_percent # - sensor.*memory_percent # - sensor.*weight @@ -228,6 +221,7 @@ logbook: - number.*_basic - sensor.*cube* - sensor.*power_outage_count + - sensor.*_timestamp domains: - sun - device_tracker diff --git a/esphome/trash/kitchen-appliance-temps.yaml b/esphome/archive/kitchen-appliance-temps.yaml similarity index 100% rename from esphome/trash/kitchen-appliance-temps.yaml rename to esphome/archive/kitchen-appliance-temps.yaml diff --git a/esphome/everything-presence-lite-8fa4fc.yaml b/esphome/everything-presence-lite-8fa4fc.yaml new file mode 100644 index 0000000..96f857c --- /dev/null +++ b/esphome/everything-presence-lite-8fa4fc.yaml @@ -0,0 +1,17 @@ +substitutions: + name: everything-presence-lite-8fa4fc + friendly_name: Everything Presence Great Room +packages: + EverythingSmartTechnology.Everything_Presence_Lite: github://everythingsmarthome/everything-presence-lite/everything-presence-lite-ha.yaml@main +esphome: + name: ${name} + name_add_mac_suffix: false + friendly_name: ${friendly_name} +api: + encryption: + key: Qi7Fi+ayleijFB6gE1/jnEtuI95NCEiwNM/QnqB+e28= + + +wifi: + ssid: !secret wifi_ssid + password: !secret wifi_password diff --git a/esphome/white-bed.yaml b/esphome/white-bed.yaml index 8fe5266..9839853 100644 --- a/esphome/white-bed.yaml +++ b/esphome/white-bed.yaml @@ -23,5 +23,5 @@ packages: device_base: !include common/device_base.yaml hx711: !include common/hx711_single_verbose.yaml -esp8266: - board: nodemcuv2 +esp32: + board: nodemcu-32s diff --git a/groups.yaml b/groups.yaml index 0d0b514..851efb2 100644 --- a/groups.yaml +++ b/groups.yaml @@ -99,6 +99,7 @@ computer_area_motion: entities: - binary_sensor.computer_area_multisensor_home_security_motion_detection - binary_sensor.great_room_motion_switch_home_security_motion_detection + - binary_sensor.everything_presence_lite_8fa4fc_occupancy utility_room_motion: icon: mdi:motion-sensor @@ -118,6 +119,7 @@ great_room_motion: name: Great Room Motion entities: - binary_sensor.great_room_multisensor_home_security_motion_detection + - binary_sensor.everything_presence_lite_8fa4fc_occupancy nursery_doors: icon: hass:door diff --git a/lovelace/details/view-mobile-app.yaml b/lovelace/details/view-mobile-app.yaml index 0b9187c..35f7791 100644 --- a/lovelace/details/view-mobile-app.yaml +++ b/lovelace/details/view-mobile-app.yaml @@ -17,6 +17,7 @@ cards: - entity: sensor.pixel_7_battery_level - entity: sensor.pixel_7_battery_state - entity: sensor.pixel_7_battery_temperature + - entity: sensor.pixel_7_ringer_mode - entity: binary_sensor.pixel_7_headphones - entity: binary_sensor.pixel_7_is_charging - entity: binary_sensor.pixel_7_work_profile diff --git a/lovelace/details/view-weather.yaml b/lovelace/details/view-weather.yaml index 31012c8..f2ee017 100644 --- a/lovelace/details/view-weather.yaml +++ b/lovelace/details/view-weather.yaml @@ -34,7 +34,7 @@ cards: - type: weather-forecast - entity: weather.openweathermap + entity: weather.kbiv name: Next 5 Hours show_current: true show_forecast: true diff --git a/lovelace/view-chores-all.yaml b/lovelace/view-chores-all.yaml deleted file mode 100644 index 158f433..0000000 --- a/lovelace/view-chores-all.yaml +++ /dev/null @@ -1,83 +0,0 @@ -title: All Chores -path: chores-all -icon: mdi:broom -visible: - - user: 24a4bd075e7f41a497dd0390a1dd4a9f -cards: - -- type: custom:grocy-chores-card - title: Daddy's Chores - user_id: 2 - filter_user: 2 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Chickadee's Chores - user_id: 5 - filter_user: 5 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Marshall's Chores - user_id: 6 - filter_user: 6 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Tess' Chores - user_id: 7 - filter_user: 7 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Emmett's Chores - user_id: 3 - filter_user: 3 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Bridget's Chores - user_id: 4 - filter_user: 4 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores - -- type: custom:grocy-chores-card - title: Ebin's Chores - user_id: 8 - filter_user: 8 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_chores \ No newline at end of file diff --git a/lovelace/view-overview.yaml b/lovelace/view-overview.yaml index 48d7ce3..b1fe29d 100644 --- a/lovelace/view-overview.yaml +++ b/lovelace/view-overview.yaml @@ -404,19 +404,32 @@ badges: - type: conditional conditions: - - condition: numeric_state - entity: sensor.pixel_7_volume_level_ringer - below: 1 + - entity: sensor.pixel_7_ringer_mode + state: "silent" chip: type: template - entity: sensor.pixel_7_volume_level_ringer + entity: sensor.pixel_7_ringer_mode content: Silent - icon: mdi:cellphone + icon: mdi:volume-off icon_color: red tap_action: action: navigate navigation_path: /details-yml/mobile-app + - type: conditional + conditions: + - entity: sensor.pixel_7_ringer_mode + state: "vibrate" + chip: + type: template + entity: sensor.pixel_7_ringer_mode + content: Vibrate + icon: mdi:vibrate + icon_color: yellow + tap_action: + action: navigate + navigation_path: /details-yml/mobile-app + - type: conditional conditions: - entity: binary_sensor.sprinkler_in_season @@ -875,7 +888,7 @@ badges: service: homeassistant.turn_on service_data: entity_id: input_boolean.mail_checked - - entity: binary_sensor.take_dumpster_to_curb + - entity: binary_sensor.take_trash_out name: Trash tap_action: action: call-service @@ -888,36 +901,6 @@ badges: name: Update - entity: binary_sensor.computer_chair_contact_occupied name: Comp Chair - - entity: binary_sensor.grocy_overdue_chores - name: Chores - tap_action: - action: navigate - navigation_path: /details-yml/chores - - entity: binary_sensor.grocy_overdue_tasks - name: Tasks - tap_action: - action: navigate - navigation_path: /details-yml/chores - - entity: binary_sensor.grocy_overdue_products - name: Overdue - tap_action: - action: navigate - navigation_path: /details-yml/stock - - entity: binary_sensor.grocy_missing_products - name: Missing - tap_action: - action: navigate - navigation_path: /details-yml/stock - - entity: binary_sensor.grocy_expiring_products - name: Expiring - tap_action: - action: navigate - navigation_path: /details-yml/stock - - entity: binary_sensor.grocy_expired_products - name: Expired - tap_action: - action: navigate - navigation_path: /details-yml/stock - entity: binary_sensor.humidity_too_low name: Too Dry hold_action: @@ -1501,7 +1484,7 @@ cards: camera_entity: camera.mail_usps_camera - type: custom:hourly-weather - entity: weather.openweathermap + entity: weather.kbiv icons: true name: "" hide_hours: false diff --git a/lovelace/view-tasks-all.yaml b/lovelace/view-tasks-all.yaml deleted file mode 100644 index bcf9bcb..0000000 --- a/lovelace/view-tasks-all.yaml +++ /dev/null @@ -1,76 +0,0 @@ -title: All Tasks -path: tasks-all -icon: mdi:checkbox-marked-circle -visible: - - user: 24a4bd075e7f41a497dd0390a1dd4a9f -cards: - -- type: custom:grocy-chores-card - title: Daddy's Tasks - user_id: 2 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Chickadee's Tasks - user_id: 5 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Marshall's Tasks - user_id: 6 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Tess' Tasks - user_id: 7 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Emmett's Tasks - user_id: 3 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Bridget's Tasks - user_id: 4 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks - -- type: custom:grocy-chores-card - title: Ebin's Tasks - user_id: 8 - show_quantity: 5 - show_days: 5 - show_create_task: false - show_assigned: false - entity: - - sensor.grocy_tasks \ No newline at end of file diff --git a/scripts/grocy_say_chores.yaml b/scripts/grocy_say_chores.yaml deleted file mode 100644 index 31f3701..0000000 --- a/scripts/grocy_say_chores.yaml +++ /dev/null @@ -1,91 +0,0 @@ -mode: parallel -alias: Grocy Say Chores - -sequence: - - variables: - speaker: "{{speaker}}" - closing_line: > - {% if room is defined %} - Nothing needs to be done in the {{ room }} - {% elif person is defined %} - {{ person }} doesn't need to do anything - {% else %} - Nothing pressing needs to be done - {% endif %} - object_name: > - {% if room is defined %} - {{ (room | lower).replace(' ','_')~"_" }} - {% elif person is defined %} - {{ (person | lower).replace(' ','_')~"_" }} - {% else %} - {% endif %} - room_name: > - {% if room is defined %} - {% if room == "All" %}{%else%}{{ (room | lower).replace(' ','_')~"_" }}{%endif%} - {% endif %} - person_name: > - {% if person is defined %} - {{ (person | lower).replace(' ','_')~"_" }} - {% endif %} - - - alias: "Say next three chores" - service: tts.google_translate_say - data: - entity_id: "{{speaker}}" - message: >- - {% if not is_state('sensor.'~object_name~'chore_one',"None") -%} - First you should {{ states('sensor.'~object_name~'chore_one') }}. - {% if not is_state('sensor.'~object_name~'chore_two',"None") -%} - After that, you can {{ states('sensor.'~object_name~'chore_two') }} - {% if not is_state('sensor.'~object_name~'chore_three',"None") -%} - Finally, you can always {{ states('sensor.'~object_name~'chore_three') }} - {% endif -%} - {% endif -%} - {%- else -%} - {{ closing_line }} - {% endif -%} - -fields: - room: - description: Choose room to hear chores associate with the selected room (takes prescedence over person) - example: Blue Room - selector: - select: - options: - - Blue Room - - Computer Area - - Dining Room - - Entryway - - Front Room - - Furnace Room - - Garage - - Kitchen - - Great Room - - Mancave - - Master Bathroom - - Master Bedroom - - Nursery - - Utility Room - - Other - - person: - description: Choose person to hear chores associate with that person (if a room is not chosen) - example: Daddy - selector: - select: - options: - - Daddy - - Chickadee - - Marshall - - Tess - - Emmett - - Bridget - - Ebin - - Other - - speaker: - description: Speaker to announce chores on - example: media_player.announcements - selector: - entity: - domain: media_player \ No newline at end of file