Move desk sensor to hallway. Group up

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

@@ -2,7 +2,7 @@ automation:
   - alias: Lighting · Hallway · Motion On
     trigger:
       platform: state
-      entity_id: binary_sensor.hallway_motion_occupancy
+      entity_id: group.hallway_motion
       to: "on"
     condition:
       condition: state
@@ -33,15 +33,13 @@ automation:
               - light.osram_1
               - light.browser_hallway
             data:
-              brightness_pct: 13
+              brightness_pct: 1
 
   - alias: Lighting · Hallway · Motion Off
     trigger:
       platform: state
-      entity_id: binary_sensor.hallway_motion_occupancy
+      entity_id: group.hallway_motion
       to: "off"
-      for:
-        minutes: 5
     action:
       - choose:
         # Day Mode

config/packages/modules/presence.yaml

@@ -60,17 +60,15 @@ binary_sensor:
         device_class: motion
         value_template: "{{ is_state('sensor.multisensor_6_burglar', '8') }}"
 
+
+group:
+  hallway_motion:
+    name: Hallway Motion
+    entities:
+      - binary_sensor.hallway_motion_occupancy
+      - binary_sensor.trisensor_motion
+
 sensor:
-  - platform: history_stats
-    name: At Desk
-    entity_id: binary_sensor.trisensor_sensor
-    state: "on"
-    type: ratio
-    duration:
-      minutes: 5
-    end: '{{ now() }}'
-
-
   - platform: history_stats
     name: Quarantined percent
     entity_id: device_tracker.carbon
@@ -177,3 +175,6 @@ homeassistant:
 
     automation.presence_arrival_detecion:
       icon: mdi:account-plus-outline
+
+    group.hallway_motion:
+      icon: mdi:motion-sensor