diff --git a/automations/people/Clint/Clint_in_bed.yaml b/automations/people/Clint/Clint_in_bed.yaml index c51e801..69350c4 100644 --- a/automations/people/Clint/Clint_in_bed.yaml +++ b/automations/people/Clint/Clint_in_bed.yaml @@ -5,7 +5,7 @@ id: automation_clint_in_bed trigger: # Bed in master bedroom is occupied - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'on' # Radio playing - platform: state @@ -63,7 +63,7 @@ condition: - alias: "The bed is occupied" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' action: - service: input_boolean.turn_on diff --git a/automations/people/Clint/Clint_up.yaml b/automations/people/Clint/Clint_up.yaml index 7b26dcb..a72f492 100644 --- a/automations/people/Clint/Clint_up.yaml +++ b/automations/people/Clint/Clint_up.yaml @@ -10,7 +10,7 @@ trigger: entity_id: media_player.great_room to: 'idle' - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'off' for: '00:05:00' - platform: state @@ -36,7 +36,7 @@ condition: after: '04:00:00' before: '22:00:00' - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' for: '00:01:00' action: diff --git a/automations/people/Clint/Clint_wakeup.yaml b/automations/people/Clint/Clint_wakeup.yaml index 2e2f993..aa2ba8c 100644 --- a/automations/people/Clint/Clint_wakeup.yaml +++ b/automations/people/Clint/Clint_wakeup.yaml @@ -8,7 +8,7 @@ trigger: entity_id: binary_sensor.morning to: 'on' - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'on' condition: @@ -16,7 +16,7 @@ condition: entity_id: input_boolean.clint_home state: 'on' - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' - condition: state entity_id: binary_sensor.morning diff --git a/automations/people/Kristy/kristy_in_bed.yaml b/automations/people/Kristy/kristy_in_bed.yaml index 9715f90..15f7111 100644 --- a/automations/people/Kristy/kristy_in_bed.yaml +++ b/automations/people/Kristy/kristy_in_bed.yaml @@ -4,7 +4,7 @@ id: automation_kristy_in_bed trigger: # Bed in master bedroom is occupied - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'on' # Radio playing - platform: state @@ -31,7 +31,7 @@ condition: - alias: "The bed is occupied" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' action: - service: input_boolean.turn_on diff --git a/automations/people/adults_awake.yaml b/automations/people/adults_awake.yaml index cd32eaa..58c09d8 100644 --- a/automations/people/adults_awake.yaml +++ b/automations/people/adults_awake.yaml @@ -11,7 +11,7 @@ trigger: - input_boolean.clint_is_awake - input_boolean.kristy_in_bed - input_boolean.kristy_is_awake - - binary_sensor.master_bed_occupied + - binary_sensor.master_bed_right_occupied - platform: time id: wake_clint @@ -38,7 +38,7 @@ condition: - condition: trigger id: wake_clint - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' for: '00:10:00' - condition: and diff --git a/automations/rooms/front_room/baby_monitor_on_tv.yaml b/automations/rooms/front_room/baby_monitor_on_tv.yaml index 8548458..7a55b14 100644 --- a/automations/rooms/front_room/baby_monitor_on_tv.yaml +++ b/automations/rooms/front_room/baby_monitor_on_tv.yaml @@ -30,7 +30,7 @@ condition: entity_id: input_boolean.computer_area_occupied state: 'off' - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' - condition: state entity_id: binary_sensor.master_bedroom_occupied diff --git a/automations/rooms/master_bedroom/master_bedroom_asleep.yaml b/automations/rooms/master_bedroom/master_bedroom_asleep.yaml index 3f4d7d2..77bc4e3 100644 --- a/automations/rooms/master_bedroom/master_bedroom_asleep.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_asleep.yaml @@ -13,7 +13,7 @@ trigger: for: '00:00:30' - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'on' for: '00:00:05' @@ -28,7 +28,7 @@ condition: entity_id: input_boolean.kristy_home state: 'on' - - alias: "After 10:00PM and before 4:00AM" + - alias: "After 9:00PM and before 4:00AM" condition: time after: '21:00:00' before: '04:00:00' @@ -40,7 +40,7 @@ condition: entity_id: sensor.pixel_7_charger_type state: 'wireless' - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' diff --git a/automations/rooms/master_bedroom/master_bedroom_awake.yaml b/automations/rooms/master_bedroom/master_bedroom_awake.yaml index 72b23ec..8d11ec4 100644 --- a/automations/rooms/master_bedroom/master_bedroom_awake.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_awake.yaml @@ -3,7 +3,7 @@ id: automation_master_bedroom_awake trigger: - platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'off' for: '00:10:00' @@ -25,7 +25,7 @@ condition: - alias: "No one on master bed" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' - alias: "The boolean is currently on" diff --git a/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml b/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml index baca44a..eebd1e4 100644 --- a/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_not_occupied.yaml @@ -24,7 +24,7 @@ condition: state: 'off' - condition: state entity_id: - - binary_sensor.master_bed_occupied + - binary_sensor.master_bed_right_occupied state: - 'off' - 'unavailable' diff --git a/automations/rooms/master_bedroom/master_bedroom_status.yaml b/automations/rooms/master_bedroom/master_bedroom_status.yaml index cd5dc75..527b5a8 100644 --- a/automations/rooms/master_bedroom/master_bedroom_status.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_status.yaml @@ -4,7 +4,7 @@ id: automation_master_bedroom_status trigger: - id: master_bed_not_occupied platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'off' for: '00:10:00' @@ -19,9 +19,9 @@ trigger: to: 'on' for: '00:00:30' - - id: master_bed_occupied + - id: master_bed_right_occupied platform: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied to: 'on' for: '00:00:05' @@ -54,7 +54,7 @@ condition: - alias: "No one on master bed" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' - alias: "Is the room asleep?" @@ -77,12 +77,12 @@ condition: - alias: "After 10:00PM and before 4:00AM" condition: time - after: '22:00:00' + after: '21:00:00' before: '04:00:00' - alias: "Someone on master bed" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' action: @@ -105,12 +105,12 @@ action: - alias: "It is before 10:00PM and after 4:00AM" condition: time - before: '22:00:00' + before: '21:00:00' after: '04:00:00' - alias: "No one on master bed" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'off' sequence: - service: input_boolean.turn_off @@ -134,12 +134,12 @@ action: - alias: "After 10:00PM and before 4:00AM" condition: time - after: '22:00:00' + after: '21:00:00' before: '04:00:00' - alias: "Someone on master bed" condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: 'on' sequence: - choose: 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 3ebf850..1558f60 100644 --- a/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml +++ b/automations/rooms/master_bedroom/master_bedroom_white_noise_on.yaml @@ -13,7 +13,7 @@ action: # option: 'Off' - service: media_player.volume_set data: - volume_level: 0.3 + volume_level: 0.4 target: entity_id: media_player.master_bedroom_clock diff --git a/components/binary_sensors/rooms/master_bedroom_occupied.yaml b/components/binary_sensors/rooms/master_bedroom_occupied.yaml index 179456f..222c59b 100644 --- a/components/binary_sensors/rooms/master_bedroom_occupied.yaml +++ b/components/binary_sensors/rooms/master_bedroom_occupied.yaml @@ -6,7 +6,7 @@ prior: 0.25 probability_threshold: 0.75 observations: - - entity_id: binary_sensor.master_bed_occupied + - entity_id: binary_sensor.master_bed_right_occupied platform: state prob_given_true: .83 prob_given_false: 0.0 diff --git a/components/binary_sensors/template.yaml b/components/binary_sensors/template.yaml index 5318997..0c5366f 100644 --- a/components/binary_sensors/template.yaml +++ b/components/binary_sensors/template.yaml @@ -129,7 +129,7 @@ sensors: unique_id: templatebinarysensor.master_bed_right_occupied friendly_name: Master Bedroom Right Occupied icon_template: mdi:bed-king - value_template: "{{ is_state('binary_sensor.master_bed_occupied','on') }}" + value_template: "{{ is_state('binary_sensor.master_bed_occupied','on') or is_state('input_boolean.master_bed_occupied','on') }}" bathroom_getting_humid: unique_id: templatebinarysensor.bathroom_getting_humid diff --git a/lovelace/phone/master-bedroom.yaml b/lovelace/phone/master-bedroom.yaml index 7a89a73..d57e93f 100644 --- a/lovelace/phone/master-bedroom.yaml +++ b/lovelace/phone/master-bedroom.yaml @@ -112,11 +112,11 @@ cards: - type: horizontal-stack cards: - type: custom:mushroom-template-card - entity: binary_sensor.master_bed_occupied + entity: binary_sensor.master_bed_right_occupied icon: mdi:bed-king icon_color: >- {{ - iif(is_state('binary_sensor.master_bed_occupied','on'),'yellow')}} + iif(is_state('binary_sensor.master_bed_right_occupied','on'),'yellow')}} primary: Bed double_tap_action: action: call-service diff --git a/lovelace/raw-cameras/indoor-camera-card.yaml b/lovelace/raw-cameras/indoor-camera-card.yaml index a73eee7..203d534 100644 --- a/lovelace/raw-cameras/indoor-camera-card.yaml +++ b/lovelace/raw-cameras/indoor-camera-card.yaml @@ -76,7 +76,7 @@ cameras: occupancy: false motion: false entities: - - binary_sensor.master_bed_occupied + - binary_sensor.master_bed_right_occupied timeline: media: snapshots show_recordings: false diff --git a/lovelace/room_cards/master_bedroom.yaml b/lovelace/room_cards/master_bedroom.yaml index a269f8c..96a19b1 100644 --- a/lovelace/room_cards/master_bedroom.yaml +++ b/lovelace/room_cards/master_bedroom.yaml @@ -125,7 +125,7 @@ elements: #button #3 - type: "custom:button-card" color: auto - entity: binary_sensor.master_bed_occupied + entity: binary_sensor.master_bed_right_occupied show_name: false style: left: 50% diff --git a/lovelace/stretch-cameras/master-bedroom-left-card.yaml b/lovelace/stretch-cameras/master-bedroom-left-card.yaml index f09076e..38965ea 100644 --- a/lovelace/stretch-cameras/master-bedroom-left-card.yaml +++ b/lovelace/stretch-cameras/master-bedroom-left-card.yaml @@ -10,7 +10,6 @@ cameras: title: MBR Left id: mbr_left live: - auto_mute: all layout: fit: fill preload: true diff --git a/lovelace/stretch-cameras/master-bedroom-right-card.yaml b/lovelace/stretch-cameras/master-bedroom-right-card.yaml index b196c1b..bf6169a 100644 --- a/lovelace/stretch-cameras/master-bedroom-right-card.yaml +++ b/lovelace/stretch-cameras/master-bedroom-right-card.yaml @@ -10,7 +10,6 @@ cameras: title: MBR Right id: mbr_right live: - auto_mute: all layout: fit: fill preload: true diff --git a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml index b0f6619..74425c3 100644 --- a/scripts/master_bedroom/wake_up_the_master_bedroom.yaml +++ b/scripts/master_bedroom/wake_up_the_master_bedroom.yaml @@ -5,7 +5,7 @@ sequence: - repeat: while: - condition: state - entity_id: binary_sensor.master_bed_occupied + entity_id: binary_sensor.master_bed_right_occupied state: "on" sequence: - variables: