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

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

@@ -3,50 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeDimmer = void 0;
 const models_1 = require("../../../../models");
 const services_1 = require("../../../services");
-const index_1 = require("./index");
 const DeviceCapability_1 = require("../../DeviceCapability");
-const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
 const sharedFunctions_1 = require("../../sharedFunctions");
-class ZigbeeDimmer extends index_1.ZigbeeDevice {
+const zigbeeLamp_1 = require("./zigbeeLamp");
+class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
-        this.queuedValue = null;
+        /** @inheritDoc */
         this.settings = new models_1.DimmerSettings();
-        this.targetAutomaticState = false;
-        this._lastPersist = 0;
         this._brightness = 0;
-        this._lightOn = false;
         this._transitionTime = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
-        this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
+    /** @inheritDoc */
     get brightness() {
         return this._brightness;
     }
-    get lightOn() {
-        return this._lightOn;
-    }
-    get transitionTime() {
-        return this._transitionTime;
-    }
-    get actuatorOn() {
-        return this.lightOn;
-    }
-    restoreTargetAutomaticValue(c) {
-        this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState, 'Restore targetAutomaticState due to BlockAutomaticHandler'));
-    }
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.queuedValue = null;
         this.log(models_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
-            case this._stateNameState:
-                this.log(models_1.LogLevel.Trace, `Dimmer Update für ${this.info.customName} auf ${state.val}`);
-                this._lightOn = state.val;
-                this.persist();
-                break;
             case this._stateNameBrightness:
                 this.log(models_1.LogLevel.Trace, `Dimmer Helligkeit Update für ${this.info.customName} auf ${state.val}`);
                 this._brightness = state.val;
@@ -58,42 +36,45 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
                 break;
         }
     }
+    /** @inheritDoc */
     setTimeBased(c) {
         this.setLight(models_1.DimmerSetLightCommand.byTimeBased(this.settings, c));
     }
-    setActuator(c) {
-        this.setLight(new models_1.DimmerSetLightCommand(c, c.on, '', c.timeout));
-    }
-    toggleActuator(c) {
-        const setActuatorCommand = models_1.ActuatorSetStateCommand.byActuatorAndToggleCommand(this, c);
-        this.setActuator(setActuatorCommand);
-        return setActuatorCommand.on;
-    }
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setLight(c) {
         var _a;
-        if (this._stateIdState === '') {
-            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
+        if (this._actuatorOnStateIdState === '') {
+            this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
         }
         if (!this.ioConn) {
-            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Connection bekannt.');
             return;
         }
         const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, c);
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
+        if (c.isAutomaticAction) {
+            // Preserve the target state for the automatic handler, as
+            this.targetAutomaticState = c.on;
+        }
+        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
+            return;
+        }
         if (c.transitionTime > -1) {
             this.setState(this._stateIdTransitionTime, c.transitionTime);
         }
         if (c.on && c.brightness <= 0 && this.brightness < 10) {
             c.brightness = 10;
         }
-        if (c.timeout > -1 && !dontBlock) {
-            this.blockAutomationHandler.disableAutomatic(c.timeout, models_1.CollisionSolving.overrideIfGreater);
+        if (!dontBlock && c.disableAutomaticCommand !== null) {
+            if (c.disableAutomaticCommand === undefined && c.isForceAction) {
+                c.disableAutomaticCommand = models_1.BlockAutomaticCommand.fromDeviceSettings(c, this.settings);
+            }
+            if (c.disableAutomaticCommand) {
+                this.blockAutomationHandler.disableAutomatic(c.disableAutomaticCommand);
+            }
         }
         if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !c.on) {
             // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
@@ -108,27 +89,11 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
         }
         this.setBrightnessState(this.settings.turnOnThreshhold, () => {
             services_1.Utils.guardedTimeout(() => {
-                this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
+                this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName} to ${c.brightness} for command: ${c.logMessage}`);
                 this.setBrightnessState(c.brightness);
             }, 1000, this);
         });
     }
-    persist() {
-        var _a;
-        const now = services_1.Utils.nowMS();
-        if (this._lastPersist + 1000 > now) {
-            return;
-        }
-        (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistActuator(this);
-        this._lastPersist = now;
-    }
-    toggleLight(c) {
-        return sharedFunctions_1.LampUtils.toggleLight(this, c);
-    }
-    writeActuatorStateToDevice(c) {
-        this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
-        this.setState(this._stateIdState, c.stateValue);
-    }
     setBrightnessState(brightness, onSuccess) {
         this.setState(this._stateIdBrightness, Math.max(0, Math.min(brightness, 100)), onSuccess);
     }

package/lib/server/devices/zigbee/BaseDevices/zigbeeHeater.d.ts

@@ -1,17 +1,15 @@
-/// <reference types="node" />
 import { ZigbeeDevice } from './zigbeeDevice';
 import { iBatteryDevice, iHeater } from '../../baseDeviceInterfaces';
-import { HeaterSettings } from '../../../../models';
+import { BatteryLevelChangeAction, HeaterSettings } from '../../../../models';
 import { DeviceType } from '../../deviceType';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { PIDController } from '../../../../liquid-pid';
 export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatteryDevice {
-    protected _battery: number;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
+    /** @inheritDoc */
     readonly persistHeaterInterval: NodeJS.Timeout;
+    /** @inheritDoc */
     settings: HeaterSettings;
-    get battery(): number;
+    protected _battery: number;
     protected _iAutomaticInterval: NodeJS.Timeout | undefined;
     protected _initialSeasonCheckDone: boolean;
     protected _level: number;
@@ -19,28 +17,50 @@ export declare class ZigbeeHeater extends ZigbeeDevice implements iHeater, iBatt
     protected _temperatur: number;
     protected _desiredTemperatur: number;
     protected _pidController: PIDController;
-    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
     protected _seasonTurnOff: boolean;
+    protected _roomTemperature: number;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
+    constructor(pInfo: IoBrokerDeviceInfo, pType: DeviceType);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
     get seasonTurnOff(): boolean;
+    /** @inheritDoc */
     set seasonTurnOff(value: boolean);
+    /** @inheritDoc */
     get desiredTemperature(): number;
+    /** @inheritDoc */
     set desiredTemperature(val: number);
-    protected _humidity: number;
-    get humidity(): number;
     get sLevel(): string;
+    /** @inheritDoc */
     get iLevel(): number;
     get sTemperatur(): string;
+    /** @inheritDoc */
     get iTemperature(): number;
-    protected _roomTemperature: number;
+    /** @inheritDoc */
     get roomTemperature(): number;
-    set roomTemperatur(val: number);
+    protected set roomTemperatur(val: number);
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     checkAutomaticChange(): void;
-    stopAutomaticCheck(): void;
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur: number): void;
     persistHeater(): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverride?: boolean): void;
-    protected getNextPidLevel(): number;
-    private checkSeasonTurnOff;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    /** @inheritDoc */
     dispose(): void;
+    protected getNextPidLevel(): number;
+    private checkSeasonTurnOff;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }

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

@@ -8,20 +8,15 @@ const services_1 = require("../../../services");
 const DeviceCapability_1 = require("../../DeviceCapability");
 const liquid_pid_1 = require("../../../../liquid-pid");
 class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
-    get lastBatteryPersist() {
-        return this._lastBatteryPersist;
-    }
-    get battery() {
-        return this._battery;
-    }
     constructor(pInfo, pType) {
         super(pInfo, pType);
-        this._battery = -99;
-        this._lastBatteryPersist = 0;
+        /** @inheritDoc */
         this.persistHeaterInterval = services_1.Utils.guardedInterval(() => {
             this.persistHeater();
         }, 5 * 60 * 1000, this, false);
+        /** @inheritDoc */
         this.settings = new models_1.HeaterSettings();
+        this._battery = -99;
         this._initialSeasonCheckDone = false;
         this._level = 0;
         this._setPointTemperaturID = '';
@@ -38,8 +33,10 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             Kd: 9, // PID: Kd in 1/1000
         });
         this._seasonTurnOff = false;
-        this._humidity = 0;
         this._roomTemperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        this._lastBatteryPersist = 0;
+        this._lastBatteryLevel = -1;
+        this._batteryLevelCallbacks = [];
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.heater);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.batteryDriven);
         this._iAutomaticInterval = services_1.Utils.guardedInterval(this.checkAutomaticChange, 300000, this); // Alle 5 Minuten prüfen
@@ -47,15 +44,27 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.checkSeasonTurnOff();
         }, 0, 2, 0));
     }
+    /** @inheritDoc */
+    get lastBatteryPersist() {
+        return this._lastBatteryPersist;
+    }
+    /** @inheritDoc */
+    get battery() {
+        return this._battery;
+    }
+    /** @inheritDoc */
     get seasonTurnOff() {
         return this._seasonTurnOff;
     }
+    /** @inheritDoc */
     set seasonTurnOff(value) {
         this._seasonTurnOff = value;
     }
+    /** @inheritDoc */
     get desiredTemperature() {
         return this._desiredTemperatur;
     }
+    /** @inheritDoc */
     set desiredTemperature(val) {
         this._desiredTemperatur = val;
         this.setState(this._setPointTemperaturID, val, () => {
@@ -64,18 +73,17 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.log(models_1.LogLevel.Error, `Temperaturänderung ergab Fehler ${err}.`);
         });
     }
-    get humidity() {
-        return this._humidity;
-    }
     get sLevel() {
         return `${this._level * 100}%`;
     }
+    /** @inheritDoc */
     get iLevel() {
         return this._level;
     }
     get sTemperatur() {
         return `${this.iTemperature}°C`;
     }
+    /** @inheritDoc */
     get iTemperature() {
         if (this.settings.useOwnTemperatur) {
             return this._temperatur;
@@ -84,12 +92,18 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             return this._roomTemperature;
         }
     }
+    /** @inheritDoc */
     get roomTemperature() {
         return this._roomTemperature;
     }
     set roomTemperatur(val) {
         this._roomTemperature = val;
     }
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback) {
+        this._batteryLevelCallbacks.push(pCallback);
+    }
+    /** @inheritDoc */
     checkAutomaticChange() {
         var _a;
         if (!this._initialSeasonCheckDone) {
@@ -113,12 +127,7 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
             this.desiredTemperature = targetTemperature;
         }
     }
-    stopAutomaticCheck() {
-        if (this._iAutomaticInterval !== undefined) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
-        }
-    }
+    /** @inheritDoc */
     onTemperaturChange(newTemperatur) {
         this.roomTemperatur = newTemperatur;
     }
@@ -126,18 +135,41 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistHeater(this);
     }
+    /** @inheritDoc */
     update(idSplit, state, initial = false, pOverride = false) {
         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;
         }
         super.update(idSplit, state, initial, pOverride);
     }
+    /** @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.persistHeaterInterval) {
+            clearInterval(this.persistHeaterInterval);
+        }
+        if (this._iAutomaticInterval) {
+            clearInterval(this._iAutomaticInterval);
+            this._iAutomaticInterval = undefined;
+        }
+        super.dispose();
+    }
     getNextPidLevel() {
         if (this.seasonTurnOff || this._roomTemperature < 0) {
             return 0;
@@ -155,24 +187,18 @@ class ZigbeeHeater extends zigbeeDevice_1.ZigbeeDevice {
         }
         this._initialSeasonCheckDone = true;
     }
-    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.persistHeaterInterval) {
-            clearInterval(this.persistHeaterInterval);
-        }
-        if (this._iAutomaticInterval) {
-            clearInterval(this._iAutomaticInterval);
-            this._iAutomaticInterval = undefined;
+        for (const cb of this._batteryLevelCallbacks) {
+            cb(new models_1.BatteryLevelChangeAction(this));
         }
-        super.dispose();
+        this._lastBatteryLevel = newLevel;
     }
 }
 exports.ZigbeeHeater = ZigbeeHeater;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLamp.d.ts

@@ -0,0 +1,16 @@
+import { ZigbeeActuator } from './ZigbeeActuator';
+import { iLamp, iTemporaryDisableAutomatic } from '../../baseDeviceInterfaces';
+import { LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand } from '../../../../models';
+import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
+import { DeviceType } from '../../deviceType';
+export declare abstract class ZigbeeLamp extends ZigbeeActuator implements iLamp, iTemporaryDisableAutomatic {
+    constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    /** @inheritDoc */
+    update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
+    /** @inheritDoc */
+    setTimeBased(c: LampSetTimeBasedCommand): void;
+    /** @inheritdoc */
+    setLight(c: LampSetLightCommand): void;
+    /** @inheritDoc */
+    toggleLight(c: LampToggleLightCommand): boolean;
+}

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ZigbeeLamp = void 0;
+const ZigbeeActuator_1 = require("./ZigbeeActuator");
+const models_1 = require("../../../../models");
+const sharedFunctions_1 = require("../../sharedFunctions");
+const DeviceCapability_1 = require("../../DeviceCapability");
+class ZigbeeLamp extends ZigbeeActuator_1.ZigbeeActuator {
+    constructor(pInfo, deviceType) {
+        super(pInfo, deviceType);
+        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
+    }
+    /** @inheritDoc */
+    update(idSplit, state, initial = false, handledByChildObject = false) {
+        if (!handledByChildObject) {
+            this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        }
+        this.queuedValue = null;
+        this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        super.update(idSplit, state, initial, true);
+    }
+    /** @inheritDoc */
+    setTimeBased(c) {
+        sharedFunctions_1.LampUtils.setTimeBased(this, c);
+    }
+    /** @inheritdoc */
+    setLight(c) {
+        super.setActuator(c);
+    }
+    /** @inheritDoc */
+    toggleLight(c) {
+        return sharedFunctions_1.LampUtils.toggleLight(this, c);
+    }
+}
+exports.ZigbeeLamp = ZigbeeLamp;

package/lib/server/devices/zigbee/BaseDevices/zigbeeLedRGBCCT.d.ts

@@ -4,7 +4,7 @@ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iLedRgbCct } from '../../baseDeviceInterfaces/iLedRgbCct';
 import { ZigbeeDimmer } from './zigbeeDimmer';
 export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iLedRgbCct {
-    static DEFAULT_COLOR_WARM: string;
+    /** @inheritDoc */
     settings: LedSettings;
     protected abstract readonly _stateIdColor: string;
     protected abstract readonly _stateIdColorTemp: string;
@@ -12,17 +12,17 @@ export declare abstract class ZigbeeLedRGBCCT extends ZigbeeDimmer implements iL
     protected abstract readonly _stateNameColorTemp: string;
     protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     protected _color: string;
+    /** @inheritDoc */
     get color(): string;
     protected _colortemp: number;
+    /** @inheritDoc */
     get colortemp(): number;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;
+    /** @inheritDoc */
     setActuator(c: ActuatorSetStateCommand): void;
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setLight(c: LedSetLightCommand): void;
 }

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

@@ -8,19 +8,23 @@ const services_1 = require("../../../services");
 class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
+        /** @inheritDoc */
         this.settings = new models_1.LedSettings();
         this._color = '#fcba32';
         this._colortemp = 500;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.ledLamp);
         // this.effectID = `${this.info.fullID}.effect`;
     }
+    /** @inheritDoc */
     get color() {
         return this._color;
     }
+    /** @inheritDoc */
     get colortemp() {
         return this._colortemp;
     }
     // private effectID: string = '';
+    /** @inheritDoc */
     update(idSplit, state, initial = false) {
         this.log(models_1.LogLevel.DeepTrace, `LED Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         super.update(idSplit, state, initial);
@@ -35,39 +39,35 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
                 break;
         }
     }
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setTimeBased(c) {
         this.setLight(models_1.LedSetLightCommand.byTimeBased(this.settings, c));
     }
+    /** @inheritDoc */
     setActuator(c) {
-        this.setLight(new models_1.LedSetLightCommand(c, c.on, '', c.timeout));
+        this.setLight(new models_1.LedSetLightCommand(c, c.on, '', c.disableAutomaticCommand));
     }
-    /**
-     * @inheritDoc
-     */
+    /** @inheritDoc */
     setLight(c) {
-        if (this._stateIdState === '') {
-            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
+        if (this._actuatorOnStateIdState === '') {
+            this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
         }
         if (!this.ioConn) {
-            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
+            this.log(models_1.LogLevel.Error, 'Keine Connection bekannt.');
             return;
         }
         if (c.on && c.brightness === -1 && this.brightness < 10) {
             c.brightness = 10;
         }
+        super.setLight(c);
         const formattedColor = services_1.Utils.formatHex(c.color);
-        if (formattedColor !== null && c.on) {
+        if (formattedColor !== null && c.on && (c.color !== this.color || c.isForceAction)) {
             this.setState(this._stateIdColor, formattedColor);
         }
-        if (c.colorTemp > -1 && c.on) {
+        if (c.colorTemp > -1 && c.on && (c.colorTemp !== this.colortemp || c.isForceAction)) {
             this.setState(this._stateIdColorTemp, c.colorTemp);
         }
-        super.setLight(c);
     }
 }
 exports.ZigbeeLedRGBCCT = ZigbeeLedRGBCCT;
-ZigbeeLedRGBCCT.DEFAULT_COLOR_WARM = '#f2b200';

package/lib/server/devices/zigbee/BaseDevices/zigbeeMagnetContact.d.ts

@@ -1,25 +1,44 @@
 import { DeviceType } from '../../deviceType';
+import { BatteryLevelChangeAction } from '../../../../models';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { MagnetPosition } from '../../models';
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
-import { iBatteryDevice } from '../../baseDeviceInterfaces';
-export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice {
-    protected _battery: number;
-    private _lastBatteryPersist;
-    get lastBatteryPersist(): number;
-    get battery(): number;
+import { iBatteryDevice, iMagnetSensor } from '../../baseDeviceInterfaces';
+export declare class ZigbeeMagnetContact extends ZigbeeDevice implements iBatteryDevice, iMagnetSensor {
+    /** @inheritDoc */
     position: MagnetPosition;
+    /** @inheritDoc */
     telegramOnOpen: boolean;
+    /** @inheritDoc */
     speakOnOpen: boolean;
+    protected _battery: number;
+    private _lastBatteryPersist;
+    private _lastBatteryLevel;
+    private _batteryLevelCallbacks;
     private _closedCallback;
     private _openCallback;
     private _iOpenTimeout;
     private minutesOpen;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
+    /** @inheritDoc */
+    get lastBatteryPersist(): number;
+    /** @inheritDoc */
+    get battery(): number;
+    /** @inheritDoc */
     addOpenCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
     addClosedCallback(pCallback: (pValue: boolean) => void): void;
+    /** @inheritDoc */
+    addBatteryLevelCallback(pCallback: (action: BatteryLevelChangeAction) => void): void;
+    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, pOverrride?: boolean): void;
-    protected updatePosition(pValue: MagnetPosition): void;
+    /** @inheritDoc */
     dispose(): void;
+    /** @inheritDoc */
     persistBatteryDevice(): void;
+    protected updatePosition(pValue: MagnetPosition): void;
+    /**
+     * Checks whether the battery level did change and if so fires the callbacks
+     */
+    private checkForBatteryChange;
 }