hoffmation-base 2.15.8 → 2.15.10

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

@@ -47,7 +47,8 @@ class ZigbeeActuator extends zigbeeDevice_1.ZigbeeDevice {
             return;
         }
         let dontBlock = false;
-        if (this.settings.resetToAutomaticOnForceOffAfterForceOn &&
+        if (force &&
+            this.settings.resetToAutomaticOnForceOffAfterForceOn &&
             !pValue &&
             this.blockAutomationHandler.automaticBlockActive) {
             dontBlock = true;

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

@@ -5,6 +5,7 @@ import { IoBrokerDeviceInfo } from '../../IoBrokerDeviceInfo';
 import { iDisposable } from '../../../services';
 export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposable {
     protected _available: boolean;
+    protected _dontSendOnUnavailable: boolean;
     private readonly _deviceQueryId;
     get available(): boolean;
     protected _linkQuality: number;
@@ -18,4 +19,5 @@ export declare class ZigbeeDevice extends IoBrokerBaseDevice implements iDisposa
     triggerDeviceQuery(): void;
     dispose(): void;
     persistZigbeeDevice(): void;
+    protected setState(pointId: string, state: string | number | boolean | ioBroker.State | ioBroker.SettableState | null, onSuccess?: (() => void) | undefined, onError?: ((error: Error) => void) | undefined): void;
 }

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

@@ -17,6 +17,7 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
     constructor(pInfo, pType) {
         super(pInfo, pType);
         this._available = false;
+        this._dontSendOnUnavailable = false;
         this._linkQuality = 0;
         this.persistZigbeeInterval = services_1.Utils.guardedInterval(() => {
             this.persistZigbeeDevice();
@@ -67,5 +68,12 @@ class ZigbeeDevice extends IoBrokerBaseDevice_1.IoBrokerBaseDevice {
         var _a;
         (_a = services_1.Utils.dbo) === null || _a === void 0 ? void 0 : _a.persistZigbeeDevice(this);
     }
+    setState(pointId, state, onSuccess = undefined, onError = undefined) {
+        if (this._dontSendOnUnavailable && !this._available) {
+            this.log(models_1.LogLevel.Warn, `Device unavailable --> Not changing ${pointId} to ${state}`);
+            return;
+        }
+        super.setState(pointId, state, onSuccess, onError);
+    }
 }
 exports.ZigbeeDevice = ZigbeeDevice;

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

@@ -105,7 +105,8 @@ class ZigbeeDimmer extends index_1.ZigbeeDevice {
             });
         }
         let dontBlock = false;
-        if (this.settings.resetToAutomaticOnForceOffAfterForceOn &&
+        if (force &&
+            this.settings.resetToAutomaticOnForceOffAfterForceOn &&
             !pValue &&
             this.blockAutomationHandler.automaticBlockActive) {
             dontBlock = true;

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

@@ -14,6 +14,7 @@ class ZigbeeEuroHeater extends BaseDevices_1.ZigbeeHeater {
         this._lastRecalc = 0;
         this._mode = 1;
         this._recalcTimeout = null;
+        this._dontSendOnUnavailable = true;
         this._setPointTemperaturID = `${this.info.fullID}.heating_setpnt_current`;
         this._setLocalTempCalibrationId = `${this.info.fullID}.local_temp_calibration`;
         this._setModeId = `${this.info.fullID}.spz_trv_mode`;