Improve scenes

config/lovelace/button_card_templates/mixins/scene_button.yaml

@@ -4,7 +4,10 @@ scene:
     scene_color_2:
     degrees: 315
   tap_action:
-    action: toggle
+    action: call-service
+    service: scene.turn_on
+    service_data:
+      entity_id: "[[[ return entity.entity_id ]]]"
   styles:
     card:
       - background: >

config/lovelace/home_dashboard/bedroom_dashboard.yaml

@@ -38,7 +38,40 @@
                 template: default
                 entity: light.bedside
                 name: Bedside
-
+          - type: horizontal-stack
+            cards:
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.bedroom_ambient_neon
+                name: Neon
+                variables:
+                  scene_color_1: rgb(255, 0, 190)
+                  scene_color_2: rgb(0, 255, 190)
+                tap_action:
+                  action: call-service
+                  service: script.apply_bedroom_neon
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.bedroom_ambient_neon
+                name: Ambient neon
+                variables:
+                  scene_color_1: rgb(255, 0, 190)
+                  scene_color_2: rgb(0, 255, 190)
+                tap_action:
+                  action: call-service
+                  service: script.apply_bedroom_ambient_neon
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.bedroom_default
+                name: Regular
+                variables:
+                  scene_color_1: rgb(254, 255, 209)
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.bedroom_ambient_default
+                name: Ambient regular
+                variables:
+                  scene_color_1: rgb(254, 255, 209)
 
           - type: vertical-stack
             title: Controls
@@ -65,19 +98,6 @@
                   - type: custom:button-card
                     template: default
                     entity: binary_sensor.house_mode
-                  - type: custom:button-card
-                    template: [default, scene]
-                    entity: script.scene_bedroom_neon
-                    name: Neon
-                    variables:
-                      scene_color_1: rgb(255, 0, 190)
-                      scene_color_2: rgb(0, 255, 190)
-                  - type: custom:button-card
-                    template: [default, scene]
-                    entity: script.scene_bedroom_regular
-                    name: Regular
-                    variables:
-                      scene_color_1: rgb(254, 255, 209)
 
           - type: horizontal-stack
             title: Climate

config/lovelace/home_dashboard/living_room_dashboard.yaml

@@ -48,6 +48,21 @@
                     styles:
                       card:
                         - height: 46px
+          - type: horizontal-stack
+            cards:
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.living_room_ambient_neon
+                name: Neon
+                variables:
+                  scene_color_1: rgb(255, 0, 190)
+                  scene_color_2: rgb(0, 255, 190)
+              - type: custom:button-card
+                template: [small, scene]
+                entity: scene.living_room_ambient_default
+                name: Regular
+                variables:
+                  scene_color_1: rgb(254, 255, 209)
           - type: horizontal-stack
             title: Devices
             cards:

config/packages/devices/living_room/living_room_opple.yaml

@@ -53,7 +53,8 @@ automation:
             entity_id: light.living_room_ambient
 
         button_2_release:
-          - service: script.scene_living_room_ambient_neon
+          - service: scene.turn_on
+            entity_id: scene.living_room_ambient_neon
 
         button_3_single:
           - service: media_player.media_play_pause

config/packages/modules/lighting/areas/bedroom.yaml

@@ -1,43 +1,72 @@
 script:
-  scene_bedroom_neon:
+  apply_bedroom_ambient_neon:
+    sequence:
+      - service: light.turn_off
+        entity_id: light.bed_led
+      - delay: "00:00:03"
+      - service: scene.turn_on
+        entity_id: scene.bedroom_ambient_neon
+  apply_bedroom_neon:
+    sequence:
+      - service: light.turn_off
+        entity_id: light.bed_led
+      - delay: "00:00:03"
+      - service: scene.turn_on
+        entity_id: scene.bedroom_neon
+
+scene:
+  - name: Bedroom Ambient Neon
     icon: "mdi:weather-night"
-    sequence:
-      - service: light.turn_on
-        entity_id: light.master_bedroom_main
-        data:
-          rgb_color: [255, 0, 190]
-          brightness_pct: 40
-      - service: light.turn_on
-        entity_id: light.bedside
-        data:
-          xy_color: [0.384, 0.159]
-          brightness_pct: 1
-      - service: light.turn_on
-        entity_id: light.bed_led
-        data:
-          rgb_color: [0, 255, 190]
-          brightness_pct: 100
-      - service: light.turn_on
-        entity_id: light.bed_led
-        data:
-          rgb_color: [0, 255, 190]
-      - delay: 00:00:05
-      - service: light.turn_on
-        entity_id: light.bed_led
+    entities:
+      light.bedside:
+        state: "on"
+        rgb_color: [0, 255, 190]
+        brightness: 230
+      light.bed_led:
+        state: "on"
+        xy_color: [0.66, 0.28]
+        brightness: 254
 
+  - name: Bedroom Neon
+    icon: "mdi:weather-night"
+    entities:
+      light.master_bedroom_main:
+        state: "on"
+        brightness: 153
+        hs_color: [345, 100]
+      light.bedside:
+        state: "on"
+        rgb_color: [0, 255, 190]
+        brightness: 230
+      light.bed_led:
+        state: "on"
+        xy_color: [0.66, 0.28]
+        brightness: 254
 
-  scene_bedroom_regular:
+  - name: Bedroom Ambient Default
     icon: "mdi:weather-sunny"
-    sequence:
-      - service: light.turn_on
-        entity_id:
-          - light.master_bedroom_main
-          - light.bed_led
-        data:
-          color_temp: 500
-          brightness_pct: 100
-      - service: light.turn_on
-        entity_id: light.bedside
-        data:
-          color_temp: 500
-          brightness_pct: 20
+    entities:
+      light.bedside:
+        state: "on"
+        color_temp: 359
+        brightness: 255
+      light.bed_led:
+        state: "on"
+        color_temp: 500
+        brightness: 255
+
+  - name: Bedroom Default
+    icon: "mdi:weather-sunny"
+    entities:
+      light.master_bedroom_main:
+        state: "on"
+        brightness: 255
+        color_temp: 500
+      light.bedside:
+        state: "on"
+        color_temp: 359
+        brightness: 255
+      light.bed_led:
+        state: "on"
+        color_temp: 500
+        brightness: 255

config/packages/modules/lighting/areas/living_room.yaml

@@ -1,14 +1,23 @@
-script:
-  scene_living_room_ambient_neon:
+scene:
+  - name: Living Room Ambient Neon
     icon: "mdi:weather-night"
-    sequence:
-      - service: light.turn_on
-        entity_id: light.light_avatar_small_1
-        data:
-          xy_color: [0.668, 0.284]
-          brightness_pct: 80
-      - service: light.turn_on
-        entity_id: light.living_room_ambient_main
-        data:
-          rgb_color: [0, 255, 190]
-          brightness_pct: 100
+    entities:
+      light.light_avatar_small_1:
+        state: "on"
+        xy_color: [0.668, 0.284]
+        brightness_pct: 80
+      light.living_room_ambient_main:
+        state: "on"
+        rgb_color: [0, 255, 190]
+        brightness_pct: 100
+  - name: Living Room Ambient Default
+    icon: "mdi:weather-sunny"
+    entities:
+      light.light_avatar_small_1:
+        state: "on"
+        white_value: 255
+        brightness_pct: 100
+      light.living_room_ambient_main:
+        state: "on"
+        color_temp: 284
+        brightness_pct: 80