MSA-881: Provides an easy way of automatically turn lights on for a set period of time (in Minutes) and can also utilise sunset and sunrise to only operate whilst it is dark out.

devicetypes/osotech/plantlink.src/plantlink.groovy

@@ -120,7 +120,7 @@ def setInstallSmartApp(value){
 }
 
 def parse(String description) {
-	log.debug description
+
 	def description_map = parseDescriptionAsMap(description)
     def event_name = ""
     def measurement_map = [
@@ -129,7 +129,10 @@ def parse(String description) {
             zigbeedeviceid: device.zigbeeId,
             created: new Date().time /1000 as int
     ]
-    if (description_map.cluster == "0001"){
+    if (description_map.cluster == "0000"){
+    	/* version number, not used */
+        
+    } else if (description_map.cluster == "0001"){
         /* battery voltage in mV (device needs minimium 2.1v to run) */
         log.debug "PlantLink - id ${device.zigbeeId} battery ${description_map.value}"
         event_name = "battery_status"
@@ -155,10 +158,6 @@ def parse(String description) {
 def parseDescriptionAsMap(description) {
     (description - "read attr - ").split(",").inject([:]) { map, param ->
         def nameAndValue = param.split(":")
-        if(nameAndValue.length == 2){
         map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-        }else{
-        	map += []
-        }
     }
 }

devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy

@@ -22,6 +22,10 @@ metadata {
 		capability "Polling"
 	}
 
+	simulator {
+		// TODO: define status and reply messages here
+	}
+
 	tiles {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
@@ -52,12 +56,16 @@ metadata {
 }
 
 def refresh() {
-	log.debug "refresh called"
+	log.debug "refresh..."
 	poll()
 }
 
 void poll() {
 	log.debug "Executing 'poll' using parent SmartApp"
-	parent.pollChild(this)
-
+	parent.pollChildren(this)
+}
+
+//generate custom mobile activity feeds event
+def generateActivityFeedsEvent(notificationMessage) {
+	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
 }

devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy

@@ -19,11 +19,9 @@ metadata {
 	definition (name: "Ecobee Thermostat", namespace: "smartthings", author: "SmartThings") {
 		capability "Actuator"
 		capability "Thermostat"
-		capability "Temperature Measurement"
 		capability "Polling"
 		capability "Sensor"
         capability "Refresh"
-		capability "Relative Humidity Measurement"
 
         command "generateEvent"
         command "raiseSetpoint"
@@ -33,13 +31,10 @@ metadata {
 
         attribute "thermostatSetpoint","number"
         attribute "thermostatStatus","string"
-		attribute "maxHeatingSetpoint", "number"
-		attribute "minHeatingSetpoint", "number"
-		attribute "maxCoolingSetpoint", "number"
-		attribute "minCoolingSetpoint", "number"
-		attribute "deviceTemperatureUnit", "number"
 	}
 
+	simulator { }
+
     	tiles {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
@@ -99,11 +94,8 @@ metadata {
 			state "resume", action:"resumeProgram", nextState: "updating", label:'Resume Schedule', icon:"st.samsung.da.oven_ic_send"
 			state "updating", label:"Working", icon: "st.secondary.secondary"
 		}
-		valueTile("humidity", "device.humidity", decoration: "flat") {
-			state "humidity", label:'${currentValue}% humidity'
-		}
 		main "temperature"
-		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "resumeProgram", "refresh", "humidity"])
+		details(["temperature", "upButtonControl", "thermostatSetpoint", "currentStatus", "downButtonControl", "mode", "resumeProgram", "refresh"])
 	}
 
 	preferences {
@@ -115,6 +107,8 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parsing '${description}'"
+	// TODO: handle '' attribute
+
 }
 
 def refresh() {
@@ -141,22 +135,14 @@ def generateEvent(Map results) {
 			def event = [name: name, linkText: linkText, descriptionText: getThermostatDescriptionText(name, value, linkText),
 			handlerName: name]
 
-			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint" ) {
-				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
+			if (name=="temperature" || name=="heatingSetpoint" || name=="coolingSetpoint") {
+				def sendValue = value? convertTemperatureIfNeeded(value.toDouble(), "F", 1): value //API return temperature value in F
 				isChange = isTemperatureStateChange(device, name, value.toString())
 				isDisplayed = isChange
 				event << [value: sendValue, isStateChange: isChange, displayed: isDisplayed]
-			}  else if (name=="maxCoolingSetpoint" || name=="minCoolingSetpoint" || name=="maxHeatingSetpoint" || name=="minHeatingSetpoint") {
-				def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-				sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-				event << [value: sendValue, displayed: false]
 			} else if (name=="heatMode" || name=="coolMode" || name=="autoMode" || name=="auxHeatMode"){
 				isChange = isStateChange(device, name, value.toString())
 				event << [value: value.toString(), isStateChange: isChange, displayed: false]
-			}  else if (name=="humidity") {
-				isChange = isStateChange(device, name, value.toString())
-				event << [value: value.toString(), isStateChange: isChange, displayed: false, unit: "%"]
 			}  else {
 				isChange = isStateChange(device, name, value.toString())
 				isDisplayed = isChange
@@ -172,19 +158,13 @@ def generateEvent(Map results) {
 //return descriptionText to be shown on mobile activity feed
 private getThermostatDescriptionText(name, value, linkText) {
 	if(name == "temperature") {
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "$linkText temperature is $sendValue ${location.temperatureScale}"
+		return "$linkText temperature is $value°F"
 
 	} else if(name == "heatingSetpoint") {
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "heating setpoint is $sendValue ${location.temperatureScale}"
+		return "heating setpoint is $value°F"
 
 	} else if(name == "coolingSetpoint"){
-		def sendValue = convertTemperatureIfNeeded(value.toDouble(), "F", 1) //API return temperature value in F
-		sendValue =  location.temperatureScale == "C"? roundC(sendValue) : sendValue
-		return "cooling setpoint is $sendValue ${location.temperatureScale}"
+		return "cooling setpoint is $value°F"
 
 	} else if (name == "thermostatMode") {
 		return "thermostat mode is ${value}"
@@ -192,26 +172,26 @@ private getThermostatDescriptionText(name, value, linkText) {
 	} else if (name == "thermostatFanMode") {
 		return "thermostat fan mode is ${value}"
 
-	} else if (name == "humidity") {
-		return "humidity is ${value} %"
 	} else {
 		return "${name} = ${value}"
 	}
 }
 
 void setHeatingSetpoint(setpoint) {
-	log.debug "***heating setpoint $setpoint"
-	def heatingSetpoint = setpoint.toDouble()
+	setHeatingSetpoint(setpoint.toDouble())
+}
+
+void setHeatingSetpoint(Double setpoint) {
+//    def mode = device.currentValue("thermostatMode")
+	def heatingSetpoint = setpoint
 	def coolingSetpoint = device.currentValue("coolingSetpoint").toDouble()
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint").toDouble()
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint").toDouble()
 
 	//enforce limits of heatingSetpoint
-	if (heatingSetpoint > maxHeatingSetpoint) {
-		heatingSetpoint = maxHeatingSetpoint
-	} else if (heatingSetpoint < minHeatingSetpoint) {
-		heatingSetpoint = minHeatingSetpoint
+	if (heatingSetpoint > 79) {
+		heatingSetpoint = 79
+	} else if (heatingSetpoint < 45) {
+		heatingSetpoint = 45
 	}
 
 	//enforce limits of heatingSetpoint vs coolingSetpoint
@@ -221,34 +201,32 @@ void setHeatingSetpoint(setpoint) {
 
 	log.debug "Sending setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
 		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
 		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setHeatingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
 	} else {
-		log.error "Error setHeatingSetpoint(setpoint)"
+		log.error "Error setHeatingSetpoint(setpoint)" //This error is handled by the connect app
 	}
 }
 
 void setCoolingSetpoint(setpoint) {
-	log.debug "***cooling setpoint $setpoint"
+	setCoolingSetpoint(setpoint.toDouble())
+}
+
+void setCoolingSetpoint(Double setpoint) {
+//    def mode = device.currentValue("thermostatMode")
 	def heatingSetpoint = device.currentValue("heatingSetpoint").toDouble()
-	def coolingSetpoint = setpoint.toDouble()
+	def coolingSetpoint = setpoint
 	def deviceId = device.deviceNetworkId.split(/\./).last()
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint").toDouble()
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint").toDouble()
 
-
-	if (coolingSetpoint > maxCoolingSetpoint) {
-		coolingSetpoint = maxCoolingSetpoint
-	} else if (coolingSetpoint < minCoolingSetpoint) {
-		coolingSetpoint = minCoolingSetpoint
+	if (coolingSetpoint > 92) {
+		coolingSetpoint = 92
+	} else if (coolingSetpoint < 65) {
+		coolingSetpoint = 65
 	}
 
 	//enforce limits of heatingSetpoint vs coolingSetpoint
@@ -258,18 +236,15 @@ void setCoolingSetpoint(setpoint) {
 
 	log.debug "Sending setCoolingSetpoint> coolingSetpoint: ${coolingSetpoint}, heatingSetpoint: ${heatingSetpoint}"
 
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(coolingSetpoint) : coolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(heatingSetpoint) : heatingSetpoint
-
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
+	if (parent.setHold (this, heatingSetpoint,  coolingSetpoint, deviceId, sendHoldType)) {
 		sendEvent("name":"heatingSetpoint", "value":heatingSetpoint)
 		sendEvent("name":"coolingSetpoint", "value":coolingSetpoint)
 		log.debug "Done setCoolingSetpoint>> coolingSetpoint = ${coolingSetpoint}, heatingSetpoint = ${heatingSetpoint}"
 		generateSetpointEvent()
 		generateStatusEvent()
 	} else {
-		log.error "Error setCoolingSetpoint(setpoint)"
+		log.error "Error setCoolingSetpoint(setpoint)" //This error is handled by the connect app
 	}
 }
 
@@ -473,21 +448,25 @@ def auto() {
 def fanOn() {
 	log.debug "fanOn"
 //    parent.setFanMode (this,"on")
+
 }
 
 def fanAuto() {
 	log.debug "fanAuto"
 //    parent.setFanMode (this,"auto")
+
 }
 
 def fanCirculate() {
 	log.debug "fanCirculate"
 //    parent.setFanMode (this,"circulate")
+
 }
 
 def fanOff() {
 	log.debug "fanOff"
 //    parent.setFanMode (this,"off")
+
 }
 
 def generateSetpointEvent() {
@@ -497,41 +476,20 @@ def generateSetpointEvent() {
 	def mode = device.currentValue("thermostatMode")
 	log.debug "Current Mode = ${mode}"
 
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
 	log.debug "Heating Setpoint = ${heatingSetpoint}"
 
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
 	log.debug "Cooling Setpoint = ${coolingSetpoint}"
 
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
-
-	if(location.temperatureScale == "C")
-	{
-		maxHeatingSetpoint = roundC(maxHeatingSetpoint)
-		maxCoolingSetpoint = roundC(maxCoolingSetpoint)
-		minHeatingSetpoint = roundC(minHeatingSetpoint)
-		minCoolingSetpoint = roundC(minCoolingSetpoint)
-		heatingSetpoint = roundC(heatingSetpoint)
-		coolingSetpoint = roundC(coolingSetpoint)
-	}
-
-	sendEvent("name":"maxHeatingSetpoint", "value":maxHeatingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"maxCoolingSetpoint", "value":maxCoolingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"minHeatingSetpoint", "value":minHeatingSetpoint, "unit":location.temperatureScale)
-	sendEvent("name":"minCoolingSetpoint", "value":minCoolingSetpoint, "unit":location.temperatureScale)
-
-
 	if (mode == "heat") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint )
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())
 
 	}
 	else if (mode == "cool") {
 
-		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":coolingSetpoint.toString())
 
 	} else if (mode == "auto") {
 
@@ -541,9 +499,9 @@ def generateSetpointEvent() {
 
 		sendEvent("name":"thermostatSetpoint", "value":"Off")
 
-	} else if (mode == "auxHeatOnly") {
+	} else if (mode == "emergencyHeat") {
 
-		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint)
+		sendEvent("name":"thermostatSetpoint", "value":heatingSetpoint.toString())
 
 	}
 
@@ -552,30 +510,26 @@ def generateSetpointEvent() {
 void raiseSetpoint() {
 	def mode = device.currentValue("thermostatMode")
 	def targetvalue
-	def maxHeatingSetpoint = device.currentValue("maxHeatingSetpoint")
-	def maxCoolingSetpoint = device.currentValue("maxCoolingSetpoint")
-
 
 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow raiseSetpoint"
 	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint")
-		def coolingSetpoint = device.currentValue("coolingSetpoint")
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
+		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
 		log.debug "raiseSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
 
 		if (device.latestState('thermostatSetpoint')) {
-			targetvalue = device.latestState('thermostatSetpoint').value
-			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+			targetvalue = device.latestState('thermostatSetpoint').value as Integer
 		} else {
 			targetvalue = 0
 		}
-		targetvalue = location.temperatureScale == "F"? targetvalue + 1 : targetvalue + 0.5
+		targetvalue = targetvalue + 1
 
-		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue > maxHeatingSetpoint) {
-			targetvalue = maxHeatingSetpoint
-		} else if (mode == "cool" && targetvalue > maxCoolingSetpoint) {
-			targetvalue = maxCoolingSetpoint
+		if (mode == "heat" && targetvalue > 79) {
+			targetvalue = 79
+		} else if (mode == "cool" && targetvalue > 92) {
+			targetvalue = 92
 		}
 
 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
@@ -589,29 +543,25 @@ void raiseSetpoint() {
 void lowerSetpoint() {
 	def mode = device.currentValue("thermostatMode")
 	def targetvalue
-	def minHeatingSetpoint = device.currentValue("minHeatingSetpoint")
-	def minCoolingSetpoint = device.currentValue("minCoolingSetpoint")
-
 
 	if (mode == "off" || mode == "auto") {
 		log.warn "this mode: $mode does not allow lowerSetpoint"
 	} else {
-		def heatingSetpoint = device.currentValue("heatingSetpoint")
-		def coolingSetpoint = device.currentValue("coolingSetpoint")
-		def thermostatSetpoint = device.currentValue("thermostatSetpoint")
+		def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+		def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+		def thermostatSetpoint = device.currentValue("thermostatSetpoint").toInteger()
 		log.debug "lowerSetpoint() mode = ${mode}, heatingSetpoint: ${heatingSetpoint}, coolingSetpoint:${coolingSetpoint}, thermostatSetpoint:${thermostatSetpoint}"
 		if (device.latestState('thermostatSetpoint')) {
-			targetvalue = device.latestState('thermostatSetpoint').value
-			targetvalue = location.temperatureScale == "F"? targetvalue.toInteger() : targetvalue.toDouble()
+			targetvalue = device.latestState('thermostatSetpoint').value as Integer
 		} else {
 			targetvalue = 0
 		}
-		targetvalue = location.temperatureScale == "F"? targetvalue - 1 : targetvalue - 0.5
+		targetvalue = targetvalue - 1
 
-		if ((mode == "heat" || mode == "auxHeatOnly") && targetvalue < minHeatingSetpoint) {
-			targetvalue = minHeatingSetpoint
-		} else if (mode == "cool" && targetvalue < minCoolingSetpoint) {
-			targetvalue = minCoolingSetpoint
+		if (mode == "heat" && targetvalue.toInteger() < 45) {
+			targetvalue = 45
+		} else if (mode == "cool" && targetvalue.toInteger() < 65) {
+			targetvalue = 65
 		}
 
 		sendEvent("name":"thermostatSetpoint", "value":targetvalue, displayed: false)
@@ -625,15 +575,15 @@ void lowerSetpoint() {
 void alterSetpoint(temp) {
 
 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
 	def deviceId = device.deviceNetworkId.split(/\./).last()
 
 	def targetHeatingSetpoint
 	def targetCoolingSetpoint
 
 	//step1: check thermostatMode, enforce limits before sending request to cloud
-	if (mode == "heat" || mode == "auxHeatOnly"){
+	if (mode == "heat"){
 		if (temp.value > coolingSetpoint){
 			targetHeatingSetpoint = temp.value
 			targetCoolingSetpoint = temp.value
@@ -652,22 +602,19 @@ void alterSetpoint(temp) {
 		}
 	}
 
-	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to $targetHeatingSetpoint " +
-			"coolingSetpoint to $targetCoolingSetpoint with holdType : ${holdType}"
+	log.debug "alterSetpoint >> in mode ${mode} trying to change heatingSetpoint to ${targetHeatingSetpoint} " +
+			"coolingSetpoint to ${targetCoolingSetpoint} with holdType : ${holdType}"
 
 	def sendHoldType = holdType ? (holdType=="Temporary")? "nextTransition" : (holdType=="Permanent")? "indefinite" : "indefinite" : "indefinite"
-
-	def coolingValue = location.temperatureScale == "C"? convertCtoF(targetCoolingSetpoint) : targetCoolingSetpoint
-	def heatingValue = location.temperatureScale == "C"? convertCtoF(targetHeatingSetpoint) : targetHeatingSetpoint
-
-	if (parent.setHold(this, heatingValue, coolingValue, deviceId, sendHoldType)) {
-		sendEvent("name": "thermostatSetpoint", "value": temp.value, displayed: false)
+	//step2: call parent.setHold to send http request to 3rd party cloud
+	if (parent.setHold(this, targetHeatingSetpoint, targetCoolingSetpoint, deviceId, sendHoldType)) {
+		sendEvent("name": "thermostatSetpoint", "value": temp.value.toString(), displayed: false)
 		sendEvent("name": "heatingSetpoint", "value": targetHeatingSetpoint)
 		sendEvent("name": "coolingSetpoint", "value": targetCoolingSetpoint)
 		log.debug "alterSetpoint in mode $mode succeed change setpoint to= ${temp.value}"
 	} else {
 		log.error "Error alterSetpoint()"
-		if (mode == "heat" || mode == "auxHeatOnly"){
+		if (mode == "heat"){
 			sendEvent("name": "thermostatSetpoint", "value": heatingSetpoint.toString(), displayed: false)
 		} else if (mode == "cool") {
 			sendEvent("name": "thermostatSetpoint", "value": coolingSetpoint.toString(), displayed: false)
@@ -679,9 +626,9 @@ void alterSetpoint(temp) {
 def generateStatusEvent() {
 
 	def mode = device.currentValue("thermostatMode")
-	def heatingSetpoint = device.currentValue("heatingSetpoint")
-	def coolingSetpoint = device.currentValue("coolingSetpoint")
-	def temperature = device.currentValue("temperature")
+	def heatingSetpoint = device.currentValue("heatingSetpoint").toInteger()
+	def coolingSetpoint = device.currentValue("coolingSetpoint").toInteger()
+	def temperature = device.currentValue("temperature").toInteger()
 
 	def statusText
 
@@ -696,14 +643,14 @@ def generateStatusEvent() {
 		if (temperature >= heatingSetpoint)
 			statusText = "Right Now: Idle"
 		else
-			statusText = "Heating to ${heatingSetpoint} ${location.temperatureScale}"
+			statusText = "Heating to ${heatingSetpoint}° F"
 
 	} else if (mode == "cool") {
 
 		if (temperature <= coolingSetpoint)
 			statusText = "Right Now: Idle"
 		else
-			statusText = "Cooling to ${coolingSetpoint} ${location.temperatureScale}"
+			statusText = "Cooling to ${coolingSetpoint}° F"
 
 	} else if (mode == "auto") {
 
@@ -713,7 +660,7 @@ def generateStatusEvent() {
 
 		statusText = "Right Now: Off"
 
-	} else if (mode == "auxHeatOnly") {
+	} else if (mode == "emergencyHeat") {
 
 		statusText = "Emergency Heat"
 
@@ -726,18 +673,7 @@ def generateStatusEvent() {
 	sendEvent("name":"thermostatStatus", "value":statusText, "description":statusText, displayed: true)
 }
 
+//generate custom mobile activity feeds event
 def generateActivityFeedsEvent(notificationMessage) {
 	sendEvent(name: "notificationMessage", value: "$device.displayName $notificationMessage", descriptionText: "$device.displayName $notificationMessage", displayed: true)
 }
-
-def roundC (tempC) {
-	return (Math.round(tempC.toDouble() * 2))/2
-}
-
-def convertFtoC (tempF) {
-	return String.format("%.1f", (Math.round(((tempF - 32)*(5/9)) * 2))/2)
-}
-
-def convertCtoF (tempC) {
-	return (Math.round(tempC * (9/5)) + 32).toInteger()
-}

devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy

@@ -16,7 +16,6 @@ metadata {
 		capability "Water Sensor"
 		capability "Sensor"
 		capability "Battery"
-        capability "Temperature Measurement"
 
 		fingerprint deviceId: "0x2001", inClusters: "0x30,0x9C,0x9D,0x85,0x80,0x72,0x31,0x84,0x86"
 		fingerprint deviceId: "0x2101", inClusters: "0x71,0x70,0x85,0x80,0x72,0x31,0x84,0x86"
@@ -40,29 +39,17 @@ metadata {
 				attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 			}
 		}
-		standardTile("temperatureState", "device.temperature", width: 2, height: 2) {
+		standardTile("temperature", "device.temperature", width: 2, height: 2) {
 			state "normal", icon:"st.alarm.temperature.normal", backgroundColor:"#ffffff"
 			state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#53a7c0"
 			state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#F80000"
-		}
-		valueTile("temperature", "device.temperature", width: 2, height: 2) {
-            state("temperature", label:'${currentValue}°',
-                backgroundColors:[
-                    [value: 31, color: "#153591"],
-                    [value: 44, color: "#1e9cbb"],
-                    [value: 59, color: "#90d2a7"],
-                    [value: 74, color: "#44b621"],
-                    [value: 84, color: "#f1d801"],
-                    [value: 95, color: "#d04e00"],
-                    [value: 96, color: "#bc2323"]
-                ]
-            )
 		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
-		main (["water", "temperatureState"])
-		details(["water", "temperatureState", "temperature", "battery"])
+
+		main (["water", "temperature"])
+		details(["water", "temperature", "battery"])
 	}
 }
 
@@ -128,7 +115,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd)
 		map.descriptionText = "${device.displayName} is ${map.value}"
 	}
 	if(cmd.zwaveAlarmType ==  physicalgraph.zwave.commands.alarmv2.AlarmReport.ZWAVE_ALARM_TYPE_HEAT) {
-		map.name = "temperatureState"
+		map.name = "temperature"
 		if(cmd.zwaveAlarmEvent == 1) { map.value = "overheated"}
 		if(cmd.zwaveAlarmEvent == 2) { map.value = "overheated"}
 		if(cmd.zwaveAlarmEvent == 3) { map.value = "changing temperature rapidly"}
@@ -142,30 +129,17 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd)
 	map
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd)
+def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd)
 {
 	def map = [:]
-	if(cmd.sensorType == 1) {
-		map.name = "temperature"
-        if(cmd.scale == 0) {
-        	map.value = getTemperature(cmd.scaledSensorValue)
-        } else {
-	        map.value = cmd.scaledSensorValue
-        }
-        map.unit = location.temperatureScale
-	}
+	map.name = "water"
+	map.value = cmd.value ? "wet" : "dry"
+	map.descriptionText = "${device.displayName} is ${map.value}"
 	map
 }
 
-def getTemperature(value) {
-	if(location.temperatureScale == "C"){
-		return value
-    } else {
-        return Math.round(celsiusToFahrenheit(value))
-    }
-}
-
 def zwaveEvent(physicalgraph.zwave.Command cmd)
 {
 	log.debug "COMMAND CLASS: $cmd"
 }
+

smartapps/smartthings/ecobee-connect.src/ecobee-connect.groovy

@@ -61,7 +61,7 @@ def authPage() {
 		description = "Click to enter Ecobee Credentials"
 	}
 
-	def redirectUrl = buildRedirectUrl
+	def redirectUrl = buildRedirectUrl //"${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${atomicState.accessToken}"
 	log.debug "RedirectUrl = ${redirectUrl}"
 	// get rid of next button until the user is actually auth'd
 	if (!oauthTokenProvided) {
@@ -103,7 +103,7 @@ def oauthInitUrl() {
 			scope: "smartRead,smartWrite",
 			client_id: smartThingsClientId,
 			state: atomicState.oauthInitState,
-			redirect_uri: callbackUrl
+			redirect_uri: callbackUrl //"https://graph.api.smartthings.com/oauth/callback"
 	]
 
 	redirect(location: "${apiEndpoint}/authorize?${toQueryString(oauthParams)}")
@@ -115,13 +115,14 @@ def callback() {
 	def code = params.code
 	def oauthState = params.state
 
+	//verify oauthState == atomicState.oauthInitState, so the callback corresponds to the authentication request
 	if (oauthState == atomicState.oauthInitState){
 
 		def tokenParams = [
 				grant_type: "authorization_code",
 				code      : code,
 				client_id : smartThingsClientId,
-				redirect_uri: callbackUrl
+				redirect_uri: callbackUrl //"https://graph.api.smartthings.com/oauth/callback"
 		]
 
 		def tokenUrl = "https://www.ecobee.com/home/token?${toQueryString(tokenParams)}"
@@ -258,7 +259,7 @@ def getEcobeeThermostats() {
             } else {
                 log.debug "http status: ${resp.status}"
                 //refresh the auth token
-				if (resp.data.status.code == 14) {
+                if (resp.status == 500 && resp.data.status.code == 14) {
                     log.debug "Storing the failed action to try later"
                     atomicState.action = "getEcobeeThermostats"
                     log.debug "Refreshing your auth_token!"
@@ -316,7 +317,7 @@ def initialize() {
 	def devices = thermostats.collect { dni ->
 		def d = getChildDevice(dni)
 		if(!d) {
-			d = addChildDevice(app.namespace, getChildName(), dni, null, ["label":"${atomicState.thermostats[dni]}" ?: "Ecobee Thermostat"])
+			d = addChildDevice(app.namespace, getChildName(), dni, null, ["label":"Ecobee Thermostat:${atomicState.thermostats[dni]}"])
 			log.debug "created ${d.displayName} with id $dni"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
@@ -327,7 +328,7 @@ def initialize() {
 	def sensors = ecobeesensors.collect { dni ->
 		def d = getChildDevice(dni)
 		if(!d) {
-			d = addChildDevice(app.namespace, getSensorChildName(), dni, null, ["label":"${atomicState.sensors[dni]}" ?:"Ecobee Sensor"])
+			d = addChildDevice(app.namespace, getSensorChildName(), dni, null, ["label":"Ecobee Sensor:${atomicState.sensors[dni]}"])
 			log.debug "created ${d.displayName} with id $dni"
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists"
@@ -356,14 +357,18 @@ def initialize() {
     //send activity feeds to tell that device is connected
     def notificationMessage = "is connected to SmartThings"
     sendActivityFeeds(notificationMessage)
-	atomicState.timeSendPush = null
-	atomicState.reAttempt = 0
+    state.timeSendPush = null
 
 	pollHandler() //first time polling data data from thermostat
 
 	//automatically update devices status every 5 mins
 	runEvery5Minutes("poll")
 
+    //since access_token expires every 2 hours
+    runEvery1Hour("refreshAuthToken")
+
+	atomicState.reAttempt = 0
+
 }
 
 def pollHandler() {
@@ -384,10 +389,18 @@ def pollHandler() {
 def pollChildren(child = null) {
 	def thermostatIdsString = getChildDeviceIdsString()
 	log.debug "polling children: $thermostatIdsString"
-	def data = ""
 
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeExtendedRuntime":"true","includeSettings":"true","includeRuntime":"true","includeSensors":true}}'
 	def result = false
+	// // TODO: test this:
+	//
+	// def jsonRequestBody = toJson([
+	//	selection:[
+	//		selectionType: "thermostats",
+	//		   selectionMatch: getChildDeviceIdsString(),
+	//		   includeRuntime: true
+	//	   ]
+	// ])
 
 	def pollParams = [
 			uri: apiEndpoint,
@@ -398,6 +411,11 @@ def pollChildren(child = null) {
 
 	try{
 		httpGet(pollParams) { resp ->
+
+//            if (resp.data) {
+//                debugEventFromParent(child, "pollChildren(child) >> resp.status = ${resp.status}, resp.data = ${resp.data}")
+//            }
+
 			if(resp.status == 200) {
 				log.debug "poll results returned resp.data ${resp.data}"
 				atomicState.remoteSensors = resp.data.thermostatList.remoteSensors
@@ -408,41 +426,20 @@ def pollChildren(child = null) {
 
 					log.debug "updating dni $dni"
 
-					data = [
+					def data = [
 							coolMode: (stat.settings.coolStages > 0),
 							heatMode: (stat.settings.heatStages > 0),
-							deviceTemperatureUnit: stat.settings.useCelsius,
-							minHeatingSetpoint: (stat.settings.heatRangeLow / 10),
-							maxHeatingSetpoint: (stat.settings.heatRangeHigh / 10),
-							minCoolingSetpoint: (stat.settings.coolRangeLow / 10),
-							maxCoolingSetpoint: (stat.settings.coolRangeHigh / 10),
 							autoMode: stat.settings.autoHeatCoolFeatureEnabled,
 							auxHeatMode: (stat.settings.hasHeatPump) && (stat.settings.hasForcedAir || stat.settings.hasElectric || stat.settings.hasBoiler),
-							temperature: (stat.runtime.actualTemperature / 10),
+							temperature: stat.runtime.actualTemperature / 10,
 							heatingSetpoint: stat.runtime.desiredHeat / 10,
 							coolingSetpoint: stat.runtime.desiredCool / 10,
-							thermostatMode: stat.settings.hvacMode,
-							humidity: stat.runtime.actualHumidity
+							thermostatMode: stat.settings.hvacMode
 					]
-
-					if (location.temperatureScale == "F")
-					{
-						data["temperature"] = data["temperature"] ? Math.round(data["temperature"].toDouble()) : data["temperature"]
-						data["heatingSetpoint"] = data["heatingSetpoint"] ? Math.round(data["heatingSetpoint"].toDouble()) : data["heatingSetpoint"]
-						data["coolingSetpoint"] = data["coolingSetpoint"] ? Math.round(data["coolingSetpoint"].toDouble()) : data["coolingSetpoint"]
-						data["minHeatingSetpoint"] = data["minHeatingSetpoint"] ? Math.round(data["minHeatingSetpoint"].toDouble()) : data["minHeatingSetpoint"]
-						data["maxHeatingSetpoint"] = data["maxHeatingSetpoint"] ? Math.round(data["maxHeatingSetpoint"].toDouble()) : data["maxHeatingSetpoint"]
-						data["minCoolingSetpoint"] = data["minCoolingSetpoint"] ? Math.round(data["minCoolingSetpoint"].toDouble()) : data["minCoolingSetpoint"]
-						data["maxCoolingSetpoint"] = data["maxCoolingSetpoint"] ? Math.round(data["maxCoolingSetpoint"].toDouble()) : data["maxCoolingSetpoint"]
-
-					}
-
-					if (data?.deviceTemperatureUnit == false && location.temperatureScale == "F") {
-						data["deviceTemperatureUnit"] = "F"
-
-					} else {
-						data["deviceTemperatureUnit"] = "C"
-					}
+					data["temperature"] = data["temperature"] ? data["temperature"].toDouble().toInteger() : data["temperature"]
+					data["heatingSetpoint"] = data["heatingSetpoint"] ? data["heatingSetpoint"].toDouble().toInteger() : data["heatingSetpoint"]
+					data["coolingSetpoint"] = data["coolingSetpoint"] ? data["coolingSetpoint"].toDouble().toInteger() : data["coolingSetpoint"]
+//                    debugEventFromParent(child, "Event Data = ${data}")
 
 					collector[dni] = [data:data]
 					return collector
@@ -453,8 +450,9 @@ def pollChildren(child = null) {
 				log.error "polling children & got http status ${resp.status}"
 
 				//refresh the auth token
-				if (resp.data.status.code == 14) {
-					atomicState.action = "pollChildren"
+				if (resp.status == 500 && resp.data.status.code == 14) {
+					log.debug "Storing the failed action to try later"
+					atomicState.action = "pollChildren";
 					log.debug "Refreshing your auth_token!"
 					refreshAuthToken()
 				}
@@ -465,6 +463,7 @@ def pollChildren(child = null) {
 		}
 	} catch(Exception e) {
 		log.debug "___exception polling children: " + e
+//        debugEventFromParent(child, "___exception polling children: " + e)
 		refreshAuthToken()
 	}
 	return result
@@ -477,14 +476,18 @@ def pollChild(child){
 		if (!child.device.deviceNetworkId.startsWith("ecobee_sensor")){
 			if(atomicState.thermostats[child.device.deviceNetworkId] != null) {
 				def tData = atomicState.thermostats[child.device.deviceNetworkId]
+//                debugEventFromParent(child, "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}") //TODO comment
 				log.info "pollChild(child)>> data for ${child.device.deviceNetworkId} : ${tData.data}"
 				child.generateEvent(tData.data) //parse received message from parent
+//            return tData.data
 			} else if(atomicState.thermostats[child.device.deviceNetworkId] == null) {
+//                debugEventFromParent(child, "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling") //TODO comment
 				log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
 				return null
 			}
 		}
 	} else {
+//        debugEventFromParent(child, "ERROR: pollChildren(child) for ${child.device.deviceNetworkId} after polling") //TODO comment
 		log.info "ERROR: pollChildren(child) for ${child.device.deviceNetworkId} after polling"
 		return null
 	}
@@ -510,6 +513,9 @@ def availableModes(child) {
 	{
 		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
 
+		// TODO: flag device as in error state
+		// child.errorState = true
+
 		return null
 	}
 
@@ -536,6 +542,8 @@ def currentMode(child) {
 	if(!tData) {
 		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
 
+		// TODO: flag device as in error state
+		// child.errorState = true
 
 		return null
 	}
@@ -553,12 +561,8 @@ def updateSensorData() {
 				def occupancy = ""
 				it.capability.each {
 					if (it.type == "temperature") {
-						if (location.temperatureScale == "F") {
-							temperature = Math.round(it.value.toDouble() / 10)
-						} else {
-							temperature = convertFtoC(it.value.toDouble() / 10)
-						}
-
+						temperature = it.value as Double
+						temperature = (temperature / 10).toInteger()
 					} else if (it.type == "occupancy") {
 						if(it.value == "true")
 							occupancy = "active"
@@ -571,6 +575,7 @@ def updateSensorData() {
 				if(d) {
 					d.sendEvent(name:"temperature", value: temperature)
 					d.sendEvent(name:"motion", value: occupancy)
+//                    debugEventFromParent(d, "temperature : ${temperature}, motion:${occupancy}")
 				}
 			}
 		}
@@ -636,6 +641,7 @@ private refreshAuthToken() {
 
                             "${atomicState.action}"()
 
+                            //remove saved action
                             atomicState.action = ""
                         }
 
@@ -645,7 +651,7 @@ private refreshAuthToken() {
                     log.debug "refresh failed ${resp.status} : ${resp.status.code}"
                 }
             }
-		} catch (groovyx.net.http.HttpResponseException e) {
+        } catch(Exception e) {
             log.error "refreshAuthToken() >> Error: e.statusCode ${e.statusCode}"
 			def reAttemptPeriod = 300 // in sec
 			if (e.statusCode != 401) { //this issue might comes from exceed 20sec app execution, connectivity issue etc.
@@ -666,9 +672,13 @@ private refreshAuthToken() {
 
 def resumeProgram(child, deviceId) {
 
+//    def thermostatIdsString = getChildDeviceIdsString()
+//    log.debug "resumeProgram children: $thermostatIdsString"
 
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}]}'
+	//, { "type": "sendMessage", "params": { "text": "Setpoint Updated" } }
 	def result = sendJson(jsonRequestBody)
+//    debugEventFromParent(child, "resumeProgram(child) with result ${result}")
 	return result
 }
 
@@ -677,16 +687,27 @@ def setHold(child, heating, cooling, deviceId, sendHoldType) {
 	int h = heating * 10
 	int c = cooling * 10
 
+//    log.debug "setpoints____________ - h: $heating - $h, c: $cooling - $c"
+//    def thermostatIdsString = getChildDeviceIdsString()
 
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"functions": [{ "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": '+sendHoldType+' } } ]}'
+//	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + thermostatIdsString + '","includeRuntime":true},"functions": [{"type": "resumeProgram"}, { "type": "setHold", "params": { "coolHoldTemp": '+c+',"heatHoldTemp": '+h+', "holdType": "indefinite" } } ]}'
 	def result = sendJson(child, jsonRequestBody)
+//    debugEventFromParent(child, "setHold: heating: ${h}, cooling: ${c} with result ${result}")
 	return result
 }
 
 def setMode(child, mode, deviceId) {
+//    def thermostatIdsString = getChildDeviceIdsString()
+//    log.debug "setCoolingSetpoint children: $thermostatIdsString"
+
 	def jsonRequestBody = '{"selection":{"selectionType":"thermostats","selectionMatch":"' + deviceId + '","includeRuntime":true},"thermostat": {"settings":{"hvacMode":"'+"${mode}"+'"}}}'
 
+//    log.debug "Mode Request Body = ${jsonRequestBody}"
+//    debugEvent ("Mode Request Body = ${jsonRequestBody}")
+
 	def result = sendJson(jsonRequestBody)
+//    debugEventFromParent(child, "setMode to ${mode} with result ${result}")
 	return result
 }
 
@@ -703,6 +724,8 @@ def sendJson(child = null, String jsonBody) {
 	try{
 		httpPost(cmdParams) { resp ->
 
+//            debugEventFromParent(child, "sendJson >> resp.status ${resp.status}, resp.data: ${resp.data}")
+
 			if(resp.status == 200) {
 
 				log.debug "updated ${resp.data}"
@@ -718,7 +741,8 @@ def sendJson(child = null, String jsonBody) {
 				debugEvent ("sent Json & got http status ${resp.status} - ${resp.status.code}")
 
 				//refresh the auth token
-				if (resp.status.code == 14) {
+				if (resp.status == 500 && resp.status.code == 14) {
+					//log.debug "Storing the failed action to try later"
 					log.debug "Refreshing your auth_token!"
 					debugEvent ("Refreshing OAUTH Token")
 					refreshAuthToken()
@@ -792,15 +816,3 @@ def sendActivityFeeds(notificationMessage) {
         child.generateActivityFeedsEvent(notificationMessage) //parse received message from parent
     }
 }
-
-def roundC (tempC) {
-	return String.format("%.1f", (Math.round(tempC * 2))/2)
-}
-
-def convertFtoC (tempF) {
-	return String.format("%.1f", (Math.round(((tempF - 32)*(5/9)) * 2))/2)
-}
-
-def convertCtoF (tempC) {
-	return (Math.round(tempC * (9/5)) + 32).toInteger()
-}

smartapps/smartthings/gentle-wake-up.src/gentle-wake-up.groovy

@@ -201,8 +201,8 @@ def completionPage() {
 
 		section("Switches") {
 			input(name: "completionSwitches", type: "capability.switch", title: "Set these switches", description: null, required: false, multiple: true, submitOnChange: true)
-			if (completionSwitches) {
-				input(name: "completionSwitchesState", type: "enum", title: "To", description: null, required: false, multiple: false, options: ["on", "off"], defaultValue: "on")
+			if (completionSwitches || androidClient()) {
+				input(name: "completionSwitchesState", type: "enum", title: "To", description: null, required: false, multiple: false, options: ["on", "off"], style: "segmented", defaultValue: "on")
 				input(name: "completionSwitchesLevel", type: "number", title: "Optionally, Set Dimmer Levels To", description: null, required: false, multiple: false, range: "(0..99)")
 			}
 		}

smartapps/smartthings/hue-connect.src/hue-connect.groovy

@@ -35,12 +35,24 @@ preferences {
 }
 
 def mainPage() {
+	if(canInstallLabs()) {
 		def bridges = bridgesDiscovered()
 		if (state.username && bridges) {
 			return bulbDiscovery()
 		} else {
 			return bridgeDiscovery()
 		}
+	} else {
+		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
+
+To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
+
+		return dynamicPage(name:"bridgeDiscovery", title:"Upgrade needed!", nextPage:"", install:false, uninstall: true) {
+			section("Upgrade") {
+				paragraph "$upgradeNeeded"
+			}
+		}
+	}
 }
 
 def bridgeDiscovery(params=[:])
@@ -753,6 +765,10 @@ private String convertHexToIP(hex) {
 	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
 }
 
+private Boolean canInstallLabs() {
+	return hasAllHubsOver("000.011.00603")
+}
+
 private Boolean hasAllHubsOver(String desiredFirmware) {
 	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
 }

smartapps/smartthings/logitech-harmony-connect.src/logitech-harmony-connect.groovy

@@ -419,11 +419,9 @@ def addDevice() {
         def d = getChildDevice(dni)
         if(!d) {
             def newAction = state.HarmonyActivities.find { it.key == dni }
-            if (newAction) {
             d = addChildDevice("smartthings", "Harmony Activity", dni, null, [label:"${newAction.value} [Harmony Activity]"])
             log.trace "created ${d.displayName} with id $dni"
             poll()
-            }
         } else {
             log.trace "found ${d.displayName} with id $dni already exists"
         }

smartapps/smartthings/notify-me-when.src/i18n/messages.properties

@@ -1,31 +0,0 @@
-'''Acceleration Detected'''.ko=가속화 감지됨
-'''Arrival Of'''.ko=도착
-'''Both Push and SMS?'''.ko=푸시 메시지와 SMS를 모두 사용하시겠습니까?
-'''Button Pushed'''.ko=버튼이 눌렸습니다
-'''Contact Closes'''.ko=접점 닫힘
-'''Contact Opens'''.ko=접점 열림
-'''Departure Of'''.ko=출발
-'''Message Text'''.ko=문자 메시지
-'''Minutes'''.ko=분
-'''Motion Here'''.ko=동작
-'''Phone Number (for SMS, optional)'''.ko=휴대전화 번호(문자 메시지 - 옵션)
-'''Receive notifications when anything happens in your home.'''.ko=집 안에 무슨 일이 일어나면 알림이 전송됩니다.
-'''Smoke Detected'''.ko=연기가 감지되었습니다
-'''Switch Turned Off'''.ko=스위치 꺼짐
-'''Switch Turned On'''.ko=스위치 꺼짐
-'''Choose one or more, when...'''.ko=다음의 경우 하나 이상 선택
-'''Yes'''.ko=예
-'''No'''.ko=아니요
-'''Send this message (optional, sends standard status message if not specified)'''.ko=이 메시지 전송(선택적, 지정되지 않은 경우 표준 상태 메시지를 보냅니다)
-'''Via a push notification and/or an SMS message'''.ko=푸시 알림 및/또는 문자 메시지를 통해
-'''Set for specific mode(s)'''.ko=특정 모드 설정
-'''Tap to set'''.ko=눌러서 설정
-'''Minimum time between messages (optional, defaults to every message)'''.ko=메시지작 간 최소 시간(선택 사항, 모든 메시지의 기본 설정)
-'''If outside the US please make sure to enter the proper country code'''.ko=미국 이외 거주자는 적절한 국가 코드를 입력했는지 확인하십시오
-'''Water Sensor Wet'''.ko=Water Sensor에서 물이 감지되었습니다
-'''{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
-'''{{ triggerEvent.linkText }} has arrived at {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}에 도착했습니다
-'''{{ triggerEvent.linkText }} has left the {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
-'''{{ triggerEvent.linkText }} has left {{ location.name }}'''.ko={{ triggerEvent.linkText }}님이 {{ location.name }}을(를) 떠났습니다
-'''Assign a name'''.ko=이름 배정
-'''Choose Modes'''.ko=모드 선택

smartapps/smartthings/notify-me-when.src/notify-me-when.groovy

@@ -99,55 +99,49 @@ def eventHandler(evt) {
 }
 
 private sendMessage(evt) {
-	String msg = messageText
-	Map options = [:]
-
-	if (!messageText) {
-		msg = defaultText(evt)
-		options = [translatable: true, triggerEvent: evt]
-	}
+	def msg = messageText ?: defaultText(evt)
 	log.debug "$evt.name:$evt.value, pushAndPhone:$pushAndPhone, '$msg'"
 
     if (location.contactBookEnabled) {
-		sendNotificationToContacts(msg, recipients, options)
-	} else {
-		if (!phone || pushAndPhone != 'No') {
-			log.debug 'sending push'
-			options.method = 'push'
-			//sendPush(msg)
+        sendNotificationToContacts(msg, recipients)
+    }
+    else {
+
+        if (!phone || pushAndPhone != "No") {
+            log.debug "sending push"
+            sendPush(msg)
         }
         if (phone) {
-			options.phone = phone
-			log.debug 'sending SMS'
-			//sendSms(phone, msg)
+            log.debug "sending SMS"
+            sendSms(phone, msg)
         }
-		sendNotification(msg, options)
     }
-
 	if (frequency) {
 		state[evt.deviceId] = now()
 	}
 }
 
 private defaultText(evt) {
-	if (evt.name == 'presence') {
-		if (evt.value == 'present') {
+	if (evt.name == "presence") {
+		if (evt.value == "present") {
 			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has arrived at the {{ location.name }}'
+				"$evt.linkText has arrived at the $location.name"
 			}
 			else {
-				'{{ triggerEvent.linkText }} has arrived at {{ location.name }}'
+				"$evt.linkText has arrived at $location.name"
 			}
-		} else {
-			if (includeArticle) {
-				'{{ triggerEvent.linkText }} has left the {{ location.name }}'
 		}
 		else {
-				'{{ triggerEvent.linkText }} has left {{ location.name }}'
+			if (includeArticle) {
+				"$evt.linkText has left the $location.name"
+			}
+			else {
+				"$evt.linkText has left $location.name"
 			}
 		}
-	} else {
-		'{{ triggerEvent.descriptionText }}'
+	}
+	else {
+		evt.descriptionText
 	}
 }
 

smartapps/woody1130/brighten-the-darkness.src/brighten-the-darkness.groovy

@@ -0,0 +1,144 @@
+/**
+ *  Brighten The Darkness
+ *
+ *  Copyright 2016 Michael Wood
+ *
+ *  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: "Brighten The Darkness",
+    namespace: "woody1130",
+    author: "Michael Wood",
+    description: "Turns lights on for X minutes when something happens, with the option to only run after sunset or before sunrise.",
+    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 {
+		 page(name: "whenHappens", title: "When Something Happens",
+         nextPage: "doSomething", uninstall: true){
+	
+			section("When Movement Starts...") {
+				input "motion1", "capability.motionSensor", 
+            	title: "Where?", multiple: true, required: false
+			}
+    		section("Or A Door Opens...") {
+    			input "contactSensors1", "capability.contactSensor",
+            	title: "Open/close sensors", multiple: true, required: false
+    		}
+    }
+    	page(name: "doSomething", title: "Turn On The Lights",
+         nextPage: "nameOfSomeOtherPage", uninstall: true){
+			section("Turn on a light...") {
+				input "switch1", "capability.switch", multiple: true
+			}
+    		section("Time to keep the light on...") {
+    			input "mins", "number", title: "Minutes"
+    		}
+            section("Use Only When Its Dark...") {
+    			input(name: "boolDark", type: "enum", title: "Yes/No", options: ["Yes","No"])
+    		}
+    }
+    
+}
+
+def installed() {
+	log.debug "Installed with settings: ${settings}"
+
+	initialize()
+}
+
+def updated() {
+	log.debug "Updated with settings: ${settings}"
+
+	unsubscribe()
+	initialize()
+}
+
+def initialize() {
+
+	subscribe(motion1, "motion.active", motionActiveHandler)
+    subscribe(contactSensors1, "contact", contactHandler)
+    
+}    
+
+def contactHandler(evt) {
+
+	if("open" == evt.value) {
+    
+    runActions()
+    
+    }
+
+}
+
+def motionActiveHandler(evt) {
+    
+	runActions()
+    
+}
+
+def runActions() {
+
+	if (isItDarkOut()) 
+    	{
+			turnOn()
+    	}
+    	else
+    	{
+    	log.debug("Not Time For Light!!")
+    	}
+
+}
+
+def turnOn() {
+		
+        //Calculate delay till off in seconds
+		log.debug("Turning on...")
+    
+    	//Turn lights on
+		switch1.on()
+    
+    	//Wait and then turn lights off
+    	log.debug("Waiting...")
+    	runIn(60 * mins, timedTurnOff)
+        
+}
+
+def timedTurnOff() {
+
+	log.debug("Turning Off...")
+    switch1.off()
+    
+}
+
+def isItDarkOut() {
+
+	def sunRiseStr = (location.currentValue("sunriseTime"))
+	def sunSetStr = (location.currentValue("sunsetTime"))
+    
+    Date sunRise = new Date().parse("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", sunRiseStr).plus(-1)
+    Date sunSet = new Date().parse("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", sunSetStr).plus(-1)
+    Date now = new Date()
+
+	if ((now < sunRise) || (now > sunSet) || (boolDark == "No")){
+    	
+        return true
+        
+    }
+    else{
+    
+    return false
+    
+    }
+}