hoffmation-base 2.22.0 → 2.22.2

package/lib/server/config/iIobrokerSettigns.d.ts

@@ -4,4 +4,8 @@ export interface iIobrokerSettigns {
      * This allows to detect states which crash the Websocket Payload limit
      */
     useSplitInitialization?: boolean;
+    /**
+     * Whether the new/advanced zigbee2mqtt adapter is used
+     */
+    useZigbee2mqtt?: boolean;
 }

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

@@ -90,6 +90,7 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
      * @param {number} transitionTime The transition time for the brightness, to switch smoothly
      */
     setLight(pValue, timeout = -1, force = false, brightness = -1, transitionTime = -1) {
+        var _a;
         if (this._stateIdState === '') {
             this.log(models_1.LogLevel.Error, `Keine State ID bekannt.`);
             return;
@@ -113,24 +114,25 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             brightness = 10;
         }
         this.log(models_1.LogLevel.Debug, `Set Light Acutator to "${pValue}" with brightness ${brightness}`, services_1.LogDebugType.SetActuator);
-        this.setState(this._stateIdState, pValue);
-        this.queuedValue = pValue;
-        if (brightness > -1) {
-            if (brightness < this.settings.turnOnThreshhold) {
-                this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
-                    services_1.Utils.guardedTimeout(() => {
-                        this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
-                        this.setState(this._stateIdBrightness, brightness);
-                    }, 1000, this);
-                });
-            }
-            else {
-                this.setState(this._stateIdBrightness, brightness);
-            }
-        }
         if (timeout > -1 && !dontBlock) {
             this.blockAutomationHandler.disableAutomatic(timeout, models_1.CollisionSolving.overrideIfGreater);
         }
+        if (((_a = services_1.SettingsService.settings.ioBroker) === null || _a === void 0 ? void 0 : _a.useZigbee2mqtt) && !pValue) {
+            // With zigbee2mqtt to turn on only setting brighness>0 is needed, so we need state only for turning off
+            this.setState(this._stateIdState, pValue);
+            this.queuedValue = pValue;
+            return;
+        }
+        if (brightness >= this.settings.turnOnThreshhold) {
+            this.setState(this._stateIdBrightness, brightness);
+            return;
+        }
+        this.setState(this._stateIdBrightness, this.settings.turnOnThreshhold, () => {
+            services_1.Utils.guardedTimeout(() => {
+                this.log(models_1.LogLevel.Info, `Delayed reduced brightness on ${this.info.customName}`);
+                this.setState(this._stateIdBrightness, brightness);
+            }, 1000, this);
+        });
     }
     persist() {
         var _a;

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

@@ -77,7 +77,7 @@ class ZigbeeLedRGBCCT extends zigbeeDimmer_1.ZigbeeDimmer {
         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}`);
+        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) => {