hoffmation-base 3.0.0-alpha.33 → 3.0.0-alpha.34

package/lib/models/rooms/RoomSettings/RoomSettingsController.d.ts

@@ -3,7 +3,6 @@ import { iRoomDefaultSettings } from './iRoomDefaultSettings';
 import { iTimePair, SunTimeOffsets } from '../../../server';
 import { RoomSettings } from './roomSettings';
 export declare class RoomSettingsController implements iRoomDefaultSettings {
-    constructor(room: RoomBase);
     /**
      * The name of the room this settings are for
      */
@@ -17,6 +16,7 @@ export declare class RoomSettingsController implements iRoomDefaultSettings {
      */
     lampOffset: SunTimeOffsets;
     private _settingsContainer;
+    constructor(room: RoomBase);
     get settingsContainer(): RoomSettings;
     get lichtSonnenAufgangAus(): boolean;
     get ambientLightAfterSunset(): boolean;

package/lib/server/devices/sharedFunctions/lampUtils.d.ts

@@ -14,7 +14,7 @@ export declare class LampUtils {
      * @param {DimmerSetLightCommand} c - The command to check
      * @returns {boolean} - True if the command can be skipped
      */
-    static checkDimmerUnchanged(device: iDimmableLamp, c: DimmerSetLightCommand): boolean;
-    static checkUnchanged(device: iActuator, c: ActuatorSetStateCommand, noLog?: boolean): boolean;
+    static canDimmerChangeBeSkipped(device: iDimmableLamp, c: DimmerSetLightCommand): boolean;
+    static canActuatorChangeBeSkipped(device: iActuator, c: ActuatorSetStateCommand, noLog?: boolean): boolean;
     static setActuator(device: iActuator, c: ActuatorSetStateCommand): void;
 }

package/lib/server/devices/sharedFunctions/lampUtils.js

@@ -67,11 +67,11 @@ class LampUtils {
      * @param {DimmerSetLightCommand} c - The command to check
      * @returns {boolean} - True if the command can be skipped
      */
-    static checkDimmerUnchanged(device, c) {
+    static canDimmerChangeBeSkipped(device, c) {
         if (c.isForceAction) {
             return false;
         }
-        if (!this.checkUnchanged(device, c, true)) {
+        if (!this.canActuatorChangeBeSkipped(device, c, true)) {
             return false;
         }
         if (c.brightness !== device.brightness) {
@@ -80,11 +80,12 @@ class LampUtils {
         device.log(models_1.LogLevel.DeepTrace, `Light command can be skipped as the device is already in desired state: ${c.logMessage}`, services_1.LogDebugType.SkipUnchangedActuatorCommand);
         return true;
     }
-    static checkUnchanged(device, c, noLog = false) {
+    static canActuatorChangeBeSkipped(device, c, noLog = false) {
         if (c.isForceAction) {
             return false;
         }
-        if (c.on !== device.queuedValue || (device.queuedValue === null && device.actuatorOn !== c.on)) {
+        if ((device.queuedValue === null && device.actuatorOn !== c.on) ||
+            (device.queuedValue !== null && c.on === device.queuedValue)) {
             return false;
         }
         if (!noLog) {
@@ -107,7 +108,7 @@ class LampUtils {
             // Preserve the target state for the automatic handler, as
             device.targetAutomaticState = c.on;
         }
-        if (LampUtils.checkUnchanged(device, c)) {
+        if (LampUtils.canActuatorChangeBeSkipped(device, c)) {
             return;
         }
         device.queuedValue = c.on;

package/lib/server/devices/wledDevice.js

@@ -69,7 +69,7 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (sharedFunctions_1.LampUtils.checkDimmerUnchanged(this, c)) {
+        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
             return;
         }
         if (c.isAutomaticAction) {

package/lib/server/devices/zigbee/BaseDevices/zigbeeDimmer.js

@@ -57,7 +57,7 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (sharedFunctions_1.LampUtils.checkDimmerUnchanged(this, c)) {
+        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
             return;
         }
         if (c.isAutomaticAction) {

package/lib/server/services/govee/own-govee-device.js

@@ -117,7 +117,7 @@ class OwnGoveeDevice {
         if (devices_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (devices_1.LampUtils.checkDimmerUnchanged(this, c)) {
+        if (devices_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
             return;
         }
         if (c.isAutomaticAction) {