Restoring use of _report for motion sensors

kingkong123 · Jan 25, 2018 · 67865ec · 67865ec
1 parent 465e319
commit 67865ec
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/lib/devices/gateway/motion.js b/lib/devices/gateway/motion.js
@@ -15,14 +15,13 @@ module.exports = class extends SubDevice.with(Motion, Voltage) {
 
 		this.updateMotion(false);
 
-		this.defineProperty('status');
 	}
 
-	propertyChanged(key, value, oldValue) {
-		if(key === 'status' && value === 'motion') {
+	_report(data) {
+		super._report(data);
+
+		if(typeof data.status !== 'undefined' && data.status === 'motion') {
 			this.updateMotion(true, '1m');
 		}
-
-		super.propertyChanged(key, value, oldValue);
 	}
 };
diff --git a/lib/devices/gateway/motion2.js b/lib/devices/gateway/motion2.js
@@ -21,11 +21,11 @@ module.exports = class extends SubDevice.with(Motion, Illuminance, Voltage) {
 		});
 	}
 
-	propertyChanged(key, value, oldValue) {
-		if(key === 'status' && value === 'motion') {
+	_report(data) {
+		super._report(data);
+
+		if(typeof data.status !== 'undefined' && data.status === 'motion') {
 			this.updateMotion(true, '1m');
 		}
-
-		super.propertyChanged(key, value, oldValue);
 	}
 };