hoffmation-base 3.0.0 → 3.0.1

package/lib/server/devices/sharedFunctions/temperatureSensor.d.ts

@@ -20,9 +20,13 @@ export declare class TemperatureSensor implements iJsonOmitKeys {
     private readonly _persistTemperatureSensorInterval;
     private _temperature;
     private _temperaturCallbacks;
+    /**
+     * The last time the temperature sensor was seen.
+     */
+    lastSeen: number;
     constructor(_device: iTemperatureSensor);
-    set temperature(val: number);
     get temperature(): number;
+    set temperature(val: number);
     /**
      * Persists the current temperature sensor information to the database
      */

package/lib/server/devices/sharedFunctions/temperatureSensor.js

@@ -27,8 +27,20 @@ class TemperatureSensor {
         }, 5 * 60 * 1000, this, false);
         this._temperature = baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
         this._temperaturCallbacks = [];
+        /**
+         * The last time the temperature sensor was seen.
+         */
+        this.lastSeen = 0;
+    }
+    get temperature() {
+        if (services_1.Utils.nowMS() - this.lastSeen > 60 * 60 * 1000) {
+            // Temperature sensor hasn't been seen in an hour --> Don't to trust it
+            return baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE;
+        }
+        return this._temperature;
     }
     set temperature(val) {
+        this.lastSeen = services_1.Utils.nowMS();
         let correctedValue = val;
         if (this.outdoorTemperatureCorrectionCoefficient !== 0 && services_1.WeatherService.currentTemp !== baseDeviceInterfaces_1.UNDEFINED_TEMP_VALUE) {
             correctedValue = val + this.outdoorTemperatureCorrectionCoefficient * (21 - services_1.WeatherService.currentTemp);
@@ -38,9 +50,6 @@ class TemperatureSensor {
             cb(new models_1.TemperatureSensorChangeAction(this._device, correctedValue));
         }
     }
-    get temperature() {
-        return this._temperature;
-    }
     /**
      * Persists the current temperature sensor information to the database
      */

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

@@ -40,12 +40,13 @@ class ZigbeeMotionSensor extends index_1.ZigbeeDevice {
     }
     /** @inheritDoc */
     get movementDetected() {
-        if (!this.available) {
-            // If the device is not available, there is no active movement
-            return false;
-        }
-        if (services_1.Utils.nowMS() - this.lastUpdate.getTime() > 3600000) {
-            // If the device has not been updated for more than an hour, there is no active movement
+        if (!this.available || services_1.Utils.nowMS() - this.lastUpdate.getTime() > 3600000) {
+            // If the device is not available or has not been updated for more than an hour, there is no active movement
+            if (this._movementDetected) {
+                // The device must have gone offline whilst occupancy was detected -> reset
+                this.log(models_1.LogLevel.Error, 'Zigbee Motion Sensor went offline, resetting movement state');
+                this.updateMovement(false);
+            }
             return false;
         }
         return this._movementDetected;