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

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));
     }

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() {

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

@@ -6,8 +6,6 @@ import { DeviceType } from '../../deviceType';
 export declare abstract class ZigbeeLamp extends ZigbeeActuator implements iLamp, iTemporaryDisableAutomatic {
     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

@@ -11,10 +11,6 @@ class ZigbeeLamp extends ZigbeeActuator_1.ZigbeeActuator {
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.lamp);
     }
     /** @inheritDoc */
-    get lightOn() {
-        return this.actuatorOn;
-    }
-    /** @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)}`);

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

@@ -3,6 +3,5 @@ import { IoBrokerDeviceInfo } from '../IoBrokerDeviceInfo';
 import { ZigbeeLamp } from './BaseDevices';
 export declare class ZigbeeIlluLampe extends ZigbeeLamp implements iLamp {
     protected readonly _actuatorOnStateIdState: string;
-    protected readonly _stateNameState: 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._actuatorOnStateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${pInfo.fullID}.state`;
+        this._actuatorOnStateIdState = `${pInfo.fullID}.${this._stateNameState}`;
     }
 }
 exports.ZigbeeIlluLampe = ZigbeeIlluLampe;

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

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

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

@@ -11,7 +11,6 @@ class ZigbeeUbisysLampe extends BaseDevices_1.ZigbeeLamp {
         this._loadPower = 0;
         this.deviceCapabilities.push(DeviceCapability_1.DeviceCapability.loadMetering);
         this._actuatorOnStateIdState = `${pInfo.fullID}.state`;
-        this._stateNameState = `${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;
@@ -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;