hoffmation-base 3.0.0-alpha.81 → 3.0.0-alpha.83

package/lib/server/devices/velux/veluxShutter.js

@@ -100,23 +100,25 @@ class VeluxShutter extends veluxDevice_1.VeluxDevice {
         }
         this._setLevel = targetLevel;
         this.log(models_2.LogLevel.Debug, `Fahre Rollo auf Position ${targetLevel}`);
-        this.setState(this._setLevelSwitchID, targetLevel);
+        // Level is inverted for Velux Adapter (100 = 0, 0 = 100, 25 = 75, etc.)
+        this.setState(this._setLevelSwitchID, Math.abs(targetLevel - 100));
     }
     toJSON() {
         return lodash_1.default.omit(super.toJSON(), ['_window']);
     }
     setCurrentLevel(value, initial = false) {
-        if (value !== this._setLevel && services_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
-            value = this._setLevel;
+        let correctedValue = Math.abs(value - 100);
+        if (correctedValue !== this._setLevel && services_1.Utils.nowMS() - this._setLevelTime < 60 * 10000) {
+            correctedValue = this._setLevel;
         }
-        if (value !== this._currentLevel && this._window && !initial) {
+        if (correctedValue !== this._currentLevel && this._window && !initial) {
             services_1.Utils.guardedNewThread(() => {
                 var _a;
-                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new models_2.ShutterPositionChangedAction(this, value));
+                (_a = this._window) === null || _a === void 0 ? void 0 : _a.rolloPositionChange(new models_2.ShutterPositionChangedAction(this, correctedValue));
             }, this);
             this.persist();
         }
-        this._currentLevel = value;
+        this._currentLevel = correctedValue;
     }
 }
 exports.VeluxShutter = VeluxShutter;

package/lib/server/services/govee/own-govee-device.d.ts

@@ -29,6 +29,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     private _color;
     private _colortemp;
     private _room;
+    protected _lastPersist: number;
     constructor(deviceId: string, ownDeviceName: string, roomName: string);
     get color(): string;
     get colortemp(): number;

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

@@ -36,6 +36,7 @@ class OwnGoveeDevice {
         this._color = '#fcba32';
         this._colortemp = 500;
         this._room = undefined;
+        this._lastPersist = 0;
         this.deviceId = deviceId;
         this._info = new devices_1.DeviceInfo();
         this._info.fullName = `Govee ${roomName} ${ownDeviceName}`;
@@ -147,7 +148,12 @@ class OwnGoveeDevice {
     }
     persist() {
         var _a;
+        const now = utils_1.Utils.nowMS();
+        if (this._lastPersist + 1000 > now) {
+            return;
+        }
         (_a = utils_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+        this._lastPersist = now;
     }
     toggleActuator(c) {
         const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
@@ -168,10 +174,18 @@ class OwnGoveeDevice {
     }
     update(data) {
         this.queuedValue = null;
+        const anyChanged = this._actuatorOn !== data.actuatorOn ||
+            this.brightness !== data.brightness ||
+            this._color !== data.hexColor ||
+            this._colortemp !== data.colortemp;
+        if (!anyChanged) {
+            return;
+        }
         this._actuatorOn = data.actuatorOn;
         this.brightness = data.brightness;
         this._color = data.hexColor;
         this._colortemp = data.colortemp;
+        this.persist();
     }
     setBrightness(brightness, cb) {
         govee_service_1.GooveeService.sendCommand(this, `brightness/${brightness}`).then((result) => {