hoffmation-base 2.19.4 → 2.19.5

package/lib/server/devices/groups/lightGroup.d.ts

@@ -13,6 +13,7 @@ export declare class LightGroup extends BaseGroup {
     getLED(): iLedRgbCct[];
     getWled(): WledDevice[];
     getOutlets(): iActuator[];
+    getAllAsActuator(): iActuator[];
     handleSunriseOff(): void;
     switchAll(target: boolean, force?: boolean): void;
     switchTimeConditional(time: TimeOfDay): void;

package/lib/server/devices/groups/lightGroup.js

@@ -52,6 +52,14 @@ class LightGroup extends base_group_1.BaseGroup {
     getOutlets() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Outlets);
     }
+    getAllAsActuator() {
+        const result = [];
+        result.push(...this.getLights());
+        result.push(...this.getOutlets());
+        result.push(...this.getLED());
+        result.push(...this.getWled());
+        return result;
+    }
     handleSunriseOff() {
         if (!this.anyLightsOn()) {
             return;
@@ -60,17 +68,12 @@ class LightGroup extends base_group_1.BaseGroup {
         this.switchAll(false);
     }
     switchAll(target, force = false) {
-        if (!force && !target && this._ambientLightOn) {
-            this.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
-            return;
-        }
-        this.setAllLampen(target, undefined, force);
-        this.setAllStecker(target, undefined, force);
-        this.getLED().forEach((s) => {
-            s.setLight(target);
-        });
-        this.getWled().forEach((wled) => {
-            wled.setLight(target);
+        this.getAllAsActuator().forEach((a) => {
+            if (a.settings.includeInAmbientLight && !force && !target && this._ambientLightOn) {
+                a.log(models_1.LogLevel.Info, `Ambient light mode is active --> Skip non force light off command in ${this.roomName}`);
+                return;
+            }
+            a.setActuator(target, undefined, force);
         });
     }
     switchTimeConditional(time) {
@@ -193,24 +196,9 @@ class LightGroup extends base_group_1.BaseGroup {
     ambientLightStartCallback() {
         this._ambientLightOn = true;
         this.log(models_1.LogLevel.Info, `Draußen wird es dunkel --> Aktiviere Ambientenbeleuchtung`);
-        this.getLights().forEach((l) => {
-            if (l.settings.includeInAmbientLight) {
-                l.setLight(true, -1, false);
-            }
-        });
-        this.getOutlets().forEach((o) => {
-            if (o.settings.includeInAmbientLight) {
-                o.setActuator(true);
-            }
-        });
-        this.getLED().forEach((s) => {
-            if (s.settings.includeInAmbientLight) {
-                s.setLight(true, -1, false);
-            }
-        });
-        this.getWled().forEach((wled) => {
-            if (wled.settings.includeInAmbientLight) {
-                wled.setLight(true);
+        this.getAllAsActuator().forEach((a) => {
+            if (a.settings.includeInAmbientLight) {
+                a.setActuator(true);
             }
         });
         services_1.Utils.guardedTimeout(() => {