single apps per room again based on services update

apps/rooms/bathroom.yaml

@@ -2,10 +2,12 @@ bathroom:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:05:00'
+  motion:
+    sensor: binary_sensor.bathroom_motion_occupancy
+    ref_entity: light.bathroom
+  button: Bathroom Button
+  # rich: DEBUG
   states:
     - time: '05:00:00'
       scene:
@@ -34,25 +36,3 @@ bathroom:
       light.bathroom:
         brightness: 1
         color_temp: 250
-
-bathroom_button:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bathroom
-  # rich: DEBUG
-  app: bathroom
-  button: Bathroom Button
-  ref_entity: light.bathroom
-
-bathroom_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bathroom
-  # rich: DEBUG
-  app: bathroom
-  sensor: binary_sensor.bathroom_motion_occupancy
-  ref_entity: light.bathroom

apps/rooms/bedroom.yaml

@@ -2,10 +2,14 @@ bedroom:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:05:00'
+  motion:
+    sensor: binary_sensor.bedroom_motion_occupancy
+    ref_entity: light.bedroom
+  button:
+    - Bedroom Button 1
+    - Bedroom Button 2
+  # rich: DEBUG
   states:
     - time: 'sunrise - 03:00:00'
       scene:
@@ -76,28 +80,3 @@ bedroom:
           color_name: blueviolet
           brightness: 255
   sleep: input_boolean.sleeping
-
-bedroom_buttons:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bedroom
-  # rich: DEBUG
-  app: bedroom
-  ref_entity: light.bedroom
-  button:
-    - Bedroom Button 1
-    - Bedroom Button 2
-
-bedroom_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - bedroom
-  # rich: DEBUG
-  app: bedroom
-  sensor: binary_sensor.bedroom_motion_occupancy
-  off_duration: '00:05:00'
-  ref_entity: light.bedroom

apps/rooms/closet.yaml

@@ -2,10 +2,11 @@ closet:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:02:00'
+  motion:
+    sensor: binary_sensor.closet_motion_occupancy
+    ref_entity: light.closet
+  # rich: DEBUG
   states:
     - time: 'sunrise - 03:00:00'
       scene:
@@ -27,14 +28,3 @@ closet:
         light.closet:
           brightness: 100
           color_temp: 400
-
-closet_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - closet
-  # rich: DEBUG
-  app: closet
-  sensor: binary_sensor.closet_motion_occupancy
-  ref_entity: light.closet

apps/rooms/kitchen.yaml

@@ -2,11 +2,12 @@ kitchen:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:10:00'
-  # ha_button: input_button.activate_kitchen
+  motion:
+    sensor: binary_sensor.kitchen_motion_occupancy
+    ref_entity: light.kitchen
+  button: Kitchen Button
+  # rich: DEBUG
   sleep: input_boolean.sleeping
   sleep_state:
     scene:
@@ -39,25 +40,3 @@ kitchen:
           state: on
           color_temp: 650
           brightness: 25
-  
-kitchen_button:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - kitchen
-  # rich: DEBUG
-  app: kitchen
-  button: Kitchen Button
-  ref_entity: light.kitchen
-
-kitchen_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - kitchen
-  # rich: DEBUG
-  app: kitchen
-  sensor: binary_sensor.kitchen_motion_occupancy
-  ref_entity: light.kitchen

apps/rooms/laundry.yaml

@@ -2,10 +2,11 @@ laundry:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - rich_logging
-  # rich: DEBUG
   off_duration: '00:02:00'
+  motion:
+    sensor: binary_sensor.laundry_motion_occupancy
+    ref_entity: light.laundry
+  # rich: DEBUG
   states:
     - time: 'sunrise - 03:00:00'
       scene:
@@ -27,15 +28,3 @@ laundry:
         light.laundry:
           brightness: 100
           color_temp: 400
-
-laundry_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - laundry
-  # rich: DEBUG
-  rich: DEBUG
-  app: laundry
-  sensor: binary_sensor.laundry_motion_occupancy
-  ref_entity: light.laundry

apps/rooms/living_room.yaml

@@ -2,10 +2,13 @@ living_room:
   module: room_control
   class: RoomController
   loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
+  off_duration: '00:30:00'
-    - rich_logging
+  motion:
+    sensor: binary_sensor.living_room_motion_occupancy
+    ref_entity: light.living_room
+  button: Living Room Button
+  door: binary_sensor.front_contact
   # rich: DEBUG
-  off_duration: 00:30:00
   states:
     - time: sunrise
       scene:
@@ -68,35 +71,3 @@ living_room:
         state: 'on'
         rgb_color: [255, 0, 0]
         brightness: 25
-
-front_door:
-  module: room_control
-  class: Door
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - living_room
-  # rich: DEBUG
-  app: living_room
-  door: binary_sensor.front_contact
-
-living_room_button:
-  module: room_control
-  class: Button
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - living_room
-  # rich: DEBUG
-  app: living_room
-  button: Living Room Button
-  ref_entity: light.living_room
-
-living_room_motion:
-  module: room_control
-  class: Motion
-  loki_url: http://192.168.1.107:3100/loki/api/v1/push
-  dependencies:
-    - living_room
-  # rich: DEBUG
-  app: living_room
-  sensor: binary_sensor.living_room_motion_occupancy
-  ref_entity: light.living_room