hoffmation-base 3.0.0-alpha.35 → 3.0.0-alpha.37

package/lib/server/devices/baseDeviceInterfaces/iLamp.d.ts

@@ -6,10 +6,6 @@ import { iActuator } from './iActuator';
  * For devices with {@link DeviceCapability.lamp} capability.
  */
 export interface iLamp extends iActuator {
-    /**
-     * The state value of the device
-     */
-    readonly lightOn: boolean;
     /**
      * Changes the state of the lamp based on the time
      * @param command - The command to execute

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

@@ -17,28 +17,9 @@ class LightGroup extends base_group_1.BaseGroup {
         this.deviceCluster.deviceMap.set(device_cluster_type_1.DeviceClusterType.WLED, new device_list_1.DeviceList(wledIds));
     }
     anyLightsOn() {
-        let i;
-        for (i = 0; i < this.getLights().length; i++) {
-            if (this.getLights()[i].lightOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getLED().length; i++) {
-            if (this.getLED()[i].actuatorOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getOutlets().length; i++) {
-            if (this.getOutlets()[i].actuatorOn) {
-                return true;
-            }
-        }
-        for (i = 0; i < this.getWled().length; i++) {
-            if (this.getWled()[i].actuatorOn) {
-                return true;
-            }
-        }
-        return false;
+        return (this.getAllAsActuator().find((a) => {
+            return a.actuatorOn;
+        }) !== undefined);
     }
     getLights() {
         return this.deviceCluster.getDevicesByType(device_cluster_type_1.DeviceClusterType.Lamps);

package/lib/server/devices/hmIPDevices/hmIpLampe.d.ts

@@ -5,7 +5,7 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { BlockAutomaticHandler } from '../../services/blockAutomaticHandler';
 export declare class HmIpLampe extends HmIPDevice implements iLamp, iTemporaryDisableAutomatic {
     /** @inheritDoc */
-    lightOn: boolean;
+    private _actuatorOn;
     /** @inheritDoc */
     settings: ActuatorSettings;
     private lightOnSwitchID;

package/lib/server/devices/hmIPDevices/hmIpLampe.js

@@ -12,7 +12,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.HmIpLampe);
         /** @inheritDoc */
-        this.lightOn = false;
+        this._actuatorOn = false;
         /** @inheritDoc */
         this.settings = new models_1.ActuatorSettings();
         this.lightOnSwitchID = '';
@@ -26,7 +26,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
     get actuatorOn() {
-        return this.lightOn;
+        return this._actuatorOn;
     }
     restoreTargetAutomaticValue(c) {
         this.setLight(new models_1.LampSetLightCommand(c, this.targetAutomaticState));
@@ -39,7 +39,7 @@ class HmIpLampe extends hmIpDevice_1.HmIPDevice {
         switch (idSplit[3]) {
             case '1':
                 if (idSplit[4] === 'STATE') {
-                    this.lightOn = state.val;
+                    this._actuatorOn = state.val;
                     this.persist();
                 }
                 break;

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

@@ -42,7 +42,7 @@ class LampUtils {
     }
     static toggleLight(device, c) {
         var _a;
-        const newVal = device.queuedValue !== null ? !device.queuedValue : !device.lightOn;
+        const newVal = device.queuedValue !== null ? !device.queuedValue : !device.actuatorOn;
         if (newVal && c.time === undefined && c.calculateTime && device.room !== undefined) {
             c.time = services_1.TimeCallbackService.dayType((_a = device.room) === null || _a === void 0 ? void 0 : _a.settings.lampOffset);
         }

package/lib/server/devices/wledDevice.d.ts

@@ -23,8 +23,6 @@ export declare class WledDevice extends IoBrokerBaseDevice implements iDimmableL
     /** @inheritDoc */
     get actuatorOn(): boolean;
     /** @inheritDoc */
-    get lightOn(): boolean;
-    /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, _pOverride?: boolean): void;
     /** @inheritDoc */

package/lib/server/devices/wledDevice.js

@@ -33,10 +33,6 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         return this.on;
     }
     /** @inheritDoc */
-    get lightOn() {
-        return this.on;
-    }
-    /** @inheritDoc */
     restoreTargetAutomaticValue(c) {
         this.setLight(new models_1.WledSetLightCommand(c, this.targetAutomaticState));
     }
@@ -69,13 +65,13 @@ class WledDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(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;
+        }
         this.log(models_1.LogLevel.Debug, c.logMessage);
         if (c.on && c.brightness !== -1 && this.brightness < 10) {
             c.brightness = 10;

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

@@ -5,20 +5,21 @@ import { iActuator } from '../../baseDeviceInterfaces';
 import { ZigbeeDevice } from './zigbeeDevice';
 import { BlockAutomaticHandler } from '../../../services/blockAutomaticHandler';
 export declare abstract class ZigbeeActuator extends ZigbeeDevice implements iActuator {
-    private _actuatorOn;
     /** @inheritDoc */
     readonly blockAutomationHandler: BlockAutomaticHandler;
     /** @inheritDoc */
     targetAutomaticState: boolean;
-    protected _lastPersist: number;
     /** @inheritDoc */
     settings: ActuatorSettings;
-    protected abstract readonly _stateIdState: string;
     /** @inheritDoc */
     queuedValue: boolean | null;
+    protected _lastPersist: number;
+    protected abstract readonly _actuatorOnStateIdState: string;
+    protected readonly _stateNameState: string;
+    private _actuatorOn;
+    constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
     /** @inheritDoc */
     get actuatorOn(): boolean;
-    constructor(pInfo: IoBrokerDeviceInfo, type: DeviceType);
     /** @inheritDoc */
     restoreTargetAutomaticValue(c: RestoreTargetAutomaticValueCommand): void;
     /** @inheritDoc */

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

@@ -8,25 +8,26 @@ const DeviceCapability_1 = require("../../DeviceCapability");
 const blockAutomaticHandler_1 = require("../../../services/blockAutomaticHandler");
 const sharedFunctions_1 = require("../../sharedFunctions");
 class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
-    /** @inheritDoc */
-    get actuatorOn() {
-        return this._actuatorOn;
-    }
     constructor(pInfo, type) {
         super(pInfo, type);
-        this._actuatorOn = false;
         /** @inheritDoc */
         this.targetAutomaticState = false;
-        this._lastPersist = 0;
         /** @inheritDoc */
         this.settings = new models_1.ActuatorSettings();
         /** @inheritDoc */
         this.queuedValue = null;
+        this._lastPersist = 0;
+        this._stateNameState = 'state';
+        this._actuatorOn = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.actuator);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
         this.blockAutomationHandler = new blockAutomaticHandler_1.BlockAutomaticHandler(this.restoreTargetAutomaticValue.bind(this));
     }
     /** @inheritDoc */
+    get actuatorOn() {
+        return this._actuatorOn;
+    }
+    /** @inheritDoc */
     restoreTargetAutomaticValue(c) {
         this.setActuator(new models_1.ActuatorSetStateCommand(c, this.targetAutomaticState));
     }
@@ -38,7 +39,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
         this.queuedValue = null;
         super.update(idSplit, state, initial, true);
         switch (idSplit[3]) {
-            case 'state':
+            case this._stateNameState:
                 if (!handledByChildObject) {
                     this.log(models_1.LogLevel.Trace, `Aktor Update für ${this.info.customName} auf ${state.val}`);
                 }
@@ -49,7 +50,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     }
     /** @inheritDoc */
     setActuator(command) {
-        if (this._stateIdState === '') {
+        if (this._actuatorOnStateIdState === '') {
             this.log(models_1.LogLevel.Error, 'Keine Switch ID bekannt.');
             return;
         }
@@ -75,7 +76,7 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
     /** @inheritDoc */
     writeActuatorStateToDevice(c) {
         this.log(models_1.LogLevel.Debug, c.logMessage, services_1.LogDebugType.SetActuator);
-        this.setState(this._stateIdState, c.stateValue, undefined, (err) => {
+        this.setState(this._actuatorOnStateIdState, c.stateValue, undefined, (err) => {
             this.log(models_1.LogLevel.Error, `Lampe schalten ergab Fehler: ${err}`);
         });
     }

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

@@ -11,11 +11,11 @@ export declare abstract class ZigbeeDimmer extends ZigbeeLamp implements iDimmab
     protected abstract readonly _stateIdTransitionTime: string;
     protected abstract readonly _stateNameBrightness: string;
     protected abstract readonly _stateNameTransitionTime: string;
-    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     protected _brightness: number;
+    protected _transitionTime: number;
+    protected constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     /** @inheritDoc */
     get brightness(): number;
-    protected _transitionTime: number;
     /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean): void;
     /** @inheritDoc */

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

@@ -13,9 +13,7 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
         this.settings = new models_1.DimmerSettings();
         this._brightness = 0;
         this._transitionTime = 0;
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.dimmablelamp);
-        this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.blockAutomatic);
     }
     /** @inheritDoc */
     get brightness() {
@@ -45,7 +43,7 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
     /** @inheritDoc */
     setLight(c) {
         var _a;
-        if (this._stateIdState === '') {
+        if (this._actuatorOnStateIdState === '') {
             this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
         }
@@ -57,13 +55,13 @@ class ZigbeeDimmer extends zigbeeLamp_1.ZigbeeLamp {
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (sharedFunctions_1.LampUtils.canDimmerChangeBeSkipped(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);
         }

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

@@ -4,12 +4,8 @@ import { LampSetLightCommand, LampSetTimeBasedCommand, LampToggleLightCommand }
 import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { DeviceType } from '../../deviceType';
 export declare abstract class ZigbeeLamp extends ZigbeeActuator implements iLamp, iTemporaryDisableAutomatic {
-    protected abstract readonly _stateNameState: string;
-    protected _lightOn: boolean;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType: DeviceType);
     /** @inheritDoc */
-    get lightOn(): boolean;
-    /** @inheritDoc */
     update(idSplit: string[], state: ioBroker.State, initial?: boolean, handledByChildObject?: boolean): void;
     /** @inheritDoc */
     setTimeBased(c: LampSetTimeBasedCommand): void;

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

@@ -8,28 +8,16 @@ const DeviceCapability_1 = require("../../DeviceCapability");
 class ZigbeeLamp extends ZigbeeActuator_1.ZigbeeActuator {
     constructor(pInfo, deviceType) {
         super(pInfo, deviceType);
-        this._lightOn = false;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     /** @inheritDoc */
-    get lightOn() {
-        return this._lightOn;
-    }
-    /** @inheritDoc */
     update(idSplit, state, initial = false, handledByChildObject = false) {
         if (!handledByChildObject) {
-            this.log(models_1.LogLevel.DeepTrace, `Aktuator Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+            this.log(models_1.LogLevel.DeepTrace, `Lamp Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
         }
         this.queuedValue = null;
-        this.log(models_1.LogLevel.DeepTrace, `Dimmer Update: ID: ${idSplit.join('.')} JSON: ${JSON.stringify(state)}`);
+        this.log(models_1.LogLevel.DeepTrace, `Lamp 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, `Lamp Update für ${this.info.customName} auf ${state.val}`);
-                this._lightOn = state.val;
-                this.persist();
-                break;
-        }
     }
     /** @inheritDoc */
     setTimeBased(c) {

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

@@ -49,7 +49,7 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
     }
     /** @inheritDoc */
     setLight(c) {
-        if (this._stateIdState === '') {
+        if (this._actuatorOnStateIdState === '') {
             this.log(models_1.LogLevel.Error, 'Keine State ID bekannt.');
             return;
         }

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

@@ -6,7 +6,7 @@ import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
 export declare class ZigbeeBlitzShp extends ZigbeeActuator implements iExcessEnergyConsumer, iLoadMeter {
     /** @inheritDoc */
     settings: ActuatorSettings;
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     private _steckerOn;
     private _current;
     private _energy;

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

@@ -16,7 +16,7 @@ class ZigbeeBlitzShp extends BaseDevices_1.ZigbeeActuator {
         this._loadPower = 0;
         this._availableForExcessEnergy = true;
         this._activatedByExcessEnergy = false;
-        this._stateIdState = `${pInfo.fullID}.state`;
+        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);

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

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

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

@@ -7,7 +7,7 @@ const models_1 = require("../../../models");
 class ZigbeeIkeaSteckdose extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIkeaSteckdose);
-        this._stateIdState = `${pInfo.fullID}.state`;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
     }
     /** @inheritDoc */
     update(idSplit, state, initial = false) {

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

@@ -2,6 +2,6 @@ import { ZigbeeActuator } from './BaseDevices';
 import { DeviceType } from '../deviceType';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 export declare class ZigbeeIlluActuator extends ZigbeeActuator {
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     constructor(pInfo: IoBrokerDeviceInfo, deviceType?: DeviceType);
 }

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

@@ -6,7 +6,7 @@ const deviceType_1 = require("../deviceType");
 class ZigbeeIlluActuator extends BaseDevices_1.ZigbeeActuator {
     constructor(pInfo, deviceType = deviceType_1.DeviceType.ZigbeeIlluActuator) {
         super(pInfo, deviceType);
-        this._stateIdState = `${pInfo.fullID}.state`;
+        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

@@ -2,7 +2,6 @@ import { iLamp } from '../baseDeviceInterfaces';
 import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ZigbeeLamp } from './BaseDevices';
 export declare class ZigbeeIlluLampe extends ZigbeeLamp implements iLamp {
-    protected readonly _stateIdState: string;
-    protected readonly _stateNameState: string;
+    protected readonly _actuatorOnStateIdState: string;
     constructor(pInfo: IoBrokerDeviceInfo);
 }

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

@@ -6,8 +6,7 @@ const BaseDevices_1 = require("./BaseDevices");
 class ZigbeeIlluLampe extends BaseDevices_1.ZigbeeLamp {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeIlluLampe);
-        this._stateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${pInfo.fullID}.state`;
+        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/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`;
     }
 }

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

@@ -5,7 +5,7 @@ export declare class ZigbeeOsramDimmer 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/zigbeeOsramDimmer.js

@@ -9,7 +9,7 @@ class ZigbeeOsramDimmer 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/zigbeeUbisysActuator.d.ts

@@ -4,7 +4,7 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
 export declare class ZigbeeUbisysActuator extends ZigbeeActuator implements iLoadMeter {
     private _loadPower;
-    protected readonly _stateIdState: string;
+    protected readonly _actuatorOnStateIdState: string;
     /**
      * Creates an instance of {@link DeviceType.ZigbeeUbisysActuator} or a derived class like {@link ZigbeeUbisysLampe}
      * @param pInfo - Device creation information

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

@@ -15,7 +15,7 @@ class ZigbeeUbisysActuator extends BaseDevices_1.ZigbeeActuator {
         super(pInfo, deviceType);
         this._loadPower = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
-        this._stateIdState = `${pInfo.fullID}.state`;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
     }
     /** @inheritDoc */
     get loadPower() {

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

@@ -3,8 +3,7 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ZigbeeLamp } from './BaseDevices';
 import { iLoadMeter } from '../baseDeviceInterfaces/iLoadMeter';
 export declare class ZigbeeUbisysLampe extends ZigbeeLamp implements iLamp, iLoadMeter {
-    protected readonly _stateIdState: string;
-    protected readonly _stateNameState: string;
+    protected readonly _actuatorOnStateIdState: string;
     private _loadPower;
     constructor(pInfo: IoBrokerDeviceInfo);
     /** @inheritDoc */

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

@@ -10,8 +10,7 @@ class ZigbeeUbisysLampe extends BaseDevices_1.ZigbeeLamp {
         super(pInfo, deviceType_1.DeviceType.ZigbeeUbisysLampe);
         this._loadPower = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
-        this._stateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${pInfo.fullID}.state`;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
     }
     /** @inheritDoc */
     get loadPower() {

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

@@ -27,7 +27,7 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     /** @inheritDoc */
     targetAutomaticState: boolean;
     protected _info: DeviceInfo;
-    private _on;
+    private _actuatorOn;
     private _color;
     private _colortemp;
     private _room;
@@ -37,7 +37,6 @@ export declare class OwnGoveeDevice implements iLedRgbCct, iTemporaryDisableAuto
     get room(): RoomBase;
     get customName(): string;
     get actuatorOn(): boolean;
-    get lightOn(): boolean;
     get info(): DeviceInfo;
     get id(): string;
     get name(): string;

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

@@ -32,7 +32,7 @@ class OwnGoveeDevice {
         this.brightness = -1;
         /** @inheritDoc */
         this.targetAutomaticState = false;
-        this._on = false;
+        this._actuatorOn = false;
         this._color = '#fcba32';
         this._colortemp = 500;
         this._room = undefined;
@@ -63,10 +63,7 @@ class OwnGoveeDevice {
         return this.info.customName;
     }
     get actuatorOn() {
-        return this._on;
-    }
-    get lightOn() {
-        return this._on;
+        return this._actuatorOn;
     }
     get info() {
         return this._info;
@@ -117,13 +114,13 @@ class OwnGoveeDevice {
         if (devices_1.LampUtils.checkBlockActive(this, c)) {
             return;
         }
-        if (devices_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
-            return;
-        }
         if (c.isAutomaticAction) {
             // Preserve the target state for the automatic handler, as
             this.targetAutomaticState = c.on;
         }
+        if (devices_1.LampUtils.canDimmerChangeBeSkipped(this, c)) {
+            return;
+        }
         if (c.brightness > -1 && c.on) {
             this.setBrightness(c.brightness, () => {
                 this.turnOn();
@@ -168,7 +165,7 @@ class OwnGoveeDevice {
     }
     update(data) {
         this.queuedValue = null;
-        this._on = data.onOff === 1;
+        this._actuatorOn = data.onOff === 1;
         this.brightness = data.brightness;
         this._color = `#${data.color.r.toString(16)}${data.color.g.toString(16)}${data.color.b.toString(16)}`;
         this._colortemp = data.colorTemInKelvin;
@@ -199,7 +196,7 @@ class OwnGoveeDevice {
     }
     turnOn() {
         var _a;
-        if (this._on) {
+        if (this._actuatorOn) {
             return;
         }
         this.queuedValue = true;