hoffmation-base 2.22.4 → 2.22.6

package/lib/server/devices/tuya/tuyaGarageOpener.js

@@ -30,7 +30,12 @@ class TuyaGarageOpener extends tuyaDevice_1.TuyaDevice {
                 }
                 break;
             case this._switchId:
-                this._switchState = state.val === true;
+                if (this.settings.invertSensor) {
+                    this._switchState = state.val === true;
+                }
+                else {
+                    this._switchState = state.val === false;
+                }
                 break;
         }
         super.update(idSplit, state, initial, true);

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

@@ -79,10 +79,10 @@ 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.setState(this._stateIdColor, color);
+        if (formattedColor !== null && pValue) {
+            this.setState(this._stateIdColor, formattedColor);
         }
-        if (colorTemp > -1) {
+        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);
@@ -18,5 +20,36 @@ class ZigbeeInnr142C extends BaseDevices_1.ZigbeeLedRGBCCT {
         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}`);
+        if (this._lightOn !== pValue || this._brightness !== brightness) {
+            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;