Make main water shut-off a valve

Chris-V · Jul 14, 2024 · b920cd8 · b920cd8
1 parent 18104e7
commit b920cd8
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 15 deletions.
diff --git a/dashboards/views/basement.yaml b/dashboards/views/basement.yaml
@@ -147,6 +147,6 @@
     switches:
       - entity_id: light.workshop
         name: Light
-      - entity_id: switch.main_water_shut_off_valve
-        name: Main water shut-off valve
+      - entity_id: valve.main_water_shut_off
+        name: Main water shut-off
         tap_action: more-info  # Prevents accidental toggles
diff --git a/dashboards/views/ground-floor.yaml b/dashboards/views/ground-floor.yaml
@@ -52,9 +52,8 @@
       - entity_id: light.living_room_ambiance
         name: Ambiance
         icon: mdi:floor-lamp-dual
-      - entity_id: switch.bookshelf_outlet
-        name: Bookshelf outlet
-        icon: mdi:power-socket-us
+      - entity_id: light.staircase
+        name: Staircase
       - entity_id: media_player.living_room_tv
         name: TV
         icon: mdi:television

diff --git a/dashboards/views/home.yaml b/dashboards/views/home.yaml
@@ -12,7 +12,7 @@
         - entity: binary_sensor.all_windows
         - entity: binary_sensor.all_leaks
         - entity: binary_sensor.kitchen_door_lock_jammed
-        - entity: switch.main_water_shut_off_valve
+        - entity: valve.main_water_shut_off
         - entity: sensor.broadcast_queue
     - !include ../cards/alarm.yaml
 

diff --git a/packages/areas/living_room.yaml b/packages/areas/living_room.yaml
@@ -15,8 +15,6 @@ homeassistant:
       battery_warning_level: 25
     sensor.living_room_temperature:
       friendly_name: "Living room temperature"
-    switch.bookshelf_outlet:
-      friendly_name: "Bookshelf outlet"
 
 cloud:
   google_actions:
@@ -27,17 +25,13 @@ cloud:
         - "light.living_room"
         - "light.living_room_ambiance"
         - "light.staircase"
-        - "switch.bookshelf_outlet"
     entity_config:
       light.living_room_ambiance:
         aliases:
           - "Living room lamp"
       light.living_room:
         aliases:
           - "Living room spots"
-      switch.bookshelf_outlet:
-        aliases:
-          - "Christmas tree"
 
 input_number:
   living_room_thermostat_eco_setpoint:

diff --git a/packages/areas/workshop.yaml b/packages/areas/workshop.yaml
@@ -5,8 +5,6 @@ homeassistant:
     sensor.water_heater_leak_sensor_battery:
       battery_type: "ER14250 3.6V"
       battery_warning_level: 25
-    switch.main_water_shut_off_valve:
-      icon: "mdi:valve"
 
 cloud:
   google_actions:

diff --git a/packages/misc/default_theme.yaml b/packages/misc/default_theme.yaml
@@ -15,7 +15,7 @@ template:
             is_state('binary_sensor.all_leaks', 'on')
               or is_state('binary_sensor.intrusion_activity', 'on')
               or is_state('binary_sensor.kitchen_door_lock_jammed', 'on')
-              or is_state('switch.main_water_shut_off_valve', 'off')
+              or is_state('valve.main_water_shut_off', 'off')
           }}
       - unique_id: "db252c59-897b-4bd9-94a8-d5d17f48ed68"
         name: "use_dark_theme"