diff --git a/automations/house/home_not_occupied.yaml b/automations/house/home_not_occupied.yaml index ac81189..4f7f41b 100644 --- a/automations/house/home_not_occupied.yaml +++ b/automations/house/home_not_occupied.yaml @@ -38,12 +38,12 @@ action: - action: automation.turn_on data: entity_id: automation.garage_open_nobody_home - - choose: - - conditions: - - condition: state - entity_id: binary_sensor.patio_door_contact - state: "off" - sequence: - - action: lock.lock - target: - entity_id: lock.patio_door + # - choose: + # - conditions: + # - condition: state + # entity_id: binary_sensor.patio_door_contact + # state: "off" + # sequence: + # - action: lock.lock + # target: + # entity_id: lock.patio_door diff --git a/automations/people/Bridget/bridget_awake.yaml b/automations/people/Bridget/bridget_awake.yaml new file mode 100644 index 0000000..a4aa609 --- /dev/null +++ b/automations/people/Bridget/bridget_awake.yaml @@ -0,0 +1,33 @@ +alias: Bridget Awake +id: automation_bridget_awake +mode: restart +#description: + +trigger: + - platform: state + entity_id: input_boolean.bridget_in_bed + to: "off" + for: "00:05:00" +action: + - action: input_boolean.turn_on + entity_id: input_boolean.bridget_is_awake + + - action: script.turn_on + entity_id: script.bridget_travel_sensor + + - choose: + - conditions: + - condition: state + entity_id: input_boolean.girls_room_asleep + state: "on" + - condition: state + entity_id: binary_sensor.nursery_occupied + state: "off" + sequence: + - action: input_boolean.turn_on + entity_id: + - input_boolean.bridget_in_bed + + - action: input_boolean.turn_on + entity_id: + - input_boolean.bridget_is_awake diff --git a/automations/people/Bridget/bridget_home.yaml b/automations/people/Bridget/bridget_home.yaml index ea8e3e9..515ea72 100644 --- a/automations/people/Bridget/bridget_home.yaml +++ b/automations/people/Bridget/bridget_home.yaml @@ -18,7 +18,5 @@ condition: entity_id: binary_sensor.bridget_home state: "on" action: - - action: input_boolean.turn_off - entity_id: input_boolean.bridget_travelling - action: input_boolean.turn_on entity_id: input_boolean.bridget_home diff --git a/automations/people/Bridget/bridget_status_at_startup.yaml b/automations/people/Bridget/bridget_status_at_startup.yaml index 24da3fa..855bd25 100644 --- a/automations/people/Bridget/bridget_status_at_startup.yaml +++ b/automations/people/Bridget/bridget_status_at_startup.yaml @@ -6,6 +6,7 @@ mode: restart trigger: - trigger: homeassistant event: start + condition: - condition: state entity_id: input_boolean.bridget_home diff --git a/automations/people/Clint/Clint_home.yaml b/automations/people/Clint/Clint_home.yaml index 8368465..6cea8f2 100644 --- a/automations/people/Clint/Clint_home.yaml +++ b/automations/people/Clint/Clint_home.yaml @@ -48,8 +48,6 @@ action: - condition: trigger id: "car_home" sequence: - - action: input_boolean.turn_off - entity_id: input_boolean.clint_travelling - action: input_boolean.turn_on entity_id: input_boolean.clint_home - action: automation.turn_on diff --git a/automations/people/Clint/Clint_home_after_work.yaml b/automations/people/Clint/Clint_home_after_work.yaml deleted file mode 100644 index 2a39e8a..0000000 --- a/automations/people/Clint/Clint_home_after_work.yaml +++ /dev/null @@ -1,29 +0,0 @@ -initial_state: "off" -alias: "clint home after work" -id: automation_home_after_work -#description: -trigger: - platform: state - entity_id: device_tracker.pixel_7 - to: "home" - for: - minutes: 10 -condition: - condition: and - conditions: - - condition: state - entity_id: input_boolean.notify_clint_work - state: "on" - - condition: or - conditions: - - condition: time - after: "15:00:00" - weekday: - - mon - - tue - - wed - - thu - - fri -action: - - action: homeassistant.turn_off - entity_id: automation.clint_home_after_work diff --git a/automations/people/Clint/Clint_in_bed.yaml b/automations/people/Clint/Clint_in_bed.yaml index 5a3bca2..ba4d962 100644 --- a/automations/people/Clint/Clint_in_bed.yaml +++ b/automations/people/Clint/Clint_in_bed.yaml @@ -32,8 +32,8 @@ trigger: entity_id: sensor.pixel_7_charger_type to: "wireless" - platform: state - entity_id: input_boolean.clint_tablet_charging - to: "on" + entity_id: sensor.dreamsurface_dreamsurface_battery_powerline_status + to: "Online" condition: - alias: "An adult is home and not in bed" condition: or diff --git a/automations/people/Clint/Clint_travelling.yaml b/automations/people/Clint/Clint_travelling.yaml deleted file mode 100644 index 3a0b16d..0000000 --- a/automations/people/Clint/Clint_travelling.yaml +++ /dev/null @@ -1,16 +0,0 @@ -alias: Clint Travelling -id: automation_clint_travelling -initial_state: "on" -#description: -trigger: - - platform: homeassistant - event: start - - platform: time - at: "21:00:00" -condition: - - condition: state - entity_id: input_boolean.clint_home - state: "off" -action: - - action: input_boolean.turn_on - entity_id: input_boolean.clint_travelling diff --git a/automations/people/Clint/wake_clint.yaml b/automations/people/Clint/wake_clint.yaml index 71f88b6..c50186d 100644 --- a/automations/people/Clint/wake_clint.yaml +++ b/automations/people/Clint/wake_clint.yaml @@ -21,7 +21,7 @@ action: - action: media_player.volume_set data: - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player volume_level: 0.50 - choose: diff --git a/automations/people/Ebin/ebin_home.yaml b/automations/people/Ebin/ebin_home.yaml index 8602584..14be41f 100644 --- a/automations/people/Ebin/ebin_home.yaml +++ b/automations/people/Ebin/ebin_home.yaml @@ -19,7 +19,5 @@ condition: entity_id: person.kristy state: "home" action: - - action: input_boolean.turn_off - entity_id: input_boolean.ebin_travelling - action: input_boolean.turn_on entity_id: input_boolean.ebin_home diff --git a/automations/people/Emmett/emmett_asleep.yaml b/automations/people/Emmett/emmett_asleep.yaml index 2950e12..93dcbac 100644 --- a/automations/people/Emmett/emmett_asleep.yaml +++ b/automations/people/Emmett/emmett_asleep.yaml @@ -2,16 +2,16 @@ alias: Emmett Asleep id: automation_emmett_asleep mode: restart -trigger: - - platform: state +triggers: + - trigger: state id: in_bed entity_id: input_boolean.emmett_in_bed to: "on" for: "00:20:00" - - platform: homeassistant + - trigger: homeassistant event: start -condition: +conditions: - condition: state entity_id: - input_boolean.emmett_home diff --git a/automations/people/Emmett/emmett_awake.yaml b/automations/people/Emmett/emmett_awake.yaml new file mode 100644 index 0000000..3d45216 --- /dev/null +++ b/automations/people/Emmett/emmett_awake.yaml @@ -0,0 +1,17 @@ +alias: Emmett Awake +id: automation_emmett_awake +mode: restart +#description: + +trigger: + - platform: state + entity_id: input_boolean.emmett_in_bed + to: "off" + for: "00:00:30" + +action: + - action: input_boolean.turn_on + entity_id: input_boolean.emmett_is_awake + + - action: script.turn_on + entity_id: script.emmett_travel_sensor diff --git a/automations/people/Emmett/emmett_home.yaml b/automations/people/Emmett/emmett_home.yaml index d6d446d..ec9c137 100644 --- a/automations/people/Emmett/emmett_home.yaml +++ b/automations/people/Emmett/emmett_home.yaml @@ -16,7 +16,5 @@ condition: entity_id: binary_sensor.emmett_home state: "on" action: - - action: input_boolean.turn_off - entity_id: input_boolean.emmett_travelling - action: input_boolean.turn_on entity_id: input_boolean.emmett_home diff --git a/automations/people/Kristy/kristy_home.yaml b/automations/people/Kristy/kristy_home.yaml index f131e7a..b8ce8ee 100644 --- a/automations/people/Kristy/kristy_home.yaml +++ b/automations/people/Kristy/kristy_home.yaml @@ -28,9 +28,6 @@ condition: value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_kristy', 'entity_id'))|list)|groupby('state'))['home']|count }}" action: - - action: input_boolean.turn_off - entity_id: input_boolean.kristy_travelling - - action: input_boolean.turn_on entity_id: input_boolean.kristy_home diff --git a/automations/people/Marshall/marshall_home.yaml b/automations/people/Marshall/marshall_home.yaml index 861378b..b7774b0 100644 --- a/automations/people/Marshall/marshall_home.yaml +++ b/automations/people/Marshall/marshall_home.yaml @@ -28,7 +28,5 @@ condition: value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_marshall', 'entity_id'))|list)|groupby('state'))['home']|count }}" action: - - action: input_boolean.turn_off - entity_id: input_boolean.marshall_travelling - action: input_boolean.turn_on entity_id: input_boolean.marshall_home diff --git a/automations/people/Tess/tess_home.yaml b/automations/people/Tess/tess_home.yaml index 9f4783b..fd9498e 100644 --- a/automations/people/Tess/tess_home.yaml +++ b/automations/people/Tess/tess_home.yaml @@ -18,7 +18,5 @@ condition: above: 0 value_template: "{{ dict((states|selectattr('entity_id', 'in', state_attr('group.person_tess', 'entity_id'))|list)|groupby('state'))['home']|count }}" action: - - action: input_boolean.turn_off - entity_id: input_boolean.tess_travelling - action: input_boolean.turn_on entity_id: input_boolean.tess_home diff --git a/automations/people/adults_asleep.yaml b/automations/people/adults_asleep.yaml index 8a5dbb0..5b56042 100644 --- a/automations/people/adults_asleep.yaml +++ b/automations/people/adults_asleep.yaml @@ -53,15 +53,15 @@ action: entity_id: input_select.master_bedroom_mode data: option: Nightlight - - choose: - - conditions: - - condition: state - entity_id: binary_sensor.patio_door_contact - state: "off" - sequence: - - action: lock.lock - target: - entity_id: lock.patio_door + # - choose: + # - conditions: + # - condition: state + # entity_id: binary_sensor.patio_door_contact + # state: "off" + # sequence: + # - action: lock.lock + # target: + # entity_id: lock.patio_door default: - action: input_boolean.turn_off diff --git a/automations/people/bedtime_something_open.yaml b/automations/people/bedtime_something_open.yaml index 28f9aa7..5a3087a 100644 --- a/automations/people/bedtime_something_open.yaml +++ b/automations/people/bedtime_something_open.yaml @@ -21,22 +21,16 @@ condition: state: "on" action: - - action: media_player.turn_on - data_template: - entity_id: media_player.master_bedroom_clock - action: media_player.volume_set data_template: volume_level: 0.30 - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player - action: tts.speak target: entity_id: tts.google_translate_en_com data: - media_player_entity_id: media_player.master_bedroom_clock + media_player_entity_id: media_player.home_assistant_voice_097b44_media_player message: >- The following are open: {{ dict((states|selectattr('entity_id', 'in', state_attr('group.my_exterior_windows', 'entity_id') + state_attr('group.my_exterior_doors', 'entity_id'))|list)|groupby('state'))['on']|map(attribute='name')|list|join(', ') }} - - delay: "00:01:00" - - action: media_player.turn_off - data: - entity_id: media_player.master_bedroom_clock + diff --git a/automations/people/continue_nursery_noise.yaml b/automations/people/continue_nursery_noise.yaml index 9f05690..76daaf9 100644 --- a/automations/people/continue_nursery_noise.yaml +++ b/automations/people/continue_nursery_noise.yaml @@ -10,14 +10,6 @@ condition: state: "on" - condition: or conditions: - - condition: and - conditions: - - condition: state - entity_id: input_boolean.emmett_in_bed - state: "on" - - condition: state - entity_id: input_boolean.emmett_home - state: "on" - condition: and conditions: - condition: state diff --git a/automations/people/vacation.yaml b/automations/people/vacation.yaml deleted file mode 100644 index f8c30b1..0000000 --- a/automations/people/vacation.yaml +++ /dev/null @@ -1,25 +0,0 @@ -alias: "Vacation" -id: automation_vacation -initial_state: "on" -trigger: - - platform: state - entity_id: - - input_boolean.clint_travelling - - input_boolean.emmett_travelling - - input_boolean.bridget_travelling - to: "on" -condition: - condition: and - conditions: - - condition: state - entity_id: input_boolean.clint_travelling - state: "on" - - condition: state - entity_id: input_boolean.emmett_travelling - state: "on" - - condition: state - entity_id: input_boolean.bridget_travelling - state: "on" -action: - - action: input_boolean.turn_on - entity_id: input_boolean.vacation_mode diff --git a/automations/people/vacation_over.yaml b/automations/people/vacation_over.yaml deleted file mode 100644 index 6b953e0..0000000 --- a/automations/people/vacation_over.yaml +++ /dev/null @@ -1,25 +0,0 @@ -alias: "Vacation over" -id: automation_vacation_over -initial_state: "on" -trigger: - - platform: state - entity_id: - - input_boolean.clint_travelling - - input_boolean.emmett_travelling - - input_boolean.bridget_travelling - to: "off" -condition: - condition: and - conditions: - - condition: state - entity_id: input_boolean.clint_travelling - state: "off" - - condition: state - entity_id: input_boolean.emmett_travelling - state: "off" - - condition: state - entity_id: input_boolean.bridget_travelling - state: "off" -action: - - action: input_boolean.turn_off - entity_id: input_boolean.vacation_mode diff --git a/automations/rooms/master_bedroom/continue_white_noise.yaml b/automations/rooms/master_bedroom/continue_white_noise.yaml index c30d0eb..d3cfa8a 100644 --- a/automations/rooms/master_bedroom/continue_white_noise.yaml +++ b/automations/rooms/master_bedroom/continue_white_noise.yaml @@ -3,11 +3,11 @@ id: automation_continue_white_noise initial_state: "on" trigger: - platform: state - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player to: "off" for: "00:00:02" - platform: state - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player to: "idle" for: "00:00:02" condition: diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml index 5bedfa7..63febfb 100644 --- a/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_off.yaml @@ -10,5 +10,5 @@ action: - action: media_player.turn_off data: {} target: - entity_id: media_player.ma_master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player diff --git a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml index e7b144f..b5e27f8 100644 --- a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml @@ -15,22 +15,9 @@ action: data: volume_level: 0.25 target: - entity_id: media_player.ma_master_bedroom_clock + device_id: 8350a88218fdf3807d190142a9e2dc18 #- action: script.goodnight_kids_youtube_music - - - action: media_player.shuffle_set - metadata: {} - data: - shuffle: false - target: - entity_id: media_player.ma_master_bedroom_clock - - action: media_player.repeat_set - metadata: {} - data: - repeat: "all" - target: - entity_id: media_player.ma_master_bedroom_clock - action: music_assistant.play_media metadata: {} data: @@ -38,4 +25,18 @@ action: media_type: track enqueue: replace target: - entity_id: media_player.ma_master_bedroom_clock + device_id: 8350a88218fdf3807d190142a9e2dc18 + + # - action: media_player.shuffle_set + # metadata: {} + # data: + # shuffle: false + # target: + # entity_id: media_player.home_assistant_voice_097b44_media_player + # - action: media_player.repeat_set + # metadata: {} + # data: + # repeat: "all" + # target: + # entity_id: media_player.home_assistant_voice_097b44_media_player + diff --git a/components/binary_sensors/rooms/boys_room_occupied.yaml b/components/binary_sensors/rooms/boys_room_occupied.yaml index 818bf82..0991cc6 100644 --- a/components/binary_sensors/rooms/boys_room_occupied.yaml +++ b/components/binary_sensors/rooms/boys_room_occupied.yaml @@ -1,31 +1,30 @@ platform: bayesian unique_id: bayesianbinarysensor.boys_room_occupied name: Boys Room Occupied -device_class: occupancy prior: 0.25 -probability_threshold: 0.7 +probability_threshold: 0.75 observations: - - entity_id: group.boys_room_motion - prob_given_true: .99 - prob_given_false: .85 + - entity_id: binary_sensor.white_bed_occupied platform: state + prob_given_true: .83 + prob_given_false: 0.0 to_state: 'on' - entity_id: binary_sensor.boys_room_person_occupancy - prob_given_true: .99 - prob_given_false: .85 + prob_given_true: .4 + prob_given_false: 0.0 platform: state to_state: 'on' - entity_id: input_boolean.home_occupied platform: state prob_given_true: .99 - prob_given_false: 0.01 + prob_given_false: 0.67 to_state: 'on' - - platform: state - entity_id: binary_sensor.white_bed_occupied - to_state: "on" - prob_given_true: .67 + - entity_id: group.boys_room_motion + platform: state + prob_given_true: .5 prob_given_false: 0.0 + to_state: 'on' diff --git a/components/input_booleans/people/adults_away.yaml b/components/input_booleans/people/adults_away.yaml deleted file mode 100644 index e54ced7..0000000 --- a/components/input_booleans/people/adults_away.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Adults are away -icon: mdi:account-multiple \ No newline at end of file diff --git a/components/input_booleans/people/all_away.yaml b/components/input_booleans/people/all_away.yaml deleted file mode 100644 index d14592c..0000000 --- a/components/input_booleans/people/all_away.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Everybody is away \ No newline at end of file diff --git a/components/input_booleans/people/bridget/bridget_at_work.yaml b/components/input_booleans/people/bridget/bridget_at_work.yaml deleted file mode 100644 index f0c3027..0000000 --- a/components/input_booleans/people/bridget/bridget_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/bridget/bridget_home.yaml b/components/input_booleans/people/bridget/bridget_home.yaml deleted file mode 100644 index 3c80feb..0000000 --- a/components/input_booleans/people/bridget/bridget_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget Home -icon: mdi:human-child diff --git a/components/input_booleans/people/bridget/bridget_in_bed.yaml b/components/input_booleans/people/bridget/bridget_in_bed.yaml deleted file mode 100644 index 23f5a6b..0000000 --- a/components/input_booleans/people/bridget/bridget_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/bridget/bridget_is_awake.yaml b/components/input_booleans/people/bridget/bridget_is_awake.yaml deleted file mode 100644 index c116f3c..0000000 --- a/components/input_booleans/people/bridget/bridget_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/bridget/bridget_tablet_home.yaml b/components/input_booleans/people/bridget/bridget_tablet_home.yaml deleted file mode 100644 index 1a76b3a..0000000 --- a/components/input_booleans/people/bridget/bridget_tablet_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget Tablet Home -icon: mdi:tablet diff --git a/components/input_booleans/people/bridget/bridget_travelling.yaml b/components/input_booleans/people/bridget/bridget_travelling.yaml deleted file mode 100644 index 44087e7..0000000 --- a/components/input_booleans/people/bridget/bridget_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Bridget Travelling -icon: mdi:road diff --git a/components/input_booleans/people/clint/clint_home.yaml b/components/input_booleans/people/clint/clint_home.yaml deleted file mode 100644 index d5b5642..0000000 --- a/components/input_booleans/people/clint/clint_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Home -icon: mdi:human-male \ No newline at end of file diff --git a/components/input_booleans/people/clint/clint_home_alone.yaml b/components/input_booleans/people/clint/clint_home_alone.yaml deleted file mode 100644 index 952ebba..0000000 --- a/components/input_booleans/people/clint/clint_home_alone.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Home Alone -icon: mdi:human-male \ No newline at end of file diff --git a/components/input_booleans/people/clint/clint_in_bed.yaml b/components/input_booleans/people/clint/clint_in_bed.yaml deleted file mode 100644 index 4b197ac..0000000 --- a/components/input_booleans/people/clint/clint_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/clint/clint_is_awake.yaml b/components/input_booleans/people/clint/clint_is_awake.yaml deleted file mode 100644 index 314016c..0000000 --- a/components/input_booleans/people/clint/clint_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/clint/clint_needs_am_meds.yaml b/components/input_booleans/people/clint/clint_needs_am_meds.yaml deleted file mode 100644 index 0abecc8..0000000 --- a/components/input_booleans/people/clint/clint_needs_am_meds.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Needs AM Meds -icon: mdi:pill \ No newline at end of file diff --git a/components/input_booleans/people/clint/clint_needs_meds.yaml b/components/input_booleans/people/clint/clint_needs_meds.yaml deleted file mode 100644 index 6fb2ca3..0000000 --- a/components/input_booleans/people/clint/clint_needs_meds.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Needs Meds -icon: mdi:pill \ No newline at end of file diff --git a/components/input_booleans/people/clint/clint_needs_pm_meds.yaml b/components/input_booleans/people/clint/clint_needs_pm_meds.yaml deleted file mode 100644 index d65f4f2..0000000 --- a/components/input_booleans/people/clint/clint_needs_pm_meds.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Needs AP Meds -icon: mdi:pill \ No newline at end of file diff --git a/components/input_booleans/people/clint/clint_tablet_charging.yaml b/components/input_booleans/people/clint/clint_tablet_charging.yaml deleted file mode 100644 index 550c7b3..0000000 --- a/components/input_booleans/people/clint/clint_tablet_charging.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Tablet Charging -icon: mdi:battery-charging diff --git a/components/input_booleans/people/clint/clint_tablet_home.yaml b/components/input_booleans/people/clint/clint_tablet_home.yaml deleted file mode 100644 index dd21ff8..0000000 --- a/components/input_booleans/people/clint/clint_tablet_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Tablet Home -icon: mdi:tablet diff --git a/components/input_booleans/people/clint/clint_travelling.yaml b/components/input_booleans/people/clint/clint_travelling.yaml deleted file mode 100644 index 6751e7c..0000000 --- a/components/input_booleans/people/clint/clint_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Travelling -icon: mdi:airplane diff --git a/components/input_booleans/people/clint/clint_work_from_home.yaml b/components/input_booleans/people/clint/clint_work_from_home.yaml deleted file mode 100644 index 4e7aa78..0000000 --- a/components/input_booleans/people/clint/clint_work_from_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Clint Work From Home -icon: mdi:vpn diff --git a/components/input_booleans/people/clint/notify_clint_work.yaml b/components/input_booleans/people/clint/notify_clint_work.yaml deleted file mode 100644 index fad3b25..0000000 --- a/components/input_booleans/people/clint/notify_clint_work.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Notify Clint Work diff --git a/components/input_booleans/people/ebin/ebin_at_work.yaml b/components/input_booleans/people/ebin/ebin_at_work.yaml deleted file mode 100644 index 3ac8bb6..0000000 --- a/components/input_booleans/people/ebin/ebin_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Ebin At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/ebin/ebin_home.yaml b/components/input_booleans/people/ebin/ebin_home.yaml deleted file mode 100644 index 1bd23a0..0000000 --- a/components/input_booleans/people/ebin/ebin_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Ebin Home -icon: mdi:human-child diff --git a/components/input_booleans/people/ebin/ebin_in_bed.yaml b/components/input_booleans/people/ebin/ebin_in_bed.yaml deleted file mode 100644 index 1891a83..0000000 --- a/components/input_booleans/people/ebin/ebin_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Ebin In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/ebin/ebin_is_awake.yaml b/components/input_booleans/people/ebin/ebin_is_awake.yaml deleted file mode 100644 index 4eaa1dc..0000000 --- a/components/input_booleans/people/ebin/ebin_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Ebin Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/ebin/ebin_travelling.yaml b/components/input_booleans/people/ebin/ebin_travelling.yaml deleted file mode 100644 index b7f57e0..0000000 --- a/components/input_booleans/people/ebin/ebin_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Ebin Travelling -icon: mdi:road diff --git a/components/input_booleans/people/emmett/emmett_at_work.yaml b/components/input_booleans/people/emmett/emmett_at_work.yaml deleted file mode 100644 index c58967f..0000000 --- a/components/input_booleans/people/emmett/emmett_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/emmett/emmett_home.yaml b/components/input_booleans/people/emmett/emmett_home.yaml deleted file mode 100644 index 4b5a13b..0000000 --- a/components/input_booleans/people/emmett/emmett_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett Home -icon: mdi:human-child diff --git a/components/input_booleans/people/emmett/emmett_in_bed.yaml b/components/input_booleans/people/emmett/emmett_in_bed.yaml deleted file mode 100644 index 6adfe2b..0000000 --- a/components/input_booleans/people/emmett/emmett_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/emmett/emmett_is_awake.yaml b/components/input_booleans/people/emmett/emmett_is_awake.yaml deleted file mode 100644 index 27aca8c..0000000 --- a/components/input_booleans/people/emmett/emmett_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/emmett/emmett_tablet_home.yaml b/components/input_booleans/people/emmett/emmett_tablet_home.yaml deleted file mode 100644 index 1d1687c..0000000 --- a/components/input_booleans/people/emmett/emmett_tablet_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett Tablet Home -icon: mdi:tablet diff --git a/components/input_booleans/people/emmett/emmett_travelling.yaml b/components/input_booleans/people/emmett/emmett_travelling.yaml deleted file mode 100644 index 9872148..0000000 --- a/components/input_booleans/people/emmett/emmett_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Emmett Travelling -icon: mdi:road \ No newline at end of file diff --git a/components/input_booleans/people/guest/guest_at_work.yaml b/components/input_booleans/people/guest/guest_at_work.yaml deleted file mode 100644 index baf0efb..0000000 --- a/components/input_booleans/people/guest/guest_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Guest at work -icon: mdi:briefcase diff --git a/components/input_booleans/people/guest/guest_home.yaml b/components/input_booleans/people/guest/guest_home.yaml deleted file mode 100644 index 3565863..0000000 --- a/components/input_booleans/people/guest/guest_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Guest home -icon: mdi:human-male diff --git a/components/input_booleans/people/guest/guest_in_bed.yaml b/components/input_booleans/people/guest/guest_in_bed.yaml deleted file mode 100644 index 9b845fb..0000000 --- a/components/input_booleans/people/guest/guest_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Guest in bed -icon: mdi:bed diff --git a/components/input_booleans/people/guest/guest_is_awake.yaml b/components/input_booleans/people/guest/guest_is_awake.yaml deleted file mode 100644 index 3884fb5..0000000 --- a/components/input_booleans/people/guest/guest_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Guest is awake -icon: mdi:alarm diff --git a/components/input_booleans/people/kids_away.yaml b/components/input_booleans/people/kids_away.yaml deleted file mode 100644 index b5302bb..0000000 --- a/components/input_booleans/people/kids_away.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Kids are away \ No newline at end of file diff --git a/components/input_booleans/people/kristy/chickadee_is_waiting.yaml b/components/input_booleans/people/kristy/chickadee_is_waiting.yaml deleted file mode 100644 index 9448793..0000000 --- a/components/input_booleans/people/kristy/chickadee_is_waiting.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Chickadee is Waiting -icon: mdi:alarm diff --git a/components/input_booleans/people/kristy/kristy_at_work.yaml b/components/input_booleans/people/kristy/kristy_at_work.yaml deleted file mode 100644 index f093e38..0000000 --- a/components/input_booleans/people/kristy/kristy_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Kristy At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/kristy/kristy_home.yaml b/components/input_booleans/people/kristy/kristy_home.yaml deleted file mode 100644 index 484f3d3..0000000 --- a/components/input_booleans/people/kristy/kristy_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Kristy Home -icon: mdi:human-female diff --git a/components/input_booleans/people/kristy/kristy_in_bed.yaml b/components/input_booleans/people/kristy/kristy_in_bed.yaml deleted file mode 100644 index 42ece73..0000000 --- a/components/input_booleans/people/kristy/kristy_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Kristy In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/kristy/kristy_is_awake.yaml b/components/input_booleans/people/kristy/kristy_is_awake.yaml deleted file mode 100644 index 603aed8..0000000 --- a/components/input_booleans/people/kristy/kristy_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Kristy Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/kristy/kristy_travelling.yaml b/components/input_booleans/people/kristy/kristy_travelling.yaml deleted file mode 100644 index 9ef5c13..0000000 --- a/components/input_booleans/people/kristy/kristy_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Kristy Travelling -icon: mdi:road diff --git a/components/input_booleans/people/marshall/marshall_at_work.yaml b/components/input_booleans/people/marshall/marshall_at_work.yaml deleted file mode 100644 index 1a70f1b..0000000 --- a/components/input_booleans/people/marshall/marshall_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Marshall At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/marshall/marshall_home.yaml b/components/input_booleans/people/marshall/marshall_home.yaml deleted file mode 100644 index 3a7a97c..0000000 --- a/components/input_booleans/people/marshall/marshall_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Marshall Home -icon: mdi:human-male diff --git a/components/input_booleans/people/marshall/marshall_in_bed.yaml b/components/input_booleans/people/marshall/marshall_in_bed.yaml deleted file mode 100644 index d963822..0000000 --- a/components/input_booleans/people/marshall/marshall_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Marshall In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/marshall/marshall_is_awake.yaml b/components/input_booleans/people/marshall/marshall_is_awake.yaml deleted file mode 100644 index 1c94b85..0000000 --- a/components/input_booleans/people/marshall/marshall_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Marshall Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/marshall/marshall_travelling.yaml b/components/input_booleans/people/marshall/marshall_travelling.yaml deleted file mode 100644 index e1ac515..0000000 --- a/components/input_booleans/people/marshall/marshall_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Marshall Travelling -icon: mdi:road diff --git a/components/input_booleans/people/teens_away.yaml b/components/input_booleans/people/teens_away.yaml deleted file mode 100644 index 1ba6c8f..0000000 --- a/components/input_booleans/people/teens_away.yaml +++ /dev/null @@ -1 +0,0 @@ -name: Teens are away \ No newline at end of file diff --git a/components/input_booleans/people/tess/tess_at_work.yaml b/components/input_booleans/people/tess/tess_at_work.yaml deleted file mode 100644 index 0a96903..0000000 --- a/components/input_booleans/people/tess/tess_at_work.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Tess At Work -icon: mdi:briefcase diff --git a/components/input_booleans/people/tess/tess_home.yaml b/components/input_booleans/people/tess/tess_home.yaml deleted file mode 100644 index eabf6dc..0000000 --- a/components/input_booleans/people/tess/tess_home.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Tess Home -icon: mdi:human-female diff --git a/components/input_booleans/people/tess/tess_in_bed.yaml b/components/input_booleans/people/tess/tess_in_bed.yaml deleted file mode 100644 index 44b7f74..0000000 --- a/components/input_booleans/people/tess/tess_in_bed.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Tess In Bed -icon: mdi:bed diff --git a/components/input_booleans/people/tess/tess_is_awake.yaml b/components/input_booleans/people/tess/tess_is_awake.yaml deleted file mode 100644 index 5140ca0..0000000 --- a/components/input_booleans/people/tess/tess_is_awake.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Tess Is Awake -icon: mdi:alarm diff --git a/components/input_booleans/people/tess/tess_travelling.yaml b/components/input_booleans/people/tess/tess_travelling.yaml deleted file mode 100644 index 3d4ee33..0000000 --- a/components/input_booleans/people/tess/tess_travelling.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: Tess Travelling -icon: mdi:road diff --git a/components/input_selects/automatic_light_profile.yaml b/components/input_selects/automatic_light_profile.yaml index 9f140c3..0463eba 100644 --- a/components/input_selects/automatic_light_profile.yaml +++ b/components/input_selects/automatic_light_profile.yaml @@ -6,5 +6,6 @@ options: - 'Read' - 'Relax' - 'Dimmed' + - 'Rest' - 'Nightlight' - 'Natural light' \ No newline at end of file diff --git a/components/packages/ambientsounds.yaml b/components/packages/ambientsounds.yaml index 94a1feb..3d6e393 100644 --- a/components/packages/ambientsounds.yaml +++ b/components/packages/ambientsounds.yaml @@ -29,8 +29,9 @@ group: - media_player.kitchen - media_player.front_room_hub - media_player.girls_room_hub + - media_player.boys_room_clock - media_player.bathroom_mini - - media_player.master_bedroom_clock + - media_player.home_assistant_voice_097b44_media_player - media_player.computer_area_hub ###### INPUT SELECT ------------------------------------------ @@ -67,7 +68,8 @@ input_select: - Front Room - Master Bedroom - Kitchen - - Nursery + - Girls Room + - Boys Room - Computer Area - Downstairs - Master Bathroom @@ -96,10 +98,11 @@ script: data_template: entity_id: > {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub - {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock + {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen - {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers @@ -110,10 +113,11 @@ script: data_template: entity_id: > {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub - {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock + {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen - {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers @@ -158,10 +162,11 @@ script: data_template: entity_id: > {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub - {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock + {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen - {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers @@ -183,10 +188,11 @@ automation: data_template: entity_id: > {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub - {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock + {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen - {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub + {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers diff --git a/components/packages/google_assistant.yaml b/components/packages/google_assistant.yaml index 3c421d8..bb48139 100644 --- a/components/packages/google_assistant.yaml +++ b/components/packages/google_assistant.yaml @@ -31,12 +31,12 @@ google_assistant: expose: true room: Garage - lock.patio_door: - name: Patio Door - expose: true - room: Dining Room - aliases: - - Sliding Glass Door + # lock.patio_door: + # name: Patio Door + # expose: true + # room: Dining Room + # aliases: + # - Sliding Glass Door camera.frigate_cam03: name: Desk Camera @@ -95,42 +95,42 @@ google_assistant: input_boolean.announce_almost_bedtime: name: Announce Almost Bedtime expose: true - room: Nursery + room: Girls Room input_boolean.announce_goodnight_emmett: name: Announce Goodnight Emmett expose: true - room: Nursery + room: Boys Room input_boolean.announce_goodnight_bridget: name: Announce Goodnight Bridget expose: true - room: Nursery + room: Girls Room input_boolean.announce_goodnight_ebin: name: Announce Goodnight Ebin expose: true - room: Nursery + room: Girls Room input_boolean.announce_goodnight_emmett_bridget: name: Announce Goodnight Emmett Bridget expose: true - room: Nursery + room: Girls Room input_boolean.announce_goodnight_emmett_ebin: name: Announce Goodnight Emmett Ebin expose: true - room: Nursery + room: Boys Room input_boolean.announce_goodnight_bridget_ebin: name: Announce Goodnight Bridget Ebin expose: true - room: Nursery + room: Girls Room input_boolean.announce_goodnight_emmett_bridget_ebin: name: Announce Goodnight Emmett Bridget Ebin expose: true - room: Nursery + room: Girls Room input_boolean.kids_bedtime: name: Kids Bedtime @@ -139,7 +139,7 @@ google_assistant: - Emmetts bedtime - Bridgets bedtime - Ebins bedtime - room: Nursery + room: Girls Room input_boolean.clint_in_bed: name: Clint In Bed @@ -164,17 +164,17 @@ google_assistant: input_boolean.emmett_in_bed: name: Emmett In Bed expose: true - room: Nursery + room: Boys Room input_boolean.bridget_in_bed: name: Bridget In Bed expose: true - room: Nursery + room: Girls Room input_boolean.ebin_in_bed: name: Ebin In Bed expose: true - room: Nursery + room: Girls Room input_boolean.front_room_occupied: name: Front Room Lights diff --git a/components/packages/patio_door_lock.yaml b/components/packages/patio_door_lock.yaml index a7a791f..899c67b 100644 --- a/components/packages/patio_door_lock.yaml +++ b/components/packages/patio_door_lock.yaml @@ -1,20 +1,13 @@ -lock: - - platform: template - unique_id: templatelock.patio_door - name: Patio Door - #value_template: "{{ is_state('switch.shelly_sliding_glass_door', 'on') }}" - value_template: "{{ is_state('light.deck', 'on') }}" - lock: - # action: switch.turn_on - # target: - # entity_id: switch.shelly_sliding_glass_door - action: light.turn_on - target: - entity_id: light.deck - unlock: - # action: switch.turn_off - # target: - # entity_id: switch.shelly_sliding_glass_door - action: light.turn_off - target: - entity_id: light.deck +# lock: +# - platform: template +# unique_id: templatelock.patio_door +# name: Patio Door +# value_template: "{{ is_state('switch.shelly_sliding_glass_door', 'on') }}" +# lock: +# action: switch.turn_on +# target: +# entity_id: switch.shelly_sliding_glass_door +# unlock: +# action: switch.turn_off +# target: +# entity_id: switch.shelly_sliding_glass_door diff --git a/esphome/home-assistant-voice-097b44.yaml b/esphome/home-assistant-voice-097b44.yaml new file mode 100644 index 0000000..03e5920 --- /dev/null +++ b/esphome/home-assistant-voice-097b44.yaml @@ -0,0 +1,17 @@ +substitutions: + name: home-assistant-voice-097b44 + friendly_name: Home Assistant Voice 097b44 +packages: + Nabu Casa.Home Assistant Voice PE: github://esphome/home-assistant-voice-pe/home-assistant-voice.yaml +esphome: + name: ${name} + name_add_mac_suffix: false + friendly_name: ${friendly_name} +api: + encryption: + key: iAx9Roq7zrUefNVRfIGGd+5u7QXMYdCMoCPXfIIACpk= + + +wifi: + ssid: !secret wifi_ssid + password: !secret wifi_password diff --git a/esphome/hvac-multisensor.yaml b/esphome/hvac-multisensor.yaml index a21bced..bb38518 100644 --- a/esphome/hvac-multisensor.yaml +++ b/esphome/hvac-multisensor.yaml @@ -32,8 +32,12 @@ substitutions: sda_pin: GPIO21 scl_pin: GPIO22 +# For i2c devices + sda2_pin: GPIO16 + scl2_pin: GPIO17 + passive_buzzer_pin: GPIO26 - one_wire_pin: GPIO17 + one_wire_pin: GPIO13 packages: # network: !include common/ethernet.yaml @@ -54,7 +58,7 @@ esp32: # Enable logging logger: - level: VERBOSE + #level: VERBOSE time: - id: !remove homeassistant_time @@ -154,18 +158,23 @@ font: # size: 50 # glyphs: ["\U0000e425"] # mdi-timer -one_wire: - - platform: gpio - pin: - number: ${one_wire_pin} - mode: - input: true - pullup: true +# one_wire: +# - platform: gpio +# pin: +# number: ${one_wire_pin} +# mode: +# input: true +# pullup: true i2c: - sda: ${sda_pin} - scl: ${scl_pin} - frequency: 800kHz + - id: bus_a + sda: ${sda_pin} + scl: ${scl_pin} + #frequency: 800kHz + + - id: bus_b + sda: ${sda2_pin} + scl: ${scl2_pin} spi: clk_pin: ${spi_clock_pin} @@ -243,70 +252,114 @@ number: # id: display_backlight sensor: - - platform: dallas_temp - address: 0xB33C01B607798528 - name: "Return" - id: hvac_return - icon: mdi:home-thermometer-outline + - platform: bme280_i2c + i2c_id: bus_a + address: 0x76 update_interval: 10s - filters: - - lambda: |- - float val = x; - if (isnan(val)) { - val = 0.0; - } - return val * (9.0/5.0) + 32.0; - #- lambda: return x * (9.0/5.0) + 32.0; - - clamp: - min_value: 0.0 - max_value: 100.0 - unit_of_measurement: "°F" - state_class: measurement + temperature: + name: "BME280 76A Temperature" + pressure: + name: "BME280 76A Pressure" + humidity: + name: "BME280 76A Humidity" - - platform: dallas_temp - address: 0x0F3C01B6070C1328 - name: "Supply" - id: hvac_supply - icon: mdi:thermostat + - platform: bme280_i2c + i2c_id: bus_b + address: 0x76 update_interval: 10s - filters: - - lambda: return x * (9.0/5.0) + 32.0; - - clamp: - min_value: 0.0 - max_value: 100.0 - unit_of_measurement: "°F" - state_class: measurement + temperature: + name: "BME280 76B Temperature" + pressure: + name: "BME280 76B Pressure" + humidity: + name: "BME280 76B Humidity" - - platform: dallas_temp - address: 0xFA3C01B607005B28 - name: "Ambient" - id: ambient - icon: mdi:home-thermometer + - platform: bme280_i2c + i2c_id: bus_a + address: 0x77 update_interval: 10s - filters: - - lambda: return x * (9.0/5.0) + 32.0; - - clamp: - min_value: 0.0 - max_value: 100.0 - unit_of_measurement: "°F" - state_class: measurement + temperature: + name: "BME280 77A Temperature" + pressure: + name: "BME280 77A Pressure" + humidity: + name: "BME280 77A Humidity" - - platform: template - name: "Delta" - id: hvac_delta - icon: mdi:thermometer-lines - lambda: |- - return (id(hvac_supply).state - id(hvac_return).state); + - platform: bme280_i2c + i2c_id: bus_b + address: 0x77 update_interval: 10s - unit_of_measurement: "°F" - state_class: measurement - filters: - - clamp: - min_value: 0.0 - max_value: 100.0 - - or: - - throttle: 60s - - delta: 1.0 + temperature: + name: "BME280 77B Temperature" + pressure: + name: "BME280 77B Pressure" + humidity: + name: "BME280 77B Humidity" + + # - platform: dallas_temp + # address: 0xB33C01B607798528 + # name: "Return" + # id: hvac_return + # icon: mdi:home-thermometer-outline + # update_interval: 10s + # filters: + # - lambda: |- + # float val = x; + # if (isnan(val)) { + # val = 0.0; + # } + # return val * (9.0/5.0) + 32.0; + # #- lambda: return x * (9.0/5.0) + 32.0; + # - clamp: + # min_value: 0.0 + # max_value: 100.0 + # unit_of_measurement: "°F" + # state_class: measurement + + # - platform: dallas_temp + # address: 0x0F3C01B6070C1328 + # name: "Supply" + # id: hvac_supply + # icon: mdi:thermostat + # update_interval: 10s + # filters: + # - lambda: return x * (9.0/5.0) + 32.0; + # - clamp: + # min_value: 0.0 + # max_value: 100.0 + # unit_of_measurement: "°F" + # state_class: measurement + + # - platform: dallas_temp + # address: 0xFA3C01B607005B28 + # name: "Ambient" + # id: ambient + # icon: mdi:home-thermometer + # update_interval: 10s + # filters: + # - lambda: return x * (9.0/5.0) + 32.0; + # - clamp: + # min_value: 0.0 + # max_value: 100.0 + # unit_of_measurement: "°F" + # state_class: measurement + + # - platform: template + # name: "Delta" + # id: hvac_delta + # icon: mdi:thermometer-lines + # lambda: |- + # return (id(hvac_supply).state - id(hvac_return).state); + # update_interval: 10s + # unit_of_measurement: "°F" + # state_class: measurement + # filters: + # - clamp: + # min_value: 0.0 + # max_value: 100.0 + # - or: + # - throttle: 60s + # - delta: 1.0 display: - platform: ili9xxx @@ -330,7 +383,9 @@ display: touchscreen: # - platform: ft5x06 + # Uses i2c - platform: ft63x6 + i2c_id: bus_a id: main_touchscreen display: main_display transform: diff --git a/groups.yaml b/groups.yaml index f54b967..cefda77 100644 --- a/groups.yaml +++ b/groups.yaml @@ -50,6 +50,7 @@ boys_room_motion: entities: - binary_sensor.boys_room_motion_switch_motion_detection - binary_sensor.boys_room_multisensor_motion_detection + - binary_sensor.everything_presence_lite_8fa4fc_occupancy front_room_motion: name: Front Room Motion diff --git a/lovelace/cameras/view-camera-12.yaml b/lovelace/cameras/view-camera-12.yaml index 4b48b5e..c83656e 100644 --- a/lovelace/cameras/view-camera-12.yaml +++ b/lovelace/cameras/view-camera-12.yaml @@ -102,10 +102,10 @@ card: top: 70% left: 41% - - type: state-icon - entity: switch.shelly_sliding_glass_door - style: - top: 3% - left: 55% - tap_action: - action: toggle + # - type: state-icon + # entity: switch.shelly_sliding_glass_door + # style: + # top: 3% + # left: 55% + # tap_action: + # action: toggle diff --git a/lovelace/cameras/view-camera-13.yaml b/lovelace/cameras/view-camera-13.yaml index 5205972..faccbf1 100644 --- a/lovelace/cameras/view-camera-13.yaml +++ b/lovelace/cameras/view-camera-13.yaml @@ -97,11 +97,11 @@ card: top: 29% left: 4% - - type: state-icon - entity: switch.shelly_sliding_glass_door - style: - top: 34% - left: 4% + # - type: state-icon + # entity: switch.shelly_sliding_glass_door + # style: + # top: 34% + # left: 4% - type: conditional conditions: diff --git a/lovelace/cameras/view-camera-14.yaml b/lovelace/cameras/view-camera-14.yaml index fe626e6..ac81e6f 100644 --- a/lovelace/cameras/view-camera-14.yaml +++ b/lovelace/cameras/view-camera-14.yaml @@ -14,7 +14,7 @@ card: status_bar: style: none cameras: - - camera_entity: camera.frigate_cam14 + - camera_entity: camera.frigate_cam12 live_provider: go2rtc go2rtc: modes: @@ -54,7 +54,7 @@ card: height: 10% opacity: 70% - type: image - entity: camera.frigate_cam14 + entity: camera.frigate_cam12 image: /local/title-dark-double.png aspect_ratio: 100% tap_action: diff --git a/lovelace/phone/boys-room.yaml b/lovelace/phone/boys-room.yaml index 51e62d9..ad52455 100644 --- a/lovelace/phone/boys-room.yaml +++ b/lovelace/phone/boys-room.yaml @@ -31,19 +31,20 @@ cards: cards: - type: custom:mushroom-light-card entity: light.boys_room_hue - name: Main - icon: mdi:dome-light + name: Main Light tap_action: action: toggle - hide_state: true + use_light_color: false + show_brightness_control: false layout: vertical + hide_state: false - type: custom:mushroom-light-card entity: light.boys_room_closet name: Closet icon: "" tap_action: action: toggle - hide_state: true + hide_state: false layout: vertical - type: horizontal-stack cards: @@ -59,7 +60,6 @@ cards: entity: binary_sensor.boys_room_naturally_lit name: Naturally Lit layout: vertical - secondary_info: none - type: vertical-stack cards: - type: custom:mushroom-title-card @@ -73,6 +73,31 @@ cards: cards: - type: custom:mushroom-title-card subtitle: Sensors + - type: horizontal-stack + cards: + - type: custom:mushroom-template-card + entity: binary_sensor.white_bed_occupied + icon: mdi:bed + icon_color: >- + {% if(is_state('binary_sensor.white_bed_occupied','on')) %} + yellow + {% endif %} + primary: White Bed + layout: vertical + - type: horizontal-stack + cards: + - type: custom:mushroom-entity-card + layout: vertical + entity: sensor.bed_presence_2d14a4_calibrated_right_pressure + name: Calibrated Pressure + - type: custom:mushroom-entity-card + entity: number.bed_presence_2d14a4_right_trigger_pressure + layout: vertical + name: Trigger + - type: custom:mushroom-entity-card + entity: sensor.bed_presence_2d14a4_right_pressure + name: Pressure + layout: vertical - type: horizontal-stack cards: - type: custom:mushroom-entity-card diff --git a/lovelace/phone/girls-room.yaml b/lovelace/phone/girls-room.yaml index 1b5c00a..a4a3604 100644 --- a/lovelace/phone/girls-room.yaml +++ b/lovelace/phone/girls-room.yaml @@ -151,6 +151,16 @@ cards: {% endif %} tap_action: action: more-info + - type: horizontal-stack + cards: + - type: custom:mushroom-entity-card + layout: vertical + entity: binary_sensor.nursery_occupied + name: Nursery Occupied + - type: custom:mushroom-entity-card + layout: vertical + entity: binary_sensor.girls_room_occupied + name: Girls Room # Lights - type: vertical-stack @@ -167,7 +177,7 @@ cards: use_light_color: false show_brightness_control: false layout: vertical - hide_state: true + hide_state: false - type: custom:mushroom-entity-card entity: input_select.nursery_mode name: Mode @@ -175,7 +185,7 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-template-card - primary: Emmett + primary: Window Side secondary: "{{states('select.black_bed_wled_preset')}}" entity: select.black_bed_wled_preset icon: mdi:led-strip-variant @@ -193,7 +203,7 @@ cards: url_path: http://192.168.1.181 layout: vertical - type: custom:mushroom-template-card - primary: Bridget + primary: Hall Side secondary: "{{states('select.white_bed_wled_preset')}}" entity: select.white_bed_wled_preset icon: mdi:led-strip-variant @@ -242,7 +252,6 @@ cards: entity: binary_sensor.nursery_naturally_lit name: Naturally Lit layout: vertical - secondary_info: none # Devices - type: vertical-stack @@ -330,15 +339,6 @@ cards: target: entity_id: button.black_bed_manual_tare layout: vertical - - type: custom:mushroom-template-card - entity: binary_sensor.white_bed_occupied - icon: mdi:bed - icon_color: >- - {% if(is_state('binary_sensor.white_bed_occupied','on')) %} - yellow - {% endif %} - primary: White Bed - layout: vertical - type: horizontal-stack cards: - type: custom:mushroom-entity-card diff --git a/lovelace/phone/home.yaml b/lovelace/phone/home.yaml index 5bc1a06..32065bd 100644 --- a/lovelace/phone/home.yaml +++ b/lovelace/phone/home.yaml @@ -354,7 +354,7 @@ cards: secondary: |- {{states('sensor.master_bathroom_thermostat_temperature')}}°F {{states('sensor.master_bathroom_thermostat_humidity')}}% - icon_color: "{{iif(is_state('light.master_bathroom','on'),'yellow')}}" + icon_color: "{{iif(is_state('light.master_bathroom_hue','on'),'yellow')}}" multiline_secondary: true layout: vertical - type: custom:mushroom-template-card diff --git a/lovelace/room_cards/boys_room.yaml b/lovelace/room_cards/boys_room.yaml index 93576bb..1531083 100644 --- a/lovelace/room_cards/boys_room.yaml +++ b/lovelace/room_cards/boys_room.yaml @@ -19,7 +19,7 @@ elements: action: more-info style: font-style: italic - left: 62% + left: 38% top: 88% - type: custom:mushroom-template-card diff --git a/lovelace/room_cards/dining_room.yaml b/lovelace/room_cards/dining_room.yaml index ccd363e..7260b4a 100644 --- a/lovelace/room_cards/dining_room.yaml +++ b/lovelace/room_cards/dining_room.yaml @@ -69,13 +69,13 @@ elements: # left: 68% # top: 9% #top icon spot #3 - - type: state-icon - entity: switch.shelly_sliding_glass_door - style: - left: 76% - top: 9% - tap_action: - action: toggle + # - type: state-icon + # entity: switch.shelly_sliding_glass_door + # style: + # left: 76% + # top: 9% + # tap_action: + # action: toggle #top icon spot #3 - type: state-icon entity: binary_sensor.patio_door_contact diff --git a/lovelace/view-automations_kristy.yaml b/lovelace/view-automations_kristy.yaml index 88db091..1086bad 100644 --- a/lovelace/view-automations_kristy.yaml +++ b/lovelace/view-automations_kristy.yaml @@ -23,4 +23,3 @@ cards: - entity: input_boolean.kristy_home - entity: input_boolean.kristy_in_bed - entity: input_boolean.kristy_is_awake - - entity: input_boolean.kristy_travelling diff --git a/lovelace/view-big_kids.yaml b/lovelace/view-big_kids.yaml index 1cb78e7..3f980f3 100644 --- a/lovelace/view-big_kids.yaml +++ b/lovelace/view-big_kids.yaml @@ -23,7 +23,6 @@ cards: - entity: input_boolean.marshall_home - entity: input_boolean.marshall_in_bed - entity: input_boolean.marshall_is_awake - - entity: input_boolean.marshall_travelling - type: vertical-stack cards: @@ -39,8 +38,7 @@ cards: secondary_info: last-triggered - entity: automation.tess_home secondary_info: last-triggered - - entity: input_boolean.tess_at_work + - entity: input_boolean.tess_at_school - entity: input_boolean.tess_home - entity: input_boolean.tess_in_bed - entity: input_boolean.tess_is_awake - - entity: input_boolean.tess_travelling diff --git a/lovelace/view-little_kids.yaml b/lovelace/view-little_kids.yaml index cde5f7c..cbec24e 100644 --- a/lovelace/view-little_kids.yaml +++ b/lovelace/view-little_kids.yaml @@ -29,11 +29,10 @@ cards: secondary_info: last-triggered - entity: automation.emmett_home secondary_info: last-triggered - - entity: input_boolean.emmett_at_work + - entity: input_boolean.emmett_at_school - entity: input_boolean.emmett_home - entity: input_boolean.emmett_in_bed - entity: input_boolean.emmett_is_awake - - entity: input_boolean.emmett_travelling - type: vertical-stack cards: @@ -49,11 +48,10 @@ cards: secondary_info: last-triggered - entity: automation.bridget_home secondary_info: last-triggered - - entity: input_boolean.bridget_at_work + - entity: input_boolean.bridget_at_school - entity: input_boolean.bridget_home - entity: input_boolean.bridget_in_bed - entity: input_boolean.bridget_is_awake - - entity: input_boolean.bridget_travelling - type: vertical-stack cards: @@ -69,8 +67,7 @@ cards: secondary_info: last-triggered - entity: automation.ebin_home secondary_info: last-triggered - - entity: input_boolean.ebin_at_work + - entity: input_boolean.ebin_at_school - entity: input_boolean.ebin_home - entity: input_boolean.ebin_in_bed - entity: input_boolean.ebin_is_awake - - entity: input_boolean.ebin_travelling diff --git a/lovelace/view-people.yaml b/lovelace/view-people.yaml index d25b747..2560d26 100644 --- a/lovelace/view-people.yaml +++ b/lovelace/view-people.yaml @@ -72,10 +72,6 @@ cards: entities: - entity: device_tracker.emmett_s_fire_wifi name: Wifi - - entity: input_boolean.emmett_tablet_home - name: Home - tap_action: - action: toggle - type: calendar entities: - calendar.emmett @@ -108,10 +104,6 @@ cards: entities: - entity: device_tracker.bridget_s_fire_wifi name: Wifi - - entity: input_boolean.bridget_tablet_home - name: Home - tap_action: - action: toggle - type: calendar entities: - calendar.bridget diff --git a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml index b3b4a9d..2b25d0a 100644 --- a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml +++ b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml @@ -13,7 +13,7 @@ sequence: - action: media_player.volume_set target: - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player data: volume_level: "{{iif(volume>1,1,volume)}}" @@ -22,7 +22,7 @@ sequence: media_content_id: media-source://media_source/alarms/Alarm_Clock.mp3 media_content_type: music target: - entity_id: media_player.master_bedroom_clock + entity_id: media_player.home_assistant_voice_097b44_media_player - delay: hours: 0 @@ -34,8 +34,8 @@ sequence: target: entity_id: tts.google_translate_en_com data: - media_player_entity_id: media_player.master_bedroom_clock - message: "It is time to wake up, so get your booty out of bed" + media_player_entity_id: media_player.home_assistant_voice_097b44_media_player + message: "It is time to wake up, so get out of bed and get ready for work" # - action: tts.speak # target: