management tweaks

Author: Zoe

libs/automation-logic/src/services/aggressive-scenes.service.ts

@@ -89,7 +89,9 @@ export class AggressiveScenesService {
           );
           return;
         }
-        await this.matchSwitchToScene(child, expected);
+        if (child.state !== expected.state) {
+          await this.matchSwitchToScene(child, expected);
+        }
       });
     }
   }

libs/automation-logic/src/services/light-manager.service.ts

@@ -17,7 +17,7 @@ import {
 } from "../includes";
 import { CircadianService, ColorLight } from "./circadian.service";
 
-const MAX_DIFFERENCE = 10;
+const MAX_DIFFERENCE = 100;
 @Injectable()
 export class LightMangerService {
   constructor(
@@ -112,23 +112,28 @@ export class LightMangerService {
   ): Promise<boolean> {
     const stateTests = {
       brightness: entity.attributes.brightness === state.brightness,
-      color: this.lightInRange(entity),
       state: entity.state === state.state,
+      temperature: this.lightInRange(entity),
     };
     // ? Find things that don't currently match expectations
     const reasons = Object.keys(stateTests).filter(key => !stateTests[key]);
     if (is.empty(reasons)) {
       return false;
     }
     this.logger.debug(
-      { reasons, state },
-      `[%s] setting light {temperature}`,
-      entity.entity_id,
+      {
+        from: entity.attributes.color_temp_kelvin,
+        name: entity.entity_id,
+        reasons,
+        state,
+        to: this.circadian.kelvin,
+      },
+      `setting light {temperature}`,
     );
     await this.call.light.turn_on({
       brightness: state.brightness,
       entity_id: entity.entity_id,
-      rgb_color: state.rgb_color,
+      kelvin: this.circadian.kelvin,
     });
     return true;
   }

libs/automation-logic/src/services/scene-room.service.ts

@@ -278,12 +278,12 @@ export class SceneRoomService {
         new Promise<void>(async done => {
           await eachSeries(
             Object.keys(lights),
-            async (id: PICK_ENTITY<"light">) => {
-              const change = lights[id];
-              this.eventEmitter.emit(SCENE_SET_ENTITY, id);
+            async (entity_id: PICK_ENTITY<"light">) => {
+              const change = lights[entity_id];
+              this.eventEmitter.emit(SCENE_SET_ENTITY, entity_id);
               await this.call.light.turn_on({
                 brightness: change.brightness,
-                entity_id: id,
+                entity_id,
                 kelvin: change.kelvin,
               });
             },