hoffmation-base 2.22.3 → 2.22.5

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

@@ -100,11 +100,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             return;
         }
         if (transitionTime > -1) {
-            this.ioConn.setState(this._stateIdTransitionTime, transitionTime, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `Dimmer TransitionTime schalten ergab Fehler: ${err}`);
-                }
-            });
+            this.setState(this._stateIdTransitionTime, transitionTime);
         }
         const dontBlock = sharedFunctions_1.LampUtils.checkUnBlock(this, force, pValue);
         if (sharedFunctions_1.LampUtils.checkBlockActive(this, force, pValue)) {

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

@@ -79,19 +79,11 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
         }
         this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}\tTransition Time: ${transitionTime}`);
         const formattedColor = services_1.Utils.formatHex(color);
-        if (formattedColor !== null) {
-            this.ioConn.setState(this._stateIdColor, color, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `LED Farbe schalten ergab Fehler: ${err}`);
-                }
-            });
+        if (formattedColor !== null && pValue) {
+            this.setState(this._stateIdColor, formattedColor);
         }
-        if (colorTemp > -1) {
-            this.ioConn.setState(this._stateIdColorTemp, colorTemp, (err) => {
-                if (err) {
-                    this.log(models_1.LogLevel.Error, `LED Farbwärme schalten ergab Fehler: ${err}`);
-                }
-            });
+        if (colorTemp > -1 && pValue) {
+            this.setState(this._stateIdColorTemp, colorTemp);
         }
         super.setLight(pValue, timeout, force, brightness, transitionTime);
     }

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

@@ -13,4 +13,8 @@ export declare class ZigbeeInnr142C extends ZigbeeLedRGBCCT {
     protected readonly _stateNameColorTemp: string;
     protected readonly _debounceStateDelay: number;
     constructor(pInfo: IoBrokerDeviceInfo);
+    /**
+     * @inheritDoc
+     */
+    setLight(pValue: boolean, timeout?: number, force?: boolean, brightness?: number, transitionTime?: number, color?: string, colorTemp?: number): void;
 }

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZigbeeInnr142C = void 0;
 const deviceType_1 = require("../deviceType");
 const BaseDevices_1 = require("./BaseDevices");
+const models_1 = require("../../../models");
+const services_1 = require("../../services");
 class ZigbeeInnr142C extends BaseDevices_1.ZigbeeLedRGBCCT {
     constructor(pInfo) {
         super(pInfo, deviceType_1.DeviceType.ZigbeeInnr142C);
@@ -11,12 +13,41 @@ class ZigbeeInnr142C extends BaseDevices_1.ZigbeeLedRGBCCT {
         this._stateNameTransitionTime = 'transition_time';
         this._stateNameColor = 'color';
         this._stateNameColorTemp = 'colortemp';
-        this._debounceStateDelay = 2500;
+        this._debounceStateDelay = 3500;
         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._stateIdTransitionTime = `${this.info.fullID}.transition_time`;
     }
+    /**
+     * @inheritDoc
+     */
+    setLight(pValue, timeout, force, brightness = -1, transitionTime, color = '', colorTemp = -1) {
+        if (this._stateIdState === '') {
+            this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
+            return;
+        }
+        if (!this.ioConn) {
+            this.log(models_1.LogLevel.Error, `Keine Connection bekannt.`);
+            return;
+        }
+        if (pValue && brightness === -1 && this.brightness < 10) {
+            brightness = 10;
+        }
+        this.log(models_1.LogLevel.Debug, `LED Schalten An: ${pValue}\tHelligkeit: ${brightness}%\tFarbe: "${color}"\tColorTemperatur: ${colorTemp}\tTransition Time: ${transitionTime}`);
+        super.setLight(pValue, timeout, force, brightness, transitionTime);
+        const formattedColor = services_1.Utils.formatHex(color);
+        if (!pValue) {
+            return;
+        }
+        // Farben nur beim Einschalten setzen
+        if (formattedColor !== null && this.color !== formattedColor) {
+            this.setState(this._stateIdColor, formattedColor);
+        }
+        if (colorTemp > -1 && this.colortemp !== colorTemp) {
+            this.setState(this._stateIdColorTemp, colorTemp);
+        }
+    }
 }
 exports.ZigbeeInnr142C = ZigbeeInnr142C;