Merge pull request #1927 from aaron-miller/DVCSMP-2595

[DVCSMP-2595] Set scheduled executions for Lights off with no motion SA to overwrite

devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy

@@ -25,7 +25,6 @@ metadata {
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM 10 Year", deviceJoinName: "SYLVANIA Smart 10-Year A19"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"

smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy

@@ -765,6 +765,7 @@ def turnOffSwitch() {
         } else {
             
             device.off();
+                  
             return [Device_id: params.id, result_action: "200"]
         }
 }
@@ -788,7 +789,6 @@ def getTempSensorsStatus(id) {
             return []
         } else {
         	def bat = getBatteryStatus(device.id)
-            def scale = [Scale: location.temperatureScale]
+        	return [temperature: device.currentValue('temperature')] + bat
-        	return [temperature: device.currentValue('temperature')] + bat + scale
    		}
    }

smartapps/naissan/lights-off-with-no-motion-and-presence.src/lights-off-with-no-motion-and-presence.groovy

@@ -41,14 +41,14 @@ def updated() {
 def motionHandler(evt) {
   log.debug "handler $evt.name: $evt.value"
   if (evt.value == "inactive") {
-		runIn(delayMins * 60, scheduleCheck, [overwrite: false])
+    runIn(delayMins * 60, scheduleCheck, [overwrite: true])
   }
 }
 
 def presenceHandler(evt) {
   log.debug "handler $evt.name: $evt.value"
   if (evt.value == "not present") {
-		runIn(delayMins * 60, scheduleCheck, [overwrite: false])
+    runIn(delayMins * 60, scheduleCheck, [overwrite: true])
   }
 }
 

smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy

@@ -162,17 +162,6 @@ def registerAllDeviceSubscriptions() {
 	registerChangeHandler(inputs)
 }
 
-//Subscribe to events from a list of devices
-def registerChangeHandler(myList) {
-	myList.each { myDevice ->
-		def theAtts = myDevice.supportedAttributes
-		theAtts.each { att ->
-			subscribe(myDevice, att.name, deviceEventHandler)
-			log.info "Registering for ${myDevice.displayName}.${att.name}"
-		}
-	}
-}
-
 //Endpoints function: Subscribe to events from a specific device
 def registerDeviceChange() {
 	def subscriptionEndpt = params.subscriptionURL