MSA-1817: This app simply allows for a light to be turned off after being turned on. Set the amount of time before turning off and be happy.

build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'
 
 buildscript {
     dependencies {
-        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.11"
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
     }
     repositories {
         mavenLocal()

devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy

@@ -21,7 +21,6 @@ metadata {
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
 		capability "Water Sensor"
-		capability "Health Check"
         
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x22, 0x85, 0x59, 0x20, 0x80, 0x70, 0x56, 0x5A, 0x7A, 0x72, 0x8E, 0x71, 0x73, 0x98, 0x9C, 0x31, 0x86", outClusters: ""
 	}
@@ -229,9 +228,7 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
+	
     def cmds = []
     
 	cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds:21600, nodeid: zwaveHubNodeId)//FGFS' default wake up interval

devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy

@@ -22,7 +22,6 @@ metadata {
 		capability "Sensor"
 		capability "Tamper Alert"
 		capability "Temperature Measurement"
-		capability "Health Check"
         
         fingerprint deviceId: "0x0701", inClusters: "0x5E, 0x20, 0x86, 0x72, 0x5A, 0x59, 0x85, 0x73, 0x84, 0x80, 0x71, 0x56, 0x70, 0x31, 0x8E, 0x22, 0x30, 0x9C, 0x98, 0x7A", outClusters: ""
 	}
@@ -241,9 +240,7 @@ def zwaveEvent(physicalgraph.zwave.commands.deviceresetlocallyv1.DeviceResetLoca
 
 def configure() {
 	log.debug "Executing 'configure'"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
+    
     def cmds = []
     
     cmds += zwave.wakeUpV2.wakeUpIntervalSet(seconds: 7200, nodeid: zwaveHubNodeId)//FGMS' default wake up interval

devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy

@@ -39,7 +39,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Configuration"
 		capability "Battery"
-		capability "Health Check"
        
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -305,9 +304,6 @@ def lateConfigure(setConf = False) {
  */
 def configure() {
 	log.debug "Configuring Device..."
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
     def cmds = []
     
     // send associate to group 2 to get alarm data

devicetypes/smartthings/fibaro-motion-sensor.src/fibaro-motion-sensor.groovy

@@ -46,7 +46,6 @@
 		capability 	"Illuminance Measurement"
 		capability 	"Sensor"
 		capability 	"Battery"
-		capability  "Health Check"
         
         command		"resetParams2StDefaults"
         command		"listCurrentParams"
@@ -126,9 +125,6 @@
  */
 def configure() {
 	log.debug "Configuring Device For SmartThings Use"
-	// Device-Watch simply pings if no device events received for 8 hrs & 2 minutes
-	sendEvent(name: "checkInterval", value: 8 * 60 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
     def cmds = []
     
     // send associate to group 3 to get sensor data reported only to hub

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

@@ -1,794 +0,0 @@
-/**
- *  Gideon
- *
- *  Copyright 2016 Nicola Russo
- *
- *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
- *  in compliance with the License. You may obtain a copy of the License at:
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
- *  for the specific language governing permissions and limitations under the License.
- *
- */
-definition(
-    name: "Gideon Smart Home",
-    namespace: "gideon.api",
-    author: "Braindrain Solutions ltd",
-    description: "Gideon Smart Home SmartApp allows you to connect and control all of your SmartThings devices through the Gideon app, making your SmartThings devices even smarter.",
-    category: "Family",
-    iconUrl: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    iconX2Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    iconX3Url: "http://s33.postimg.org/t77u7y7v3/logo.png",
-    oauth: [displayName: "Gideon Smart Home API app", displayLink: "gideon.ai"])
-
-preferences {
-	section("Control these contact sensors...") {
-        input "contact", "capability.contactSensor", multiple:true, required:false
-    }
-    section("Control these switch levels...") {
-        input "switchlevels", "capability.switchLevel", multiple:true, required:false
-    }
-/*    section("Control these thermostats...") {
-        input "thermostats", "capability.thermostat", multiple:true, required:false
-    }*/
-    section("Control the color for these devices...") {
-        input "colors", "capability.colorControl", multiple:true, required:false
-    }
-    section("Control the color temperature for these devices...") {
-        input "kelvin", "capability.colorTemperature", multiple:true, required:false
-    }
-	section("Control these switches...") {
-        input "switches", "capability.switch", multiple:true, required:false
-    }
-    section("Control these smoke alarms...") {
-        input "smoke_alarms", "capability.smokeDetector", multiple:true, required:false
-    }
-    section("Control these window shades...") {
-        input "shades", "capability.windowShade", multiple:true, required:false
-    }
-    section("Control these garage doors...") {
-        input "garage", "capability.garageDoorControl", multiple:true, required:false
-    }
-    section("Control these water sensors...") {
-        input "water_sensors", "capability.waterSensor", multiple:true, required:false
-    }
-    section("Control these motion sensors...") {
-        input "motions", "capability.motionSensor", multiple:true, required:false
-    }
-    section("Control these presence sensors...") {
-    	input "presence_sensors", "capability.presenceSensor", multiple:true, required:false
-    }
-	section("Control these outlets...") {
-    	input "outlets", "capability.outlet", multiple:true, required:false
-    }
-    section("Control these power meters...") {
-        input "meters", "capability.powerMeter", multiple:true, required:false
-    }
-    section("Control these locks...") {
-    	input "locks", "capability.lock", multiple:true, required:false
-    }
-    section("Control these temperature sensors...") {
-	    input "temperature_sensors", "capability.temperatureMeasurement", multiple:true, required:false
-    }
-    section("Control these batteries...") {
-	    input "batteries", "capability.battery", multiple:true, required:false
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-}
-
-private device(it, type) {
-	it ? [id: it.id, label: it.label, type: type] : null
-}
-
-//API Mapping
-mappings {
-   path("/getalldevices") {
-    action: [
-      	GET: "getAllDevices"
-   ]
-  }
-  /*
-  path("/thermostat/setcool/:id/:temp") {
-    action: [
-      GET: "setCoolTemp"
-    ]
-  }
-  path("/thermostat/setheat/:id/:temp") {
-    action: [
-      GET: "setHeatTemp"
-    ]
-  }
-  path("/thermostat/setfanmode/:id/:mode") {
-    action: [
-      GET: "setFanMode"
-    ]
-  }
-  path("/thermostat/setmode/:id/:mode") {
-    action: [
-      GET: "setThermostatMode"
-    ]
-  }
-  path("/thermostat/:id") {
-    action: [
-      GET: "getThermostatStatus"
-    ]
-  }
-  */
-  path("/light/dim/:id/:dim") {
-    action: [
-      GET: "setLevelStatus"
-    ]
-  }
-  path("/light/kelvin/:id/:kelvin") {
-    action: [
-      GET: "setKelvin"
-    ]
-  }
-  path("/colorlight/:id/:hue/:sat") {
-    action: [
-      GET: "setColor"
-    ]
-  }
-  path("/light/status/:id") {
-    action: [
-      GET: "getLightStatus"
-    ]
-  }
-  path("/light/on/:id") {
-    action: [
-      GET: "turnOnLight"
-    ]
-  }
-  path("/light/off/:id") {
-    action: [
-      GET: "turnOffLight"
-    ]
-  }
-  path("/doorlocks/lock/:id") {
-    action: [
-      GET: "lockDoorLock"
-    ]
-  }
-  path("/doorlocks/unlock/:id") {
-    action: [
-      GET: "unlockDoorLock"
-    ]
-  }
-  path("/doorlocks/:id") {
-    action: [
-      GET: "getDoorLockStatus"
-    ]
-  }
-  path("/contacts/:id") {
-    action: [
-  	GET: "getContactStatus"
-    ]
-  }
-  path("/smoke/:id") {
-    action: [
-   	GET: "getSmokeStatus"
-	]
-  }
-    path("/shades/open/:id") {
-    action: [
-      GET: "openShade"
-    ]
-  }
-  path("/shades/preset/:id") {
-    action: [
-      GET: "presetShade"
-    ]
-  }
-  path("/shades/close/:id") {
-    action: [
-      GET: "closeShade"
-    ]
-  }
-  	path("/shades/:id") {
-    action: [
-	GET: "getShadeStatus"
-	]
-}
-    path("/garage/open/:id") {
-    action: [
-      GET: "openGarage"
-    ]
-  }
-  path("/garage/close/:id") {
-    action: [
-      GET: "closeGarage"
-    ]
-  }
-  	path("/garage/:id") {
-    action: [
-  		GET: "getGarageStatus"
-  	]
-  }
-    path("/watersensors/:id") {
-    action: [
-      		GET: "getWaterSensorStatus"
-    	]
-  }
-  	path("/tempsensors/:id") {
-    action: [
-      GET: "getTempSensorsStatus"
-    ]
-  }
-  path("/meters/:id") {
-    action: [
-      GET: "getMeterStatus"
-    ]
-  }
-  path("/batteries/:id") {
-    action: [
-      GET: "getBatteryStatus"
-    ]
-  }
-  	path("/presences/:id") {
-    action: [
-      GET: "getPresenceStatus"
-    ]
-  }
-  	path("/motions/:id") {
-    action: [
-      GET: "getMotionStatus"
-    ]
-  }
-  	path("/outlets/:id") {
-    action: [
-      GET: "getOutletStatus"
-    ]
-  }
-  	path("/outlets/turnon/:id") {
-    action: [
-      GET: "turnOnOutlet"
-    ]
-  }
-  path("/outlets/turnoff/:id") {
-    action: [
-      GET: "turnOffOutlet"
-    ]
-  }
-  path("/switches/turnon/:id") {
-    action: [
-      GET: "turnOnSwitch"
-    ]
-  }
-  path("/switches/turnoff/:id") {
-    action: [
-      GET: "turnOffSwitch"
-    ]
-  }
-  path("/switches/:id") {
-    action: [
-      GET: "getSwitchStatus"
-    ]
-  }
-}
-
-//API Methods
-def getAllDevices() {
-    def locks_list = locks.collect{device(it,"Lock")}
-    /*def thermo_list = thermostats.collect{device(it,"Thermostat")}*/
-    def colors_list = colors.collect{device(it,"Color")}
-    def kelvin_list = kelvin.collect{device(it,"Kelvin")}
-    def contact_list = contact.collect{device(it,"Contact Sensor")}
-    def smokes_list = smoke_alarms.collect{device(it,"Smoke Alarm")}
-    def shades_list = shades.collect{device(it,"Window Shade")}
-    def garage_list = garage.collect{device(it,"Garage Door")}
-    def water_sensors_list = water_sensors.collect{device(it,"Water Sensor")}
-    def presences_list = presence_sensors.collect{device(it,"Presence")}
-    def motions_list = motions.collect{device(it,"Motion")}
-	def outlets_list = outlets.collect{device(it,"Outlet")}
-    def switches_list = switches.collect{device(it,"Switch")}
-    def switchlevels_list = switchlevels.collect{device(it,"Switch Level")}
-    def temp_list = temperature_sensors.collect{device(it,"Temperature")}
-    def meters_list = meters.collect{device(it,"Power Meters")}
-    def battery_list = batteries.collect{device(it,"Batteries")}
-    return outlets_list + kelvin_list + colors_list + switchlevels_list + smokes_list + contact_list + water_sensors_list + shades_list + garage_list + locks_list + presences_list + motions_list + switches_list + temp_list + meters_list + battery_list
-}
-
-//thermostat
-/*
-def setCoolTemp() {
-	def device = thermostats.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            if(device.hasCommand("setCoolingSetpoint")) {
-            	device.setCoolingSetpoint(params.temp.toInteger());
-                return [result_action: "200"]
-            }
-            else {
-            	httpError(510, "Not supported!")
-            }
-       }
-}
-def setHeatTemp() {
-	def device = thermostats.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            if(device.hasCommand("setHeatingSetpoint")) {
-            	device.setHeatingSetpoint(params.temp.toInteger());
-                return [result_action: "200"]
-            }
-            else {
-            	httpError(510, "Not supported!")
-            }
-       }
-}
-def setFanMode() {
-	def device = thermostats.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        if(device.hasCommand("setThermostatFanMode")) {
-            	device.setThermostatFanMode(params.mode);
-                return [result_action: "200"]
-            }
-            else {
-            	httpError(510, "Not supported!")
-            }
-       }
-}
-def setThermostatMode() {
-	def device = thermostats.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        if(device.hasCommand("setThermostatMode")) {
-            	device.setThermostatMode(params.mode);
-                return [result_action: "200"]
-            }
-            else {
-            	httpError(510, "Not supported!")
-            }
-       }
-}
-def getThermostatStatus() {
-	def device = thermostats.find{ it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [ThermostatOperatingState: device.currentValue('thermostatOperatingState'), ThermostatSetpoint: device.currentValue('thermostatSetpoint'), 
-            			ThermostatFanMode: device.currentValue('thermostatFanMode'), ThermostatMode: device.currentValue('thermostatMode')]
-       	}
-}
-*/
-//light
-def turnOnLight() {
-    def device = switches.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            device.on();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-    }
-
-def turnOffLight() {
-    def device = switches.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            device.off();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-}
-
-def getLightStatus() {
-	def device = switches.find{ it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Status: device.currentValue('switch'), Dim: getLevelStatus(params.id), Color: getColorStatus(params.id), Kelvin: getKelvinStatus(params.id)]
-        }
-}
-
-//color control
-def setColor() {
-    def device = colors.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	
-            def map = [hue:params.hue.toInteger(), saturation:params.sat.toInteger()]
-            
-            device.setColor(map);
-                  
-            return [Device_id: params.id, result_action: "200"]
-    }
-}
-
-def getColorStatus(id) {
-	def device = colors.find { it.id == id }
-    if (!device) {
-            return [Color: "none"]
-        } else {
-        	return [hue: device.currentValue('hue'), saturation: device.currentValue('saturation')]
-        }
-}
-
-//kelvin control
-def setKelvin() {
-    def device = kelvin.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        
-            device.setColorTemperature(params.kelvin.toInteger());
-                  
-            return [Device_id: params.id, result_action: "200"]
-    }
-}
-
-def getKelvinStatus(id) {
-	def device = kelvin.find { it.id == id }
-    if (!device) {
-            return [kelvin: "none"]
-        } else {
-        	return [kelvin: device.currentValue('colorTemperature')]
-        }
-}
-
-//switch level
-def getLevelStatus() {
-	def device = switchlevels.find { it.id == params.id }
-    if (!device) {
-            [Level: "No dimmer"]
-        } else {
-        	return [Level: device.currentValue('level')]
-        }
-}
-
-def getLevelStatus(id) {
-	def device = switchlevels.find { it.id == id }
-    if (!device) {
-            [Level: "No dimmer"]
-        } else {
-        	return [Level: device.currentValue('level')]
-        }
-}
-
-
-def setLevelStatus() {
-	def device = switchlevels.find { it.id == params.id }
-    def level = params.dim
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	device.setLevel(level.toInteger())
-        	return [result_action: "200", Level: device.currentValue('level')]
-        }
-}
-
-
-//contact sensors
-def getContactStatus() {
-	def device = contact.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def args = getTempSensorsStatus(device.id)
-        	return [Device_state: device.currentValue('contact')] + args
-        }
-}
-
-//smoke detectors
-def getSmokeStatus() {
-	def device = smoke_alarms.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('smoke')] + bat
-        }
-}
-
-//garage
-def getGarageStatus() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('door')]
-        }
-}
-
-def openGarage() {
-    def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeGarage() {
-	def device = garage.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-//shades
-def getShadeStatus() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('windowShade')]
-        }
-}
-
-def openShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.open();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-    
-def presetShade() {
-    def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.presetPosition();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def closeShade() {
-	def device = shades.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.close();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-//water sensor
-def getWaterSensorStatus() {
-	def device = water_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('water')] + bat
-        }
-}
-//batteries
-def getBatteryStatus() {
-	def device = batteries.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.latestValue("battery")]
-        }
-}
-
-def getBatteryStatus(id) {
-	def device = batteries.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	return [battery_state: device.latestValue("battery")]
-        }
-}
-
-//LOCKS
-def getDoorLockStatus() {
-	def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('lock')] + bat
-        }
-}
-
-def lockDoorLock() {
-    def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.lock();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-
-def unlockDoorLock() {
-	def device = locks.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.unlock();
-                  
-            return [Device_id: params.id, result_action: "200"]                              
-            }
-    }
-//PRESENCE
-def getPresenceStatus() {
-
-	def device = presence_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        def bat = getBatteryStatus(device.id)
-        	return [Device_state: device.currentValue('presence')] + bat
-   }
-}
-
-//MOTION
-def getMotionStatus() {
-
-	def device = motions.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def args = getTempSensorsStatus(device.id)
-        	return [Device_state: device.currentValue('motion')] + args
-   }
-}
-
-//OUTLET
-def getOutletStatus() {
-
-    def device = outlets.find { it.id == params.id }
-    if (!device) {
-            device = switches.find { it.id == params.id }
-            if(!device) {
-            	httpError(404, "Device not found")
-        	}
-     }
-     def watt = getMeterStatus(device.id)
-       	
-     return [Device_state: device.currentValue('switch')] + watt
-}
-
-def getMeterStatus() {
-
-    def device = meters.find { it.id == params.id }
-   	if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_id: device.id, Device_type: device.type, Current_watt: device.currentValue("power")]
-  }
-}
-
-def getMeterStatus(id) {
-
-    def device = meters.find { it.id == id }
-   	if (!device) {
-            return []
-        } else {
-        	return [Current_watt: device.currentValue("power")]
-  }
-}
-
-
-def turnOnOutlet() {
-    def device = outlets.find { it.id == params.id }
-    if (!device) {
-            device = switches.find { it.id == params.id }
-            if(!device) {
-            	httpError(404, "Device not found")
-        	}
-     }
-     
-     device.on();
-                  
-     return [Device_id: params.id, result_action: "200"]
-}
-
-def turnOffOutlet() {
-    def device = outlets.find { it.id == params.id }
-    if (!device) {
-            device = switches.find { it.id == params.id }
-            if(!device) {
-            	httpError(404, "Device not found")
-        	}
-     }
-            
-     device.off();
-                  
-     return [Device_id: params.id, result_action: "200"]
-}
-
-//SWITCH
-def getSwitchStatus() {
-	def device = switches.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	return [Device_state: device.currentValue('switch'), Dim: getLevelStatus(params.id)]
-	}
-}
-
-def turnOnSwitch() {
-    def device = switches.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.on();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-}
-
-def turnOffSwitch() {
-    def device = switches.find { it.id == params.id }
-        if (!device) {
-            httpError(404, "Device not found")
-        } else {
-            
-            device.off();
-                  
-            return [Device_id: params.id, result_action: "200"]
-        }
-}
-
-
-//TEMPERATURE
-def getTempSensorsStatus() {
-    def device = temperature_sensors.find { it.id == params.id }
-    if (!device) {
-            httpError(404, "Device not found")
-        } else {
-        	def bat = getBatteryStatus(device.id)
-            def scale = [Scale: location.temperatureScale]
-        	return [Device_state: device.currentValue('temperature')] + scale + bat
-   }
-}
-
-def getTempSensorsStatus(id) {	
-    def device = temperature_sensors.find { it.id == id }
-    if (!device) {
-            return []
-        } else {
-        	def bat = getBatteryStatus(device.id)
-        	return [temperature: device.currentValue('temperature')] + bat
-   		}
-   }

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

@@ -39,7 +39,7 @@ definition(
  *  garageDoors         | door          | open, close           | unknown, closed, open, closing, opening
  *  cameras             | image         | take                  | <String>
  *  thermostats         | thermostat    | setHeatingSetpoint,   | temperature, heatingSetpoint, coolingSetpoint,
- *	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
+ * 	                    |				| setCoolingSetpoint,   | thermostatSetpoint, thermostatMode,
  *                      |				| off, heat, cool, auto,| thermostatFanMode, thermostatOperatingState
  *                      |				| emergencyHeat,        |
  *                      |				| setThermostatMode,    |
@@ -55,7 +55,7 @@ preferences {
 		input "contactSensors", "capability.contactSensor", title: "Which Contact Sensors", multiple: true, required: false
 		input "garageDoors", "capability.garageDoorControl", title: "Which Garage Doors?", multiple: true, required: false
 		input "locks", "capability.lock", title: "Which Locks?", multiple: true, required: false
-		input "cameras", "capability.videoCapture", title: "Which Cameras?",  multiple: true, required: false
+		input "cameras", "capability.videoCapture", title: "Which Cameras?", multiple: true, required: false
 		input "motionSensors", "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
 		input "presenceSensors", "capability.presenceSensor", title: "Which Presence Sensors", multiple: true, required: false
 		input "switches", "capability.switch", title: "Which Switches and Lights?", multiple: true, required: false
@@ -66,48 +66,54 @@ preferences {
 
 def getInputs() {
 	def inputList = []
-	inputList += contactSensors?: []
-	inputList += garageDoors?: []
-	inputList += locks?: []
-	inputList += cameras?: []
-	inputList += motionSensors?: []
-	inputList += presenceSensors?: []
-	inputList += switches?: []
-	inputList += thermostats?: []
-	inputList += waterSensors?: []
+	inputList += contactSensors ?: []
+	inputList += garageDoors ?: []
+	inputList += locks ?: []
+	inputList += cameras ?: []
+	inputList += motionSensors ?: []
+	inputList += presenceSensors ?: []
+	inputList += switches ?: []
+	inputList += thermostats ?: []
+	inputList += waterSensors ?: []
 	return inputList
 }
 
 //API external Endpoints
 mappings {
 	path("/subscriptionURL/:url") {
-		action: [
+		action:
+		[
 				PUT: "updateEndpointURL"
 		]
 	}
 	path("/connectionId/:connId") {
-		action: [
+		action:
+		[
 				PUT: "updateConnectionId"
 		]
 	}
 	path("/devices") {
-		action: [
+		action:
+		[
 				GET: "getDevices"
 		]
 	}
 	path("/devices/:id") {
-		action: [
+		action:
+		[
 				GET: "getDevice"
 		]
 	}
 	path("/update/:id") {
-		action: [
+		action:
+		[
 				PUT: "updateDevice"
 		]
 	}
 	path("/subscription/:id") {
-		action: [
-				POST: "registerDeviceChange",
+		action:
+		[
+				POST  : "registerDeviceChange",
 				DELETE: "unregisterDeviceChange"
 		]
 	}
@@ -139,7 +145,7 @@ def registerSubscriptions() {
 def registerChangeHandler(myList) {
 	myList.each { myDevice ->
 		def theAtts = myDevice.supportedAttributes
-		theAtts.each {att ->
+		theAtts.each { att ->
 			subscribe(myDevice, att.name, eventHandler)
 			log.info "Registering ${myDevice.displayName}.${att.name}"
 		}
@@ -151,7 +157,7 @@ def registerDeviceChange() {
 	def myDevice = findDevice(params.id)
 	def theAtts = myDevice.supportedAttributes
 	try {
-		theAtts.each {att ->
+		theAtts.each { att ->
 			subscribe(myDevice, att.name, eventHandler)
 			log.info "Registering ${myDevice.displayName}.${att.name}"
 		}
@@ -180,20 +186,16 @@ def eventHandler(evt) {
 	def evt_name = evt.name
 	def evt_device = evt.device
 	def evt_deviceType = getDeviceType(evt_device);
-	def deviceInfo
-
-	if(evt_deviceType == "thermostat")
-	{
-		deviceInfo = [name: evt_device.displayName, id: evt_device.id, status:evt_device.getStatus(), deviceType:evt_deviceType, manufacturer:evt_device.getManufacturerName(), model:evt_device.getModelName(), attributes: deviceAttributeList(evt_device), locationMode: getLocationModeInfo()]
-	}
-	else
-	{
-		deviceInfo = [name: evt_device.displayName, id: evt_device.id, status:evt_device.getStatus(), deviceType:evt_deviceType, manufacturer:evt_device.getManufacturerName(), model:evt_device.getModelName(), attributes: deviceAttributeList(evt_device)]
-	}
-
 	def params = [
-			uri: "${state.endpointURL}/${state.connectionId}",
-			body: [ deviceInfo ]
+			uri : "${state.endpointURL}/${state.connectionId}",
+			body: [
+					name        : evt_device.displayName,
+					id          : evt_device.id,
+					deviceType  : evt_deviceType,
+					manufacturer: evt_device.getManufacturerName(),
+					model       : evt_device.getModelName(),
+					attributes  : deviceAttributeList(evt_device)
+			]
 	]
 	try {
 		log.trace "POST URI: ${params.uri}"
@@ -228,13 +230,10 @@ def getDevices() {
 	def deviceData = []
 	inputs?.each {
 		def deviceType = getDeviceType(it)
-		if(deviceType == "thermostat")
-		{
-			deviceData << [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-		}
-		else
-		{
-			deviceData << [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it)]
+		if (deviceType == "thermostat") {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+		} else {
+			deviceData << [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
 		}
 	}
 
@@ -247,13 +246,10 @@ def getDevice() {
 	def it = findDevice(params.id)
 	def deviceType = getDeviceType(it)
 	def device
-	if(deviceType == "thermostat")
-	{
-		device = [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
-	}
-	else
-	{
-		device = [name: it.displayName, id: it.id, status:it.getStatus(), deviceType:deviceType, manufacturer:it.getManufacturerName(), model:it.getModelName(), attributes: deviceAttributeList(it)]
+	if (deviceType == "thermostat") {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it), locationMode: getLocationModeInfo()]
+	} else {
+		device = [name: it.displayName, id: it.id, deviceType: deviceType, manufacturer: it.getManufacturerName(), model: it.getModelName(), attributes: deviceAttributeList(it)]
 	}
 	log.debug "getDevice, return: ${device}"
 	return device
@@ -265,18 +261,18 @@ void updateDevice() {
 	request.JSON.each {
 		def command = it.key
 		def value = it.value
-		if (command){
+		if (command) {
 			def commandList = mapDeviceCommands(command, value)
 			command = commandList[0]
 			value = commandList[1]
 
 			if (command == "setAwayMode") {
 				log.info "Setting away mode to ${value}"
-				if (location.modes?.find {it.name == value}) {
+				if (location.modes?.find { it.name == value }) {
 					location.setMode(value)
 				}
-			}else if (command == "thermostatSetpoint"){
-				switch(device.currentThermostatMode){
+			} else if (command == "thermostatSetpoint") {
+				switch (device.currentThermostatMode) {
 					case "cool":
 						log.info "Update: ${device.displayName}, [${command}, ${value}]"
 						device.setCoolingSetpoint(value)
@@ -290,7 +286,7 @@ void updateDevice() {
 						httpError(501, "this mode: ${device.currentThermostatMode} does not allow changing thermostat setpoint.")
 						break
 				}
-			}else if (!device) {
+			} else if (!device) {
 				log.error "updateDevice, Device not found"
 				httpError(404, "Device not found")
 			} else if (!device.hasCommand(command)) {
@@ -300,11 +296,11 @@ void updateDevice() {
 				if (command == "setColor") {
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(hex: value)
-				} else if(value.isNumber()) {
+				} else if (value.isNumber()) {
 					def intValue = value as Integer
 					log.info "Update: ${device.displayName}, [${command}, ${intValue}(int)]"
 					device."$command"(intValue)
-				} else if (value){
+				} else if (value) {
 					log.info "Update: ${device.displayName}, [${command}, ${value}]"
 					device."$command"(value)
 				} else {
@@ -326,28 +322,19 @@ private getLocationModeInfo() {
 //Map each device to a type given it's capabilities
 private getDeviceType(device) {
 	def deviceType
-	def capabilities = device.capabilities
-	log.debug "capabilities: [${device}, ${capabilities}]"
+	def caps = device.capabilities
+	log.debug "capabilities: [${device}, ${caps}]"
 	log.debug "supported commands: [${device}, ${device.supportedCommands}]"
-
-	//Loop through the device capability list to determine the device type.
-	capabilities.each {capability ->
-		switch(capability.name.toLowerCase())
-		{
+	caps.each {
+		switch (it.name.toLowerCase()) {
 			case "switch":
 				deviceType = "switch"
-
-				//If the device also contains "Switch Level" capability, identify it as a "light" device.
-				if (capabilities.any{it.name.toLowerCase() == "switch level"}){
-
-					//If the device also contains "Power Meter" capability, identify it as a "dimmerSwitch" device.
-					if (capabilities.any{it.name.toLowerCase() == "power meter"}){
-						deviceType = "dimmerSwitch"
-						return deviceType
-					} else {
-						deviceType = "light"
-						return deviceType
-					}
+				if (caps.any { it.name.toLowerCase() == "power meter" }) {
+					return deviceType
+				}
+				if (caps.any { it.name.toLowerCase() == "switch level" }) {
+					deviceType = "light"
+					return deviceType
 				}
 				break
 			case "contact sensor":
@@ -388,16 +375,16 @@ private findDevice(deviceId) {
 
 //Return a list of device attributes
 private deviceAttributeList(device) {
-	device.supportedAttributes.collectEntries { attribute->
+	device.supportedAttributes.collectEntries { attribute ->
 		try {
-			[ (attribute.name): device.currentValue(attribute.name) ]
-		} catch(e) {
-			[ (attribute.name): null ]
+			[(attribute.name): device.currentValue(attribute.name)]
+		} catch (e) {
+			[(attribute.name): null]
 		}
 	}
 }
 
-//Map device command and value. 
+//Map device command and value.
 //input command and value are from UWP,
 //returns resultCommand and resultValue that corresponds with function and value in SmartApps
 private mapDeviceCommands(command, value) {
@@ -427,7 +414,7 @@ private mapDeviceCommands(command, value) {
 			resultCommand = "setSaturation"
 			resultValue = value
 			break
-		case "colorTemperature":
+		case "ct":
 			resultCommand = "setColorTemperature"
 			resultValue = value
 			break
@@ -464,8 +451,7 @@ private mapDeviceCommands(command, value) {
 			if (value == 1 || value == "1" || value == "lock") {
 				resultCommand = "lock"
 				resultValue = ""
-			}
-			else if (value == 0 || value == "0" || value == "unlock") {
+			} else if (value == 0 || value == "0" || value == "unlock") {
 				resultCommand = "unlock"
 				resultValue = ""
 			}
@@ -474,5 +460,6 @@ private mapDeviceCommands(command, value) {
 			break
 	}
 
-	return [resultCommand,resultValue]
+	return [resultCommand, resultValue]
 }
+

smartapps/shabbatholidaymode/shabbat-and-holiday-modes.src/shabbat-and-holiday-modes.groovy

@@ -30,7 +30,7 @@ preferences {
 		input "havdalahOffset", "number", title: "Minutes After Sundown", required:true
 	} 
 	section("Your ZipCode") {
-		input "zipcode", "text", title: "ZipCode", required:true
+		input "zipcode", "number", title: "ZipCode", required:true
 	}
     section( "Notifications" ) {
         input "sendPushMessage", "enum", title: "Send a push notification?", metadata:[values:["Yes","No"]], required:false
@@ -205,4 +205,4 @@ if ( sendPushMessage != "No" ) {
         log.debug( "sending text message" )
         sendSms( phone, msg )
     }
-}//END def sendMessage(msg)
+}//END def sendMessage(msg)

smartapps/teapps/turn-off.src/turn-off.groovy

@@ -0,0 +1,82 @@
+/**
+ *  Turn Off
+ *
+ *  Copyright 2017 Trevor
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License. You may obtain a copy of the License at:
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
+ *  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
+ *  for the specific language governing permissions and limitations under the License.
+ *
+ */
+definition(
+    name: "Turn Off",
+    namespace: "TEAPPS",
+    author: "Trevor",
+    description: "Turn off a light after its been turned on.",
+    category: "Convenience",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png")
+
+
+preferences {
+	    
+    section("Lights") {
+    	input "lights", "capability.switch", required: true, title: "Which lights to turn off after being turned on?", multiple: true
+        input "offsetHours", "number", title: "How long until the light is turned off (hours)?"
+        input "offsetMinutes", "number", title: "How long until the light is turned off (minutes)?"
+        input "offsetSeconds", "number", title: "How long until the light is turned off (seconds)?"
+    }    
+ 
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {
+	// TODO: subscribe to attributes, devices, locations, etc.
+    
+    //Subscribe to the light device being turned on
+    subscribe(lights, "switch.on", lightHandler)
+    
+
+}
+
+// TODO: implement event handlers
+def lightHandler(evt) {
+
+  if("on" == evt.value)
+    //Light was turned on
+    log.debug "Light is in ${evt.value} state"
+    
+    //Get the date and time
+    def currentTime = new Date()
+
+    //Calculate the offset
+    def timeToTurnOff = new Date(currentTime.time + (offsetHours * 60 * 60 * 1000) + (offsetMinutes * 60 * 1000) + (offsetSeconds * 1000))
+
+    log.debug "Scheduling for: $timeToTurnOff"
+
+    //Schedule this to run one time
+    runOnce(timeToTurnOff, turnOff)
+}
+
+def turnOff() {
+    log.debug "turning off lights"
+    lights.off()
+}