Prevent recursive device calls for hallLightHome. Fix bad object prop…

… in smartthingsModeChange
imbrianj · Dec 31, 2016 · 8f9d0fc · 8f9d0fc
1 parent 9f16cd9
commit 8f9d0fc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/apps/hallLightHome.js b/apps/hallLightHome.js
@@ -31,9 +31,9 @@ module.exports = (function () {
   'use strict';
 
   return {
-    version : 20161101,
+    version : 20161231,
 
-    lastEvents : { presence : 0, open : 0 },
+    lastEvents : { acted : 0, presence : 0, open : 0 },
 
     hallLightHome : function (deviceId, command, controllers, values, config) {
       var deviceState = require(__dirname + '/../lib/deviceState'),
@@ -68,7 +68,7 @@ module.exports = (function () {
         this.lastEvents.open = now;
       }
 
-      if ((now < delay + this.lastEvents.presence) && (now < delay + this.lastEvents.open)) {
+      if ((now > delay + this.lastEvents.acted) && (now < delay + this.lastEvents.presence) && (now < delay + this.lastEvents.open)) {
         if (config.macro) {
           for (macro in rawMacro) {
             if (rawMacro.hasOwnProperty(macro)) {
@@ -88,12 +88,17 @@ module.exports = (function () {
                 case 'raspberryRemote' :
                   currentDeviceState = deviceState.getDeviceState(currDevice);
                 break;
+
+                default :
+                  currentDeviceState = null;
               }
 
               if ((currentDeviceState.value) && (currentDeviceState.value.devices)) {
                 for (subdevice in currentDeviceState.value.devices) {
                   if (config.action.indexOf(currentDeviceState.value.devices[subdevice].label) !== -1) {
-                    runCommand.runCommand(currDevice, 'subdevice-' + currentDeviceState.value.devices[subdevice].label + '-on');
+                    this.lastEvents.acted = now;
+
+                    runCommand.runCommand(currDevice, 'subdevice-' + currentDeviceState.value.devices[subdevice].label + '-on', currDevice);
                   }
                 }
               }

diff --git a/apps/smartthingsModeChange.js b/apps/smartthingsModeChange.js
@@ -60,7 +60,7 @@ module.exports = (function () {
 
             // If you have a macro assigned to this specific Mode, we'll act
             // upon it.
-            if (config[SmartthingsMode[deviceId]]) {
+            if (config[newMode]) {
               runCommand = require(__dirname + '/../lib/runCommand');
 
               rawMacro = config[newMode].split(';');

diff --git a/cache/version.txt b/cache/version.txt
@@ -1 +1 @@
-1483166364855
+1483181551680
diff --git a/js/combo.min.js b/js/combo.min.js