diff --git a/config/lovelace/advanced_dashboard/10_system.yaml b/config/lovelace/advanced_dashboard/10_system.yaml index f63934d..9daf994 100644 --- a/config/lovelace/advanced_dashboard/10_system.yaml +++ b/config/lovelace/advanced_dashboard/10_system.yaml @@ -45,8 +45,14 @@ cards: entity: sensor.front_door_power - type: custom:battery-entity entity: sensor.living_room_right_window_power + - type: custom:battery-entity + entity: sensor.bedroom_door_power + - type: custom:battery-entity + entity: sensor.bedroom_left_window_power - type: custom:battery-entity entity: sensor.bedroom_right_window_power + - type: custom:battery-entity + entity: sensor.kitchen_window_power - type: custom:battery-entity entity: sensor.bedroom_weather_power - type: custom:battery-entity diff --git a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml index fa0c743..fd77aa6 100644 --- a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml +++ b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml @@ -144,12 +144,12 @@ # Living room window - type: conditional conditions: - - entity: binary_sensor.living_room_right_window_on_off_wrapper + - entity: binary_sensor.living_room_right_window state: "on" elements: - type: image image: /local/images/floorplan/transparent.png - entity: binary_sensor.living_room_right_window_on_off_wrapper + entity: binary_sensor.living_room_right_window style: width: 7.8% height: 8.4% @@ -162,12 +162,12 @@ # Master bedroom window - type: conditional conditions: - - entity: binary_sensor.bedroom_right_window_on_off_wrapper + - entity: binary_sensor.bedroom_right_window state: "on" elements: - type: image image: /local/images/floorplan/transparent.png - entity: binary_sensor.bedroom_right_window_on_off_wrapper + entity: binary_sensor.bedroom_right_window style: width: 7.5% height: 8.2% diff --git a/config/lovelace/home_dashboard/hallway_dashboard.yaml b/config/lovelace/home_dashboard/hallway_dashboard.yaml index 0cc6f36..57857b6 100644 --- a/config/lovelace/home_dashboard/hallway_dashboard.yaml +++ b/config/lovelace/home_dashboard/hallway_dashboard.yaml @@ -34,12 +34,16 @@ - type: horizontal-stack cards: + - type: custom:button-card + template: default + entity: binary_sensor.front_door + name: Door - type: custom:button-card template: - default - with_state_indicator entity: binary_sensor.motion_2_ias_zone - name: Hallway + name: Motion variables: state_indicator_id: automation.lighting_hallway_day_mode_motion_turn_lights_on - type: custom:button-card diff --git a/config/lovelace/home_dashboard/kitchen_dashboard.yaml b/config/lovelace/home_dashboard/kitchen_dashboard.yaml index 5f05aaf..f03c480 100644 --- a/config/lovelace/home_dashboard/kitchen_dashboard.yaml +++ b/config/lovelace/home_dashboard/kitchen_dashboard.yaml @@ -89,6 +89,10 @@ - type: horizontal-stack cards: + - type: custom:button-card + template: default + entity: binary_sensor.kitchen_window + name: Window - type: custom:button-card template: - default diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml index acb2075..de22dbe 100644 --- a/config/lovelace/home_dashboard/living_room_dashboard.yaml +++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml @@ -130,7 +130,7 @@ cards: - type: custom:button-card template: default - entity: binary_sensor.living_room_right_window_on_off_wrapper + entity: binary_sensor.living_room_right_window name: Window - type: custom:button-card template: diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml index da5818d..e61e83c 100644 --- a/config/lovelace/home_dashboard/main_dashboard.yaml +++ b/config/lovelace/home_dashboard/main_dashboard.yaml @@ -292,12 +292,12 @@ - type: horizontal-stack cards: - type: entity - entity: binary_sensor.front_door_on_off_wrapper + entity: binary_sensor.front_door - type: entity - entity: binary_sensor.living_room_right_window_on_off_wrapper + entity: binary_sensor.living_room_right_window name: Living room - type: entity - entity: binary_sensor.bedroom_right_window_on_off_wrapper + entity: binary_sensor.bedroom_right_window name: Bedroom - type: vertical-stack diff --git a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml index 1fcdc2d..eee1330 100644 --- a/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml +++ b/config/lovelace/home_dashboard/master_bedroom_dashboard.yaml @@ -154,13 +154,13 @@ cards: - type: custom:button-card template: default - entity: binary_sensor.bedroom_right_window_on_off_wrapper - name: Window + entity: binary_sensor.bedroom_door + name: Door - type: custom:button-card - template: - - default - - with_state_indicator - entity: binary_sensor.motion_2_ias_zone - name: Hallway - variables: - state_indicator_id: automation.lighting_hallway_day_mode_motion_turn_lights_on + template: default + entity: binary_sensor.bedroom_left_window + name: Left window + - type: custom:button-card + template: default + entity: binary_sensor.bedroom_right_window + name: Right window diff --git a/config/packages/devices/living_room/toshiba_ac.yaml b/config/packages/devices/living_room/toshiba_ac.yaml index fb1a341..48c4a83 100644 --- a/config/packages/devices/living_room/toshiba_ac.yaml +++ b/config/packages/devices/living_room/toshiba_ac.yaml @@ -34,8 +34,8 @@ automation: above: 24 - platform: state entity_id: - - binary_sensor.living_room_right_window_on_off_wrapper - - binary_sensor.bedroom_right_window_on_off_wrapper + - binary_sensor.living_room_right_window + - binary_sensor.bedroom_right_window from: "on" to: "off" condition: @@ -51,10 +51,10 @@ automation: entity_id: input_boolean.georgi_home state: "on" - condition: state - entity_id: binary_sensor.living_room_right_window_on_off_wrapper + entity_id: binary_sensor.living_room_right_window state: "off" - condition: state - entity_id: binary_sensor.bedroom_right_window_on_off_wrapper + entity_id: binary_sensor.bedroom_right_window state: "off" - condition: state entity_id: climate.toshiba_ac @@ -94,8 +94,8 @@ automation: - platform: state entity_id: - - binary_sensor.living_room_right_window_on_off_wrapper - - binary_sensor.bedroom_right_window_on_off_wrapper + - binary_sensor.living_room_right_window + - binary_sensor.bedroom_right_window from: "off" to: "on" condition: diff --git a/config/packages/modules/alexa.yaml b/config/packages/modules/alexa.yaml index 759a2ae..b985fb4 100644 --- a/config/packages/modules/alexa.yaml +++ b/config/packages/modules/alexa.yaml @@ -22,9 +22,9 @@ alexa: - media_player.living_room - media_player.bathroom - - binary_sensor.front_door_on_off_wrapper - - binary_sensor.living_room_right_window_on_off_wrapper - - binary_sensor.bedroom_right_window_on_off_wrapper + - binary_sensor.front_door + - binary_sensor.living_room_right_window + - binary_sensor.bedroom_right_window - sensor.bedroom_weather_temperature - sensor.bedroom_weather_humidity @@ -64,11 +64,11 @@ alexa: name: "Living room Sonos" media_player.bathroom: name: "Bathroom Sonos" - binary_sensor.front_door_on_off_wrapper: + binary_sensor.front_door: name: "Front door" - binary_sensor.living_room_right_window_on_off_wrapper: + binary_sensor.living_room_right_window: name: "Living room window" - binary_sensor.bedroom_right_window_on_off_wrapper: + binary_sensor.bedroom_right_window: name: "Bedroom window" sensor.bedroom_weather_temperature: name: "Bedroom temperature" diff --git a/config/packages/modules/climate/windows.yaml b/config/packages/modules/climate/windows.yaml index d4ec223..efb53e5 100644 --- a/config/packages/modules/climate/windows.yaml +++ b/config/packages/modules/climate/windows.yaml @@ -1,7 +1,7 @@ binary_sensor: - platform: template sensors: - living_room_right_window_on_off_wrapper: + living_room_right_window: friendly_name: Living room window device_class: window value_template: "{{ is_state('binary_sensor.living_room_right_window_on_off', 'on') }}" @@ -11,8 +11,8 @@ binary_sensor: {% else %} mdi:window-closed-variant {% endif %} - bedroom_right_window_on_off_wrapper: - friendly_name: Bedroom window + bedroom_right_window: + friendly_name: Bedroom right window device_class: window value_template: "{{ is_state('binary_sensor.bedroom_right_window_on_off', 'on') }}" entity_id: binary_sensor.bedroom_right_window_on_off @@ -21,6 +21,26 @@ binary_sensor: {% else %} mdi:window-closed-variant {% endif %} + bedroom_left_window: + friendly_name: Bedroom left window + device_class: window + value_template: "{{ is_state('binary_sensor.bedroom_left_window_raw', 'on') }}" + entity_id: binary_sensor.bedroom_left_window_raw + icon_template: > + {% if is_state('binary_sensor.bedroom_left_window_raw', 'on') %} mdi:window-open-variant + {% else %} mdi:window-closed-variant + {% endif %} + + kitchen_window: + friendly_name: Kitchen window + device_class: window + value_template: "{{ is_state('binary_sensor.kitchen_window_raw', 'on') }}" + entity_id: binary_sensor.kitchen_window_raw + icon_template: > + {% if is_state('binary_sensor.kitchen_window_raw', 'on') %} mdi:window-open-variant + {% else %} mdi:window-closed-variant + {% endif %} + group: all_windows: name: All windows @@ -34,14 +54,14 @@ group: homeassistant: customize: - binary_sensor.living_room_right_window_on_off: - friendly_name: Living room window sensor - sensor.living_room_right_window_power: friendly_name: Living room window battery - binary_sensor.bedroom_right_window_on_off: - friendly_name: Bedroom window sensor + sensor.bedroom_left_window_power: + friendly_name: Bedroom left window battery sensor.bedroom_right_window_power: - friendly_name: Bedroom window battery + friendly_name: Bedroom right window battery + + sensor.kitchen_window_power: + friendly_name: Kitchen window battery diff --git a/config/packages/sensors/front_door.yaml b/config/packages/sensors/doors.yaml similarity index 60% rename from config/packages/sensors/front_door.yaml rename to config/packages/sensors/doors.yaml index d82035a..f635ed6 100644 --- a/config/packages/sensors/front_door.yaml +++ b/config/packages/sensors/doors.yaml @@ -1,7 +1,7 @@ binary_sensor: - platform: template sensors: - front_door_on_off_wrapper: + front_door: friendly_name: Front door device_class: door value_template: "{{ is_state('binary_sensor.front_door_on_off', 'on') }}" @@ -11,14 +11,24 @@ binary_sensor: {% else %} mdi:door-closed {% endif %} + bedroom_door: + friendly_name: Bedroom door + device_class: door + value_template: "{{ is_state('binary_sensor.bedroom_door_raw', 'on') }}" + entity_id: binary_sensor.bedroom_door_raw + icon_template: > + {% if is_state('binary_sensor.bedroom_door_raw', 'on') %} mdi:door-open + {% else %} mdi:door-closed + {% endif %} + # # ─── CUSTOMIZATION ────────────────────────────────────────────────────────────── # homeassistant: customize: - binary_sensor.front_door_on_off: - friendly_name: Front door sensor - sensor.front_door_power: friendly_name: Front door battery + + sensor.bedroom_door_power: + friendly_name: Bedroom door battery