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

package/lib/server/devices/zigbee/zigbeeBlitzShp.js

@@ -6,43 +6,48 @@ const models_1 = require("../../../models");
 const BaseDevices_1 = require("./BaseDevices");
 const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
-    get steckerOn() {
-        return this._steckerOn;
-    }
-    get current() {
-        return this._current;
-    }
-    get energy() {
-        return this._energy;
-    }
-    get loadPower() {
-        return this._loadPower;
-    }
     constructor(pInfo) {
-        super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp, `${pInfo.fullID}.state`);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeBlitzShp);
+        /** @inheritDoc */
+        this.settings = new models_1.ActuatorSettings();
         this._steckerOn = false;
         this._current = 0;
         this._energy = 0;
         this._loadPower = 0;
-        this.settings = new models_1.ActuatorSettings();
         this._availableForExcessEnergy = true;
         this._activatedByExcessEnergy = false;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
         this.settings.energySettings = new models_1.ExcessEnergyConsumerSettings();
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.excessEnergyConsumer);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
     }
+    get current() {
+        return this._current;
+    }
+    get energy() {
+        return this._energy;
+    }
+    /** @inheritDoc */
+    get loadPower() {
+        return this._loadPower;
+    }
+    /** @inheritDoc */
     get energySettings() {
         return this.settings.energySettings;
     }
+    /** @inheritDoc */
     get currentConsumption() {
         return this._loadPower;
     }
+    /** @inheritDoc */
     get on() {
         return this._steckerOn;
     }
+    /** @inheritDoc */
     isAvailableForExcessEnergy() {
         return this._availableForExcessEnergy;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
@@ -69,13 +74,16 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
                 break;
         }
     }
+    /** @inheritDoc */
     turnOnForExcessEnergy() {
         this._activatedByExcessEnergy = true;
         this.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, true, 'Turn on for excess energy'));
     }
+    /** @inheritDoc */
     turnOffDueToMissingEnergy() {
         this.setActuator(new models_1.ActuatorSetStateCommand(models_1.CommandSource.Automatic, false, 'Turn off due to missing energy'));
     }
+    /** @inheritDoc */
     wasActivatedByExcessEnergy() {
         return this._activatedByExcessEnergy;
     }

package/lib/server/devices/zigbee/zigbeeEuroHeater.d.ts

@@ -12,24 +12,30 @@ export declare class ZigbeeEuroHeater extends ZigbeeHeater implements iDisposabl
     private _recalcTimeout;
     private _forcedRefreshInterval;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     get seasonTurnOff(): boolean;
+    /** @inheritDoc */
     set seasonTurnOff(value: boolean);
-    set roomTemperatur(value: number);
+    /** @inheritDoc */
     get roomTemperature(): number;
+    /** @inheritDoc */
     get desiredTemperature(): number;
+    /** @inheritDoc */
     set desiredTemperature(val: number);
+    protected set roomTemperatur(value: number);
     private get tempDiff();
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     recalcLevel(): void;
     private checkTempDiff;
     private setLocalDiff;
     private setTargetTemperatur;
+    /** @inheritDoc */
     dispose(): void;
     private setValve;
     /**
-     * Sets the mode (1 = manual valve, 2 = automatic temp based)
-     * @param {1 | 2} targetMode
-     * @private
+     * Sets the mode
+     * @param targetMode - (1 = manual valve, 2 = automatic temp based)
      */
     private setMode;
 }

package/lib/server/devices/zigbee/zigbeeEuroHeater.js

@@ -23,9 +23,11 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
             this.setMode(this.settings.controlByPid || this.seasonTurnOff ? 1 : 2);
         }, 6 * 60 * 60 * 1000, this);
     }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
         if (value) {
@@ -35,23 +37,26 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         }
         this.setMode(this.settings.controlByPid ? 1 : 2);
     }
-    set roomTemperatur(value) {
-        this._roomTemperature = value;
-        if (this.settings.useOwnTemperatur) {
-            return;
-        }
-        this.recalcLevel();
-    }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperatur;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this._desiredTemperatur = val;
         this.recalcLevel();
     }
+    set roomTemperatur(value) {
+        this._roomTemperature = value;
+        if (this.settings.useOwnTemperatur) {
+            return;
+        }
+        this.recalcLevel();
+    }
     get tempDiff() {
         var _a, _b, _c, _d;
         const tempChangeMs = (_b = (_a = this.stateMap.get('local_temp')) === null || _a === void 0 ? void 0 : _a.lc) !== null && _b !== void 0 ? _b : 0;
@@ -63,6 +68,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
             return this._targetTempVal - this._temperatur;
         }
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
             case 'valve_position':
@@ -154,6 +160,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         this.log(models_1.LogLevel.Debug, `Setting new Target Temp (${targetTemp}) for Euro Valve`);
         this.setState(this._setPointTemperaturID, targetTemp);
     }
+    /** @inheritDoc */
     dispose() {
         clearInterval(this._forcedRefreshInterval);
     }
@@ -169,9 +176,8 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         }, 10000, this);
     }
     /**
-     * Sets the mode (1 = manual valve, 2 = automatic temp based)
-     * @param {1 | 2} targetMode
-     * @private
+     * Sets the mode
+     * @param targetMode - (1 = manual valve, 2 = automatic temp based)
      */
     setMode(targetMode) {
         this.setState(this._setModeId, targetMode);

package/lib/server/devices/zigbee/zigbeeHeimanSmoke.d.ts

@@ -1,25 +1,51 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './BaseDevices';
+import { BatteryLevelChangeAction } from '../../../models';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iBatteryDevice, iSmokeDetectorDevice } from '../baseDeviceInterfaces';
 export declare class ZigbeeHeimanSmoke extends ZigbeeDevice implements iBatteryDevice, iSmokeDetectorDevice {
+    /**
+     * The timeout for the alarm to fire again
+     * @default undefined (no alarm active)
+     */
+    iAlarmTimeout: NodeJS.Timeout | undefined;
     private _battery;
     private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
-    constructor(pInfo: IoBrokerDeviceInfo);
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     private _smoke;
-    iAlarmTimeout: NodeJS.Timeout | undefined;
     private _messageAlarmFirst;
     private _messageAlarm;
     private _messageAlarmEnd;
-    get smoke(): boolean;
     private _roomName;
+    /**
+     * Creates an instance of {@link DeviceType.ZigbeeHeimanSmoke}.
+     * @param pInfo - Device creation information
+     */
+    constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
+    get smoke(): boolean;
+    /**
+     * The name of the room the device is in (Set during initialization)
+     */
     set roomName(val: string);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
+    /** @inheritDoc */
     stopAlarm(quiet?: boolean): void;
-    private startAlarm;
-    private alarm;
+    /** @inheritdoc */
     persistBatteryDevice(): void;
+    /** @inheritDoc */
     dispose(): void;
+    private startAlarm;
+    private alarm;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

package/lib/server/devices/zigbee/zigbeeHeimanSmoke.js

@@ -7,18 +7,22 @@ const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
 const DeviceCapability_1 = require("../DeviceCapability");
 class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
+    /**
+     * Creates an instance of {@link DeviceType.ZigbeeHeimanSmoke}.
+     * @param pInfo - Device creation information
+     */
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeHeimanSmoke);
+        /**
+         * The timeout for the alarm to fire again
+         * @default undefined (no alarm active)
+         */
+        this.iAlarmTimeout = undefined;
         this._battery = -99;
         this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this._smoke = false;
-        this.iAlarmTimeout = undefined;
         this._messageAlarmFirst = '';
         this._messageAlarm = '';
         this._messageAlarmEnd = '';
@@ -29,9 +33,21 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         this._messageAlarm = services_1.Res.fireAlarmRepeat(this._roomName, this.info.customName);
         this._messageAlarmEnd = services_1.Res.fireAlarmEnd(this._roomName);
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     get smoke() {
         return this._smoke;
     }
+    /**
+     * The name of the room the device is in (Set during initialization)
+     */
     set roomName(val) {
         this._roomName = val;
         this._messageAlarmFirst = services_1.Res.fireAlarmStart(this._roomName, this.info.customName);
@@ -41,15 +57,21 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
         services_1.PollyService.preloadTTS(this._messageAlarm);
         services_1.PollyService.preloadTTS(this._messageAlarmEnd);
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Smoke Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
             case 'battery':
                 this._battery = state.val;
+                this.checkForBatteryChange();
                 this.persistBatteryDevice();
                 if (this._battery < 20) {
-                    this.log(models_1.LogLevel.Warn, `Das Zigbee Gerät hat unter 20% Batterie.`);
+                    this.log(models_1.LogLevel.Warn, 'Das Zigbee Gerät hat unter 20% Batterie.');
                 }
                 break;
             case 'smoke':
@@ -65,6 +87,7 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
                 break;
         }
     }
+    /** @inheritDoc */
     stopAlarm(quiet = false) {
         if (this.iAlarmTimeout) {
             clearInterval(this.iAlarmTimeout);
@@ -80,6 +103,24 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
             services_1.SonosService.speakOnAll(message);
         });
     }
+    /** @inheritdoc */
+    persistBatteryDevice() {
+        var _a;
+        const now = services_1.Utils.nowMS();
+        if (this._lastBatteryPersist + 60000 > now) {
+            return;
+        }
+        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
+        this._lastBatteryPersist = now;
+    }
+    /** @inheritDoc */
+    dispose() {
+        if (this.iAlarmTimeout) {
+            clearInterval(this.iAlarmTimeout);
+            this.iAlarmTimeout = undefined;
+        }
+        super.dispose();
+    }
     startAlarm() {
         if (this.iAlarmTimeout !== undefined) {
             clearInterval(this.iAlarmTimeout);
@@ -102,21 +143,18 @@ class ZigbeeHeimanSmoke extends BaseDevices_1.ZigbeeDevice {
             services_1.RoomService.setAllShutterOfFloor(new models_1.FloorSetAllShuttersCommand(models_1.CommandSource.Force, 100, undefined, 'Fire alarm'));
         });
     }
-    persistBatteryDevice() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastBatteryPersist + 60000 > now) {
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    checkForBatteryChange() {
+        const newLevel = this.battery;
+        if (newLevel == -1 || newLevel == this._lastBatteryLevel) {
             return;
         }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistBatteryDevice(this);
-        this._lastBatteryPersist = now;
-    }
-    dispose() {
-        if (this.iAlarmTimeout) {
-            clearInterval(this.iAlarmTimeout);
-            this.iAlarmTimeout = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeHeimanSmoke = ZigbeeHeimanSmoke;

package/lib/server/devices/zigbee/zigbeeIkeaShutter.d.ts

@@ -3,6 +3,7 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIkeaShutter extends ZigbeeShutter {
     private readonly _positionStateId;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(pPosition: number): void;
 }

package/lib/server/devices/zigbee/zigbeeIkeaShutter.js

@@ -10,11 +10,12 @@ class ZigbeeIkeaShutter extends BaseDevices_1.ZigbeeShutter {
         this._positionStateId = `${this.info.fullID}.position`;
         // this.presenceStateID = `${this.info.fullID}.1.${HmIpPraezenz.PRESENCE_DETECTION}`;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
             case 'position':
                 this.log(models_1.LogLevel.Trace, `Shutter Update for ${this.info.customName} to "${state.val}"`);
-                this.currentLevel = state.val;
+                this.setCurrentLevel(state.val, initial);
                 break;
         }
         super.update(idSplit, state, initial, true);

package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.d.ts

@@ -1,6 +1,8 @@
 import { ZigbeeActuator } from './BaseDevices';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIkeaSteckdose extends ZigbeeActuator {
+    protected readonly _actuatorOnStateIdState: string;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
 }

package/lib/server/devices/zigbee/zigbeeIkeaSteckdose.js

@@ -6,8 +6,10 @@ const BaseDevices_1 = require("./BaseDevices");
 const models_1 = require("../../../models");
 class ZigbeeIkeaSteckdose extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo) {
-        super(pInfo, deviceType_1.DeviceType.ZigbeeIkeaSteckdose, `${pInfo.fullID}.state`);
+        super(pInfo, deviceType_1.DeviceType.ZigbeeIkeaSteckdose);
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `Stecker Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);

package/lib/server/devices/zigbee/zigbeeIlluActuator.d.ts

@@ -2,7 +2,6 @@ import { ZigbeeActuator } from './BaseDevices';
 import { DeviceType } from '../deviceType';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluActuator extends ZigbeeActuator {
+    protected readonly _actuatorOnStateIdState: string;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
-    get isActuatorOn(): boolean;
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
 }

package/lib/server/devices/zigbee/zigbeeIlluActuator.js

@@ -2,20 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluActuator = void 0;
 const BaseDevices_1 = require("./BaseDevices");
-const models_1 = require("../../../models");
 const deviceType_1 = require("../deviceType");
 class ZigbeeIlluActuator extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeIlluActuator) {
-        super(pInfo, deviceType, `${pInfo.fullID}.state`);
-    }
-    get isActuatorOn() {
-        return this.actuatorOn;
-    }
-    update(idSplit, state, initial = false, handledByChildObject = false) {
-        if (!handledByChildObject) {
-            this.log(models_1.LogLevel.DeepTrace, `Aktuator Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
-        }
-        super.update(idSplit, state, initial, true);
+        super(pInfo, deviceType);
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
     }
 }
 exports.ZigbeeIlluActuator = ZigbeeIlluActuator;

package/lib/server/devices/zigbee/zigbeeIlluDimmer.d.ts

@@ -5,7 +5,7 @@ export declare class ZigbeeIlluDimmer extends ZigbeeDimmer {
     protected _stateNameState: string;
     protected _stateNameTransitionTime: string;
     protected _stateIdBrightness: string;
-    protected _stateIdState: string;
+    protected _actuatorOnStateIdState: string;
     protected _stateIdTransitionTime: string;
     constructor(pInfo: IoBrokerDeviceInfo);
 }

package/lib/server/devices/zigbee/zigbeeIlluDimmer.js

@@ -9,7 +9,7 @@ class ZigbeeIlluDimmer extends BaseDevices_1.ZigbeeDimmer {
         this._stateNameBrightness = 'brightness';
         this._stateNameState = 'state';
         this._stateNameTransitionTime = 'transition_time';
-        this._stateIdState = `${this.info.fullID}.state`;
+        this._actuatorOnStateIdState = `${this.info.fullID}.state`;
         this._stateIdBrightness = `${this.info.fullID}.brightness`;
         this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }

package/lib/server/devices/zigbee/zigbeeIlluLampe.d.ts

@@ -1,14 +1,7 @@
-import { ZigbeeIlluActuator } from './zigbeeIlluActuator';
-import { LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../models';
 import { iLamp } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
-export declare class ZigbeeIlluLampe extends ZigbeeIlluActuator implements iLamp {
+import { ZigbeeLamp } from './BaseDevices';
+export declare class ZigbeeIlluLampe extends ZigbeeLamp implements iLamp {
+    protected readonly _actuatorOnStateIdState: string;
     constructor(pInfo: IoBrokerDeviceInfo);
-    get lightOn(): boolean;
-    update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    /** @inheritdoc */
-    setLight(c: LampSetLightCommand): void;
-    toggleLight(c: LampToggleLightCommand): boolean;
-    setTimeBased(c: LampSetTimeBasedCommand): void;
-    persist(): void;
 }

package/lib/server/devices/zigbee/zigbeeIlluLampe.js

@@ -2,40 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeIlluLampe = void 0;
 const deviceType_1 = require("../deviceType");
-const zigbeeIlluActuator_1 = require("./zigbeeIlluActuator");
-const models_1 = require("../../../models");
-const services_1 = require("../../services");
-const DeviceCapability_1 = require("../DeviceCapability");
-const sharedFunctions_1 = require("../sharedFunctions");
-class ZigbeeIlluLampe extends zigbeeIlluActuator_1.ZigbeeIlluActuator {
+const BaseDevices_1 = require("./BaseDevices");
+class ZigbeeIlluLampe extends BaseDevices_1.ZigbeeLamp {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
-    }
-    get lightOn() {
-        return super.isActuatorOn;
-    }
-    update(idSplit, state, initial = false) {
-        super.update(idSplit, state, initial, true);
-        switch (idSplit[3]) {
-            case 'state':
-                this.log(models_1.LogLevel.Trace, `Lampen Update für ${this.info.customName} auf ${state.val}`);
-                break;
-        }
-    }
-    /** @inheritdoc */
-    setLight(c) {
-        super.setActuator(c);
-    }
-    toggleLight(c) {
-        return sharedFunctions_1.LampUtils.toggleLight(this, c);
-    }
-    setTimeBased(c) {
-        sharedFunctions_1.LampUtils.setTimeBased(this, c);
-    }
-    persist() {
-        var _a;
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
+        this._actuatorOnStateIdState = `${pInfo.fullID}.${this._stateNameState}`;
     }
 }
 exports.ZigbeeIlluLampe = ZigbeeIlluLampe;

package/lib/server/devices/zigbee/zigbeeIlluLedRGBCCT.d.ts

@@ -4,7 +4,7 @@ export declare class ZigbeeIlluLedRGBCCT extends ZigbeeLedRGBCCT {
     protected readonly _stateIdBrightness: string;
     protected readonly _stateIdColor: string;
     protected readonly _stateIdColorTemp: string;
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     protected readonly _stateIdTransitionTime: string;
     protected readonly _stateNameBrightness: string;
     protected readonly _stateNameState: string;

package/lib/server/devices/zigbee/zigbeeIlluLedRGBCCT.js

@@ -14,7 +14,7 @@ class ZigbeeIlluLedRGBCCT extends BaseDevices_1.ZigbeeLedRGBCCT {
         this._stateIdBrightness = `${this.info.fullID}.brightness`;
         this._stateIdColor = `${this.info.fullID}.color`;
         this._stateIdColorTemp = `${this.info.fullID}.colortemp`;
-        this._stateIdState = `${this.info.fullID}.state`;
+        this._actuatorOnStateIdState = `${this.info.fullID}.state`;
         this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
 }

package/lib/server/devices/zigbee/zigbeeIlluShutter.d.ts

@@ -7,6 +7,7 @@ export declare class ZigbeeIlluShutter extends ZigbeeShutter {
     private _movementStartPos;
     private _iMovementTimeout;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     protected moveToPosition(targetPosition: number): void;
     private changeMovementState;

package/lib/server/devices/zigbee/zigbeeIlluShutter.js

@@ -19,6 +19,7 @@ class ZigbeeIlluShutter extends BaseDevices_1.ZigbeeShutter {
         this._movementStartPos = -1;
         this._movementStateId = `${this.info.fullID}.position`;
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         switch (idSplit[3]) {
             case 'position':
@@ -88,7 +89,7 @@ class ZigbeeIlluShutter extends BaseDevices_1.ZigbeeShutter {
         const oldState = this._movementState;
         if (this._movementStartPos === 0 && oldState === MovementState.Up && this._setLevel === 100) {
             this.log(models_1.LogLevel.Debug, `New Time-Until-Top measurement for ${this.info.customName}: ${timePassed}ms`);
-            this.currentLevel = this._setLevel;
+            this.setCurrentLevel(this._setLevel);
             this._shutterCalibrationData.counterUp++;
             this._shutterCalibrationData.averageUp +=
                 (timePassed - this._shutterCalibrationData.averageUp) / this._shutterCalibrationData.counterUp;
@@ -98,7 +99,7 @@ class ZigbeeIlluShutter extends BaseDevices_1.ZigbeeShutter {
         }
         if (this._movementStartPos === 100 && oldState === MovementState.Down && this._setLevel === 0) {
             this.log(models_1.LogLevel.Debug, `New Time-Until-Bottom measurement for ${this.info.customName}: ${timePassed}ms`);
-            this.currentLevel = this._setLevel;
+            this.setCurrentLevel(this._setLevel);
             this._shutterCalibrationData.counterDown++;
             this._shutterCalibrationData.averageDown +=
                 (timePassed - this._shutterCalibrationData.averageDown) / this._shutterCalibrationData.counterDown;
@@ -110,10 +111,10 @@ class ZigbeeIlluShutter extends BaseDevices_1.ZigbeeShutter {
             return;
         }
         if (oldState === MovementState.Down) {
-            this.currentLevel = Math.min(this._currentLevel - Math.round((timePassed * 100) / this.getAverageDown()), 0);
+            this.setCurrentLevel(Math.min(this._currentLevel - Math.round((timePassed * 100) / this.getAverageDown()), 0));
         }
         else if (oldState === MovementState.Up) {
-            this.currentLevel = Math.max(this._currentLevel + Math.round((timePassed * 100) / this.getAverageUp()), 100);
+            this.setCurrentLevel(Math.max(this._currentLevel + Math.round((timePassed * 100) / this.getAverageUp()), 100));
         }
     }
 }

package/lib/server/devices/zigbee/zigbeeInnr142C.d.ts

@@ -4,7 +4,7 @@ export declare class ZigbeeInnr142C extends ZigbeeLedRGBCCT {
     protected readonly _stateIdBrightness: string;
     protected readonly _stateIdColor: string;
     protected readonly _stateIdColorTemp: string;
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     protected readonly _stateIdTransitionTime: string;
     protected readonly _stateNameBrightness: string;
     protected readonly _stateNameState: string;

package/lib/server/devices/zigbee/zigbeeInnr142C.js

@@ -15,7 +15,7 @@ class ZigbeeInnr142C extends BaseDevices_1.ZigbeeLedRGBCCT {
         this._stateIdBrightness = `${this.info.fullID}.brightness`;
         this._stateIdColor = `${this.info.fullID}.color`;
         this._stateIdColorTemp = `${this.info.fullID}.colortemp`;
-        this._stateIdState = `${this.info.fullID}.state`;
+        this._actuatorOnStateIdState = `${this.info.fullID}.state`;
         this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
 }

package/lib/server/devices/zigbee/zigbeeLinkindLedRgbCct.d.ts

@@ -4,7 +4,7 @@ export declare class ZigbeeLinkindLedRgbCct extends ZigbeeLedRGBCCT {
     protected readonly _stateIdBrightness: string;
     protected readonly _stateIdColor: string;
     protected readonly _stateIdColorTemp: string;
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     protected readonly _stateIdTransitionTime: string;
     protected readonly _stateNameBrightness: string;
     protected readonly _stateNameState: string;

package/lib/server/devices/zigbee/zigbeeLinkindLedRgbCct.js

@@ -14,7 +14,7 @@ class ZigbeeLinkindLedRgbCct extends BaseDevices_1.ZigbeeLedRGBCCT {
         this._stateIdBrightness = `${this.info.fullID}.brightness`;
         this._stateIdColor = `${this.info.fullID}.color`;
         this._stateIdColorTemp = `${this.info.fullID}.colortemp`;
-        this._stateIdState = `${this.info.fullID}.state`;
+        this._actuatorOnStateIdState = `${this.info.fullID}.state`;
         this._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
 }