MSA-1494: control smart home

MSA-1351: Gideon AI implementation

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

@@ -31,7 +31,8 @@
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD210 PB DB", deviceJoinName: "Yale Push Button Deadbolt Lock"
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD220/240 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
         fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRL210 PB LL", deviceJoinName: "Yale Push Button Lever Lock"
-    }
+	fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRD226/246 TSDB", deviceJoinName: "Yale Touch Screen Deadbolt Lock"
+	}
 
     tiles(scale: 2) {
 		multiAttributeTile(name:"toggle", type:"generic", width:6, height:4){

smartapps/egid/smart-windows.src/smart-windows.groovy

@@ -1,7 +1,7 @@
 /**
  *  Smart Windows
  *	Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!).
- * 
+ *
  *  Copyright 2014 Eric Gideon
  *
  * 	Based in part on the "When it's going to rain" SmartApp by the SmartThings team,
@@ -21,13 +21,18 @@ definition(
 	name: "Smart Windows",
 	namespace: "egid",
 	author: "Eric Gideon",
-	description: "Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!). If you don't use an external temperature device, your zipcode will be used instead.",
+	description: "Compares two temperatures – indoor vs outdoor, for example – then sends an alert if windows are open (or closed!). If you don't use an external temperature device, your location will be used instead.",
 	iconUrl: "https://s3.amazonaws.com/smartthings-device-icons/Home/home9-icn.png",
 	iconX2Url: "https://s3.amazonaws.com/smartthings-device-icons/Home/home9-icn@2x.png"
 )
 
 
 preferences {
+
+  if (!(location.zipCode || ( location.latitude && location.longitude )) && location.channelName == 'samsungtv') {
+		section { paragraph title: "Note:", "Location is required for this SmartApp. Go to 'Location Name' settings to setup your correct location." }
+	}
+
 	section( "Set the temperature range for your comfort zone..." ) {
 		input "minTemp", "number", title: "Minimum temperature"
 		input "maxTemp", "number", title: "Maximum temperature"
@@ -39,9 +44,11 @@ preferences {
 		input "inTemp", "capability.temperatureMeasurement", title: "Indoor"
 		input "outTemp", "capability.temperatureMeasurement", title: "Outdoor (optional)", required: false
 	}
-	section( "Set your location" ) {
-		input "zipCode", "text", title: "Zip code"
-	}
+
+	if (location.channelName != 'samsungtv') {
+		section( "Set your location" ) { input "zipCode", "text", title: "Zip code" }
+  }
+
 	section( "Notifications" ) {
 		input "sendPushMessage", "enum", title: "Send a push notification?", metadata:[values:["Yes","No"]], required:false
 		input "retryPeriod", "number", title: "Minutes between notifications:"
@@ -72,7 +79,7 @@ def temperatureHandler(evt) {
 
 	def currentInTemp = evt.doubleValue
 	def openWindows = sensors.findAll { it?.latestValue("contact") == 'open' }
-	
+
 	log.trace "Temp event: $evt"
 	log.info "In: $currentInTemp; Out: $currentOutTemp"
 
@@ -98,7 +105,7 @@ def temperatureHandler(evt) {
 			if ( currentOutTemp < maxTemp && !openWindows ) {
 				send( "Open some windows to cool down the house! Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )
 			} else if ( currentOutTemp > maxTemp && openWindows ) {
-				send( "It's gotten warmer outside! You should close these windows: ${openWindows.join(', ')}. Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )				
+				send( "It's gotten warmer outside! You should close these windows: ${openWindows.join(', ')}. Currently ${currentInTemp}°F inside and ${currentOutTemp}°F outside." )
 			} else {
 				log.debug "No notifications sent. Everything is in the right place."
 			}
@@ -125,7 +132,11 @@ def temperatureHandler(evt) {
 }
 
 def weatherCheck() {
-	def json = getWeatherFeature("conditions", zipCode)
+	def json 
+	if (location.channelName != 'samsungtv')
+		json = getWeatherFeature("conditions", zipCode)
+	else
+		json = getWeatherFeature("conditions")
 	def currentTemp = json?.current_observation?.temp_f
 
 	if ( currentTemp ) {
@@ -150,4 +161,4 @@ private send(msg) {
 	}
 
 	log.info msg
-}
+}

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

@@ -0,0 +1,253 @@
+/**
+ *  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",
+    namespace: "gideon.api",
+    author: "Braindrain Solutions",
+    description: "Gideon AI Smart app allows you to connect and control all of your SmartThings devices through the Gideon AI 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 AI API", displayLink: "gideon.ai"])
+
+
+preferences {
+	section("Control these switches...") {
+        input "switches", "capability.switch", multiple:true
+    }
+    section("Control these motion sensors...") {
+        input "motions", "capability.motionSensor", multiple:true
+    }
+    section("Control these presence sensors...") {
+    	input "presence_sensors", "capability.presenceSensor", multiple:true
+    }
+    section("Control these outlets...") {
+    	input "outlets", "capability.switch", multiple:true
+    }
+    section("Control these locks...") {
+    	input "locks", "capability.lock", multiple:true
+    }
+    section("Control these locks...") {
+	    input "temperature_sensors", "capability.temperatureMeasurement"
+    }
+}
+
+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(outlet, "energy", outletHandler)
+  	subscribe(outlet, "switch", outletHandler)
+}
+
+// TODO: implement event handlers
+def outletHandler(evt) {
+	log.debug "$outlet.currentEnergy"
+	//TODO call G API  
+}
+
+
+private device(it, type) {
+	it ? [id: it.id, label: it.label, type: type] : null
+}
+
+//API Mapping
+mappings {
+	path("/getalldevices") {
+    action: [
+      			GET: "getAllDevices"
+    		]
+  	}
+	path("/doorlocks/:id/:command") {
+    action: [
+      GET: "updateDoorLock"
+    ]
+  }
+  	path("/doorlocks/:id") {
+    action: [
+      			GET: "getDoorLockStatus"
+    		]
+  	}
+  	path("/tempsensors/:id") {
+    action: [
+      GET: "getTempSensorsStatus"
+    ]
+  }
+  	path("/presences/:id") {
+    action: [
+      GET: "getPresenceStatus"
+    ]
+  }
+  	path("/motions/:id") {
+    action: [
+      GET: "getMotionStatus"
+    ]
+  }
+  	path("/outlets/:id") {
+    action: [
+      GET: "getOutletStatus"
+    ]
+  }
+  	path("/outlets/:id/:command") {
+    action: [
+      GET: "updateOutlet"
+    ]
+  }
+  	path("/switches/:command") {
+    action: [
+      PUT: "updateSwitch"
+    ]
+  }
+}
+
+//API Methods
+def getAllDevices() {
+	def locks_list = locks.collect{device(it,"Lock")}
+    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 temp_list = temperature_sensors.collect{device(it,"Temperature")}
+    return [Locks: locks_list, Presences: presences_list, Motions: motions_list, Outlets: outlets_list, Switches: switches_list, Temperatures: temp_list]
+}
+
+//LOCKS
+def getDoorLockStatus() {
+	def device = locks.find { it.id == params.id }
+    if (!device) {
+            httpError(404, "Device not found")
+        } else {
+        	return [Device_state: device.currentValue('lock')]
+        }
+}
+
+def updateDoorLock() {
+	def command = params.command
+    def device = locks.find { it.id == params.id }
+    if (command){
+        if (!device) {
+            httpError(404, "Device not found")
+        } else {
+            if(command == "toggle")
+            {
+                if(device.currentValue('lock') == "locked")
+                  device.unlock();
+                else
+                  device.lock();
+                  
+                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 {
+        	return [Device_state: device.currentValue('presence')]
+   }
+}
+
+//MOTION
+def getMotionStatus() {
+
+	def device = motions.find { it.id == params.id }
+    if (!device) {
+            httpError(404, "Device not found")
+        } else {
+        	return [Device_state: device.currentValue('motion')]
+   }
+}
+
+//OUTLET
+def getOutletStatus() {
+	
+    def device = outlets.find { it.id == params.id }
+   	if (!device) {
+            httpError(404, "Device not found")
+        } else {
+        	return [Device_state: device.currentSwitch, Current_watt: device.currentValue("energy")]
+  }
+}
+
+def updateOutlet() {
+	
+    def command = params.command
+    def device = outlets.find { it.id == params.id }
+    if (command){
+        if (!device) {
+            httpError(404, "Device not found")
+        } else {
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
+                  
+                return [Device_id: params.id, result_action: "200"]
+            }
+        }
+    }
+}                
+
+//SWITCH
+def updateSwitch() {
+    def command = params.command
+    def device = switches.find { it.id == params.id }
+    if (command){
+        if (!device) {
+            httpError(404, "Device not found")
+        } else {
+            if(command == "toggle")
+            {
+                if(device.currentSwitch == "on")
+                  device.off();
+                else
+                  device.on();
+                  
+                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 {
+        	return [Device_state: device.currentValue('temperature')]
+   }
+}

smartapps/imbrianj/ready-for-rain.src/ready-for-rain.groovy

@@ -18,8 +18,13 @@ definition(
 )
 
 preferences {
-  section("Zip code?") {
-    input "zipcode", "text", title: "Zipcode?"
+
+  if (!(location.zipCode || ( location.latitude && location.longitude )) && location.channelName == 'samsungtv') {
+		section { paragraph title: "Note:", "Location is required for this SmartApp. Go to 'Location Name' settings to setup your correct location." }
+	}
+
+  if (location.channelName != 'samsungtv') {
+		section( "Set your location" ) { input "zipCode", "text", title: "Zip code" }
   }
 
   section("Things to check?") {
@@ -60,7 +65,11 @@ def scheduleCheck(evt) {
   // Only need to poll if we haven't checked in a while - and if something is left open.
   if((now() - (30 * 60 * 1000) > state.lastCheck["time"]) && open) {
     log.info("Something's open - let's check the weather.")
-    def response = getWeatherFeature("forecast", zipcode)
+    def response
+    if (location.channelName != 'samsungtv')
+      response = getWeatherFeature("forecast", zipCode)
+    else
+      response = getWeatherFeature("forecast")
     def weather  = isStormy(response)
 
     if(weather) {

smartapps/juano2310/jawbone-up-connect.src/jawbone-up-connect.groovy

@@ -4,6 +4,9 @@
  *  Author: Juan Risso
  *  Date: 2013-12-19
  */
+
+include 'asynchttp_v1'
+
 definition(
 	name: "Jawbone UP (Connect)",
 	namespace: "juano2310",
@@ -303,7 +306,8 @@ def setup() {
 			  	def childDevice = addChildDevice('juano2310', "Jawbone User", "${app.id}.${member.xid}",null,[name:"Jawbone UP - " + member.first, completedSetup: true])
 			    if (childDevice) {
 			       	log.debug "Child Device Successfully Created"
-			        generateInitialEvent (member, childDevice)
+			        childDevice?.generateSleepingEvent(false)
+                    pollChild(childDevice)
 			    }
 			}
 		}
@@ -349,67 +353,67 @@ def uninstalled() {
 }
 
 def pollChild(childDevice) {
-    def member = state.member
-    generatePollingEvents (member, childDevice)
+		def childMap = [ value: "$childDevice.device.deviceNetworkId}"]
+
+		def params = [
+				uri: 'https://jawbone.com',
+				path: '/nudge/api/users/@me/goals',
+				headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],
+				contentType: 'application/json'
+		]
+
+		asynchttp_v1.get('responseGoals', params, childMap)
+
+		def params2 = [
+				uri: 'https://jawbone.com',
+				path: '/nudge/api/users/@me/moves',
+				headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ],
+				contentType: 'application/json'
+		]
+
+		asynchttp_v1.get('responseMoves', params2, childMap)
 }
 
-def generatePollingEvents (member, childDevice) {
-    // lets figure out if the member is currently "home" (At the place)
-    def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals"
-    def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"
-    def urlsleeps = "https://jawbone.com/nudge/api/users/@me/sleeps"
-    def goals = null
-    def moves = null
- 	def sleeps = null
-    httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
-        goals = response.data.data
-    }
-    httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
-        moves = response.data.data.items[0]
-    }
-
-    try { // we are going to just ignore any errors
-        log.debug "Member = ${member.first}"
-        log.debug "Moves Goal = ${goals.move_steps} Steps"
-        log.debug "Moves = ${moves.details.steps} Steps"
-
-        childDevice?.sendEvent(name:"steps", value: moves.details.steps)
-        childDevice?.sendEvent(name:"goal", value: goals.move_steps)
-    	//setColor(moves.details.steps,goals.move_steps,childDevice)
-    }
-    catch (e) {
-            // eat it
-    }
+def responseGoals(response, dni) {
+	if (response.hasError()) {
+			log.error "response has error: $response.errorMessage"
+	} else {
+			def goals
+			try {
+					// json response already parsed into JSONElement object
+					goals = response.json.data
+			} catch (e) {
+					log.error "error parsing json from response: $e"
+			}
+			if (goals) {
+				def childDevice = getChildDevice(dni.value)
+				log.debug "Goal = ${goals.move_steps} Steps"
+				childDevice?.sendEvent(name:"goal", value: goals.move_steps)
+			} else {
+					log.debug "did not get json results from response body: $response.data"
+			}
+	}
 }
 
-def generateInitialEvent (member, childDevice) {
-    // lets figure out if the member is currently "home" (At the place)
-    def urlgoals = "https://jawbone.com/nudge/api/users/@me/goals"
-    def urlmoves = "https://jawbone.com/nudge/api/users/@me/moves"
-    def urlsleeps = "https://jawbone.com/nudge/api/users/@me/sleeps"
-    def goals = null
-    def moves = null
- 	def sleeps = null
-    httpGet(uri: urlgoals, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
-        goals = response.data.data
-    }
-    httpGet(uri: urlmoves, headers: ["Authorization": "Bearer ${state.JawboneAccessToken}" ]) {response ->
-        moves = response.data.data.items[0]
-    }
-
-    try { // we are going to just ignore any errors
-        log.debug "Member = ${member.first}"
-        log.debug "Moves Goal = ${goals.move_steps} Steps"
-        log.debug "Moves = ${moves.details.steps} Steps"
-        log.debug "Sleeping state = false"
-        childDevice?.generateSleepingEvent(false)
-        childDevice?.sendEvent(name:"steps", value: moves.details.steps)
-        childDevice?.sendEvent(name:"goal", value: goals.move_steps)
-    	//setColor(moves.details.steps,goals.move_steps,childDevice)
-    }
-    catch (e) {
-            // eat it
-    }
+def responseMoves(response, dni) {
+	if (response.hasError()) {
+			log.error "response has error: $response.errorMessage"
+	} else {
+			def moves
+			try {
+					// json response already parsed into JSONElement object
+					moves = response.json.data.items[0]
+			} catch (e) {
+					log.error "error parsing json from response: $e"
+			}
+			if (moves) {
+				def childDevice = getChildDevice(dni.value)
+				log.debug "Moves = ${moves.details.steps} Steps"
+				childDevice?.sendEvent(name:"steps", value: moves.details.steps)
+			} else {
+					log.debug "did not get json results from response body: $response.data"
+			}
+	}
 }
 
 def setColor (steps,goal,childDevice) {
@@ -433,7 +437,7 @@ def hookEventHandler() {
     // get some stuff we need
     def userId = json.events.user_xid[0]
     def	json_type = json.events.type[0]
-	def json_action = json.events.action[0]
+	  def json_action = json.events.action[0]
 
     //log.debug json
     log.debug "Userid = ${userId}"

smartapps/smartthings/severe-weather-alert.src/severe-weather-alert.groovy

@@ -26,17 +26,22 @@ definition(
 )
 
 preferences {
-	section ("In addition to push notifications, send text alerts to...") {
-        input("recipients", "contact", title: "Send notifications to") {
-            input "phone1", "phone", title: "Phone Number 1", required: false
-            input "phone2", "phone", title: "Phone Number 2", required: false
-            input "phone3", "phone", title: "Phone Number 3", required: false
-        }
+
+  if (!(location.zipCode || ( location.latitude && location.longitude )) && location.channelName == 'samsungtv') {
+		section { paragraph title: "Note:", "Location is required for this SmartApp. Go to 'Location Name' settings to setup your correct location." }
 	}
 
-	section ("Zip code (optional, defaults to location coordinates)...") {
-		input "zipcode", "text", title: "Zip Code", required: false
-	}
+  if (location.channelName != 'samsungtv') {
+		section( "Set your location" ) { input "zipCode", "text", title: "Zip code" }
+  }
+
+	section ("In addition to push notifications, send text alerts to...") {
+      input("recipients", "contact", title: "Send notifications to") {
+          input "phone1", "phone", title: "Phone Number 1", required: false
+          input "phone2", "phone", title: "Phone Number 2", required: false
+          input "phone3", "phone", title: "Phone Number 3", required: false
+      }
+	 }
 }
 
 def installed() {
@@ -61,7 +66,7 @@ def checkForSevereWeather() {
 	def alerts
 	if(locationIsDefined()) {
 		if(zipcodeIsValid()) {
-			alerts = getWeatherFeature("alerts", zipcode)?.alerts
+			alerts = getWeatherFeature("alerts", zipCode)?.alerts
 		} else {
 			log.warn "Severe Weather Alert: Invalid zipcode entered, defaulting to location's zipcode"
 			alerts = getWeatherFeature("alerts")?.alerts

smartapps/thehomeremote-homeremote/home-remote.src/home-remote.groovy

@@ -0,0 +1,800 @@
+/**
+ *  Home Remote
+ *
+ *  Copyright 2015 The Home Remote
+ *
+ *  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: "Home Remote",
+    namespace: "thehomeremote.homeremote",
+    author: "The Home Remote",
+    description: "Web service that enables communication between the Home Remote app and a SmartThings hub.",
+    category: "My Apps",
+    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",
+    oauth: [displayName: "The Home Remote", displayLink: "http://thehomeremote.com/"])
+
+
+preferences {
+    section() {
+	input "accelerationSensors", "capability.accelerationSensor",title: "Acceleration Sensors", multiple: true, required: false
+	input "alarms", "capability.alarm",title: "Alarms", multiple: true, required: false
+	input "batteries", "capability.battery",title: "Batteries", multiple: true, required: false
+	input "beacons", "capability.beacon",title: "Beacons", multiple: true, required: false
+	input "buttonGroup", "capability.button",title: "Buttons", multiple: true, required: false
+	input "carbonMonoxideDetectors", "capability.carbonMonoxideDetector",title: "CO Detectors", multiple: true, required: false
+	input "colorControls", "capability.colorControl",title: "Color Lights", multiple: true, required: false
+	input "contactSensors", "capability.contactSensor",title: "Contact Sensors", multiple: true, required: false
+	input "doorControls", "capability.doorControl",title: "Door Controllers", multiple: true, required: false
+	input "energyMeters", "capability.energyMeter",title: "Energy Meters", multiple: true, required: false
+	input "illuminanceMeasurements", "capability.illuminanceMeasurement",title: "Illuminance Sensors", multiple: true, required: false
+	input "imageCaptures", "capability.imageCapture",title: "Cameras", multiple: true, required: false
+	input "locks", "capability.lock",title: "Locks", multiple: true, required: false
+	input "mediaControllers", "capability.mediaController",title: "Media Controllers", multiple: true, required: false
+	input "momentaries", "capability.momentary",title: "Momentary Buttons", multiple: true, required: false
+	input "motionSensors", "capability.motionSensor",title: "Motion Sensors", multiple: true, required: false
+	input "musicPlayers", "capability.musicPlayer",title: "Music Players", multiple: true, required: false
+	input "powerMeters", "capability.powerMeter",title: "Power Meters", multiple: true, required: false
+	input "presenceSensors", "capability.presenceSensor",title: "Presence Sensors", multiple: true, required: false
+	input "relativeHumidityMeasurements", "capability.relativeHumidityMeasurement",title: "Humidity Sensors", multiple: true, required: false
+	input "relaySwitches", "capability.relaySwitch",title: "Relays", multiple: true, required: false
+	input "signalStrengths", "capability.signalStrength",title: "Signal Strengths", multiple: true, required: false
+	input "sleepSensors", "capability.sleepSensor",title: "Sleep Sensors", multiple: true, required: false
+	input "smokeDetectors", "capability.smokeDetector",title: "Smoke Detectors", multiple: true, required: false
+	input "speechSyntheses", "capability.speechSynthesis",title: "Speech Syntheses", multiple: true, required: false
+	input "stepSensors", "capability.stepSensor",title: "Step Sensors", multiple: true, required: false
+	input "switches", "capability.switch",title: "Switches", multiple: true, required: false
+	input "switchLevels", "capability.switchLevel",title: "Dimmers", multiple: true, required: false
+	input "temperatureMeasurements", "capability.temperatureMeasurement",title: "Temperature Sensors", multiple: true, required: false
+	input "thermostats", "capability.thermostat",title: "Thermostats", multiple: true, required: false
+	input "threeAxes", "capability.threeAxis",title: "Three axis Sensors", multiple: true, required: false
+	input "tones", "capability.tone",title: "Tones", multiple: true, required: false
+	input "touchSensors", "capability.touchSensor",title: "Touch Sensors", multiple: true, required: false
+	input "valves", "capability.valve",title: "Valves", multiple: true, required: false
+	input "waterSensors", "capability.waterSensor",title: "Water Sensors", multiple: true, required: false
+    }
+}
+
+mappings {
+  path("/GetCurrentValues") {
+    action: [
+      GET: "getCurrentValues"
+    ]
+  }
+  path("/GetCurrentValuesWithDisplayName") {
+    action: [
+      GET: "getCurrentValuesWithDisplayName"
+    ]
+  }
+  path("/GetRoutines") {
+    action: [
+      GET: "getRoutines"
+    ]
+  }
+  path("/ExecuteCommand") {
+    action: [
+      PUT: "executeCommand"
+    ]
+  }
+  path("/ExecuteRoutine") {
+    action: [
+      PUT: "executeRoutine"
+    ]
+  }
+}
+
+def getCurrentValues() {
+    def resp = []    
+        
+ 	accelerationSensors.each {
+      resp << [id: it.id, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
+    }
+
+	alarms.each {
+      resp << [id: it.id, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
+    }
+
+	batteries.each {
+      resp << [id: it.id, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
+    }
+
+	beacons.each {
+      resp << [id: it.id, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
+    }
+
+	buttonGroup.each {
+      resp << [id: it.id, capability: "Button", attribute: "button", value: it.currentValue("button")]
+    }
+
+	carbonMonoxideDetectors.each {
+      resp << [id: it.id, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
+    }
+
+	contactSensors.each {
+      resp << [id: it.id, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
+    }
+
+	doorControls.each {
+      resp << [id: it.id, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
+    }
+
+	energyMeters.each {
+      resp << [id: it.id, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
+    }
+
+	illuminanceMeasurements.each {
+      resp << [id: it.id, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
+    }
+
+	imageCaptures.each {
+      resp << [id: it.id, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
+    }
+
+	locks.each {
+      resp << [id: it.id, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
+    }
+
+	mediaControllers.each {
+      resp << [id: it.id, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
+    }
+
+	mediaControllers.each {
+      resp << [id: it.id, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
+    }
+
+	motionSensors.each {
+      resp << [id: it.id, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
+    }
+
+	powerMeters.each {
+      resp << [id: it.id, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
+    }
+
+	presenceSensors.each {
+      resp << [id: it.id, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
+    }
+
+	relativeHumidityMeasurements.each {
+      resp << [id: it.id, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
+    }
+
+	relaySwitches.each {
+      resp << [id: it.id, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
+    }
+
+	signalStrengths.each {
+      resp << [id: it.id, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
+    }
+
+	signalStrengths.each {
+      resp << [id: it.id, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
+    }
+
+	sleepSensors.each {
+      resp << [id: it.id, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
+    }
+
+	smokeDetectors.each {
+      resp << [id: it.id, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
+    }
+
+	stepSensors.each {
+      resp << [id: it.id, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
+    }
+
+	stepSensors.each {
+      resp << [id: it.id, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
+    }
+
+	switches.each {
+      resp << [id: it.id, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
+    }
+
+	switchLevels.each {
+      resp << [id: it.id, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
+    }
+
+	temperatureMeasurements.each {
+      resp << [id: it.id, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
+    }
+
+	//Commented out on 7/23/2016.   This randomly started throwing number format exceptions with either my ecobee or Lyric thermostat.
+	//thermostats.each {
+    //  resp << [id: it.id, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
+    //}
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
+    }
+
+	threeAxes.each {
+      resp << [id: it.id, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
+    }
+
+	touchSensors.each {
+      resp << [id: it.id, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
+    }
+
+	valves.each {
+      resp << [id: it.id, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
+    }
+
+	waterSensors.each {
+      resp << [id: it.id, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
+    }
+   
+   	//resp << [id: 0, capability: "Heartbeat", attribute: "heartbeat", value: String.valueOf(state.heartbeat)]
+    
+    state.heartbeat = !state.heartbeat
+    
+    return resp
+}
+
+def getCurrentValuesWithDisplayName() {
+    def resp = []    
+        
+ 	accelerationSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "AccelerationSensor", attribute: "acceleration", value: it.currentValue("acceleration")]
+    }
+
+	alarms.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Alarm", attribute: "alarm", value: it.currentValue("alarm")]
+    }
+
+	batteries.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Battery", attribute: "battery", value: it.currentValue("battery")]
+    }
+
+	beacons.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Beacon", attribute: "presence", value: it.currentValue("presence")]
+    }
+
+	buttonGroup.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Button", attribute: "button", value: it.currentValue("button")]
+    }
+
+	carbonMonoxideDetectors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "CarbonMonoxideDetector", attribute: "carbonMonoxide", value: it.currentValue("carbonMonoxide")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "hue", value: it.currentValue("hue")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "saturation", value: it.currentValue("saturation")]
+    }
+
+	colorControls.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ColorControl", attribute: "color", value: it.currentValue("color")]
+    }
+
+	contactSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ContactSensor", attribute: "contact", value: it.currentValue("contact")]
+    }
+
+	doorControls.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "DoorControl", attribute: "door", value: it.currentValue("door")]
+    }
+
+	energyMeters.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "EnergyMeter", attribute: "energy", value: it.currentValue("energy")]
+    }
+
+	illuminanceMeasurements.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "IlluminanceMeasurement", attribute: "illuminance", value: it.currentValue("illuminance")]
+    }
+
+	imageCaptures.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ImageCapture", attribute: "image", value: it.currentValue("image")]
+    }
+
+	locks.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Lock", attribute: "lock", value: it.currentValue("lock")]
+    }
+
+	mediaControllers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "activities", value: it.currentValue("activities")]
+    }
+
+	mediaControllers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MediaController", attribute: "currentActivity", value: it.currentValue("currentActivity")]
+    }
+
+	motionSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MotionSensor", attribute: "motion", value: it.currentValue("motion")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "status", value: it.currentValue("status")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "level", value: it.currentValue("level")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackDescription", value: it.currentValue("trackDescription")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "trackData", value: it.currentValue("trackData")]
+    }
+
+	musicPlayers.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "MusicPlayer", attribute: "mute", value: it.currentValue("mute")]
+    }
+
+	powerMeters.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "PowerMeter", attribute: "power", value: it.currentValue("power")]
+    }
+
+	presenceSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "PresenceSensor", attribute: "presence", value: it.currentValue("presence")]
+    }
+
+	relativeHumidityMeasurements.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "RelativeHumidityMeasurement", attribute: "humidity", value: it.currentValue("humidity")]
+    }
+
+	relaySwitches.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "RelaySwitch", attribute: "switch", value: it.currentValue("switch")]
+    }
+
+	signalStrengths.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "lqi", value: it.currentValue("lqi")]
+    }
+
+	signalStrengths.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "SignalStrength", attribute: "rssi", value: it.currentValue("rssi")]
+    }
+
+	sleepSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "SleepSensor", attribute: "sleeping", value: it.currentValue("sleeping")]
+    }
+
+	smokeDetectors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "SmokeDetector", attribute: "smoke", value: it.currentValue("smoke")]
+    }
+
+	stepSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "steps", value: it.currentValue("steps")]
+    }
+
+	stepSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "StepSensor", attribute: "goal", value: it.currentValue("goal")]
+    }
+
+	switches.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Switch", attribute: "switch", value: it.currentValue("switch")]
+    }
+
+	switchLevels.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "SwitchLevel", attribute: "level", value: it.currentValue("level")]
+    }
+
+	temperatureMeasurements.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "TemperatureMeasurement", attribute: "temperature", value: it.currentValue("temperature")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "temperature", value: it.currentValue("temperature")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "heatingSetpoint", value: it.currentValue("heatingSetpoint")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "coolingSetpoint", value: it.currentValue("coolingSetpoint")]
+    }
+
+	//Commented out on 7/23/2016.   This randomly started throwing number format exceptions with either my ecobee or Lyric thermostat.
+	//thermostats.each {
+    //  resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatSetpoint", value: it.currentValue("thermostatSetpoint")]
+    //}
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatMode", value: it.currentValue("thermostatMode")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatFanMode", value: it.currentValue("thermostatFanMode")]
+    }
+
+	thermostats.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Thermostat", attribute: "thermostatOperatingState", value: it.currentValue("thermostatOperatingState")]
+    }
+
+	threeAxes.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "ThreeAxis", attribute: "threeAxis", value: it.currentValue("threeAxis")]
+    }
+
+	touchSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "TouchSensor", attribute: "touch", value: it.currentValue("touch")]
+    }
+
+	valves.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Valve", attribute: "contact", value: it.currentValue("contact")]
+    }
+
+	waterSensors.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "WaterSensor", attribute: "water", value: it.currentValue("water")]
+    }
+   
+    momentaries.each {
+      resp << [id: it.id, displayName: it.displayName, capability: "Momentary", attribute: "", value: ""]
+    }
+   
+    //resp << [id: 0, displayName: "Heartbeat", capability: "Heartbeat", attribute: "heartbeat", value: state.heartbeat]
+    
+    return resp
+}
+
+def getDevices(capability){
+
+	def result
+
+	switch (capability) {
+    	case "Alarm":
+        	result = alarms
+        	break
+    	case "ColorControl":
+        	result = colorControls
+        	break
+    	case "DoorControl":
+        	result = doorControls
+        	break
+        case "ImageCapture":
+        	result = imageCaptures
+        	break
+    	case "Lock":
+        	result = locks
+        	break
+        case "MediaController":
+        	result = mediaControllers
+        	break
+    	case "Momentary":
+        	result = momentaries
+        	break
+        case "MusicPlayer":
+        	result = musicPlayers
+        	break
+        case "RelaySwitch":
+        	result = relaySwitches
+        	break
+    	case "SpeechSynthesis":
+        	result = speechSyntheses
+        	break
+    	case "Switch":
+        	result = switches
+        	break
+        case "SwitchLevel":
+        	result = switchLevels
+        	break
+    	case "Thermostat":
+        	result = thermostats
+        	break
+		case "ThermostatCoolingSetpoint":
+        	result = thermostatCoolingSetpoints
+        	break
+    	case "ThermostatFanMode":
+        	result = thermostatFanModes
+        	break
+        case "ThermostatHeatingSetpoint":
+        	result = thermostatHeatingSetpoints
+        	break
+    	case "ThermostatMode":
+        	result = thermostatModes
+        	break
+    	case "Tone":
+        	result = tones
+        	break
+        case "Valve":
+        	result = valves
+        	break     
+    	default:
+        	result = valves
+	}
+	return result
+}
+
+def getDoorControlCommand(value){
+	def result
+	switch (value) {
+        case "closed":
+        	result = "close"
+        	break
+    	case "open":
+        	result = "open"
+        	break
+    	default:
+        	result = value
+	}    
+	return result
+}
+
+def getLockCommand(value){
+	def result
+	switch (value) {
+        case "locked":
+        	result = "lock"
+        	break
+    	case "unlocked":
+        	result = "unlock"
+        	break
+    	default:
+        	result = value
+	}    
+	return result
+}
+
+def getMuteCommand(value){
+	def result
+	switch (value) {
+        case "muted":
+        	result = "mute"
+        	break
+    	case "unmuted":
+        	result = "unmute"
+        	break
+    	default:
+        	result = value
+	}    
+	return result
+}
+
+def getContactCommand(value){
+	def result
+	switch (value) {
+        case "closed":
+        	result = "close"
+        	break
+    	case "open":
+        	result = "open"
+        	break
+    	default:
+        	result = value
+	}    
+	return result
+}
+
+def getRoutines() {
+	return location.helloHome?.getPhrases()*.label
+}
+
+def getThermostatFanModeCommand(value){
+	def result
+	switch (value) {
+        case "on":
+        	result = "fanOn"
+        	break
+    	case "auto":
+        	result = "fanAuto"
+        	break
+    	case "circulate":
+        	result = "fanCirculate"
+        	break
+    	default:
+        	result = value
+	}    
+	return result
+}
+
+void executeCommand() {    
+    def deviceId = request.JSON?.deviceId
+    def capability = request.JSON?.capability
+    def attribute = request.JSON?.attribute 
+    def value = request.JSON?.value    
+    if (deviceId) {
+		def devices = getDevices(capability)
+        def command
+        def valueIsParameter = false
+        def valueIsInteger = false
+        switch (attribute) {    	       	
+        	case "hue":
+        		command = "setHue"
+                valueIsParameter = true
+                valueIsInteger = true
+        		break
+    		case "saturation":
+        		command = "setSaturation"
+                valueIsParameter = true
+                valueIsInteger = true
+        		break
+    		case "color":
+        		command = "setColor"
+                def rgb = hexToRgb(value)
+                def hsl = rgbToHSL(rgb)
+                value = [hue:hsl.h.toInteger(), saturation:hsl.s.toInteger()]
+                valueIsParameter = true				
+        		break
+			case "level":
+        		command = "setLevel"
+                valueIsParameter = true
+                valueIsInteger = true
+        		break            
+        	case "heatingSetpoint":
+        		command = "setHeatingSetpoint"
+                valueIsParameter = true
+        		break    
+       		case "coolingSetpoint":
+        		command = "setCoolingSetpoint"
+                valueIsParameter = true
+        		break
+          	case "currentActivity":
+        		command = "startActivity"
+                valueIsParameter = true
+        		break  
+ 	  		case "door":
+        		command = getDoorControlCommand(value)
+        		break    
+      		case "lock":
+        		command = getLockCommand(value)
+        		break           
+      		case "mute":
+        		command = getMuteCommand(value)
+        		break         
+      		case "thermostatFanMode":
+        		command = getThermostatFanModeCommand(value)
+        		break         
+       		case "thermostatMode":
+        		if (value == "emergency heat") {
+                	command = "emergencyHeat"
+           		}
+                else
+                {
+                    command = value
+                }
+        		break     
+      		case "contact":
+        		command = getContactCommand(value)
+        		break
+    		default:
+        		command = value
+		}
+        devices.each {
+        	if (it.id == deviceId) {
+                // check that the device supports the specified command
+                // If not, return an error using httpError, providing a HTTP status code.
+            	if (!it.hasCommand(command)) {
+                	httpError(501, "$command is not a valid command for the device")
+            	}                
+                if(valueIsParameter){
+                	if(valueIsInteger){
+                		it."$command"(value as int)
+                	}
+                	else{
+                		it."$command"(value)
+                	}   
+                }
+                else{
+                	it."$command"()
+                }   
+           }       
+        }
+    }
+}
+
+void executeRoutine() {   
+	def routine = request.JSON?.routine
+    location.helloHome?.execute(routine)
+}
+
+def rgbToHSL(rgb) {
+	def r = rgb.r / 255
+    def g = rgb.g / 255
+    def b = rgb.b / 255
+    def h = 0
+    def s = 0
+    def l = 0
+    
+    def var_min = [r,g,b].min()
+    def var_max = [r,g,b].max()
+    def del_max = var_max - var_min
+    
+    l = (var_max + var_min) / 2
+    
+    if (del_max == 0) {
+            h = 0
+            s = 0
+    } else {
+    	if (l < 0.5) { s = del_max / (var_max + var_min) } 
+        else { s = del_max / (2 - var_max - var_min) }
+
+        def del_r = (((var_max - r) / 6) + (del_max / 2)) / del_max
+        def del_g = (((var_max - g) / 6) + (del_max / 2)) / del_max
+        def del_b = (((var_max - b) / 6) + (del_max / 2)) / del_max
+
+        if (r == var_max) { h = del_b - del_g } 
+        else if (g == var_max) { h = (1 / 3) + del_r - del_b } 
+        else if (b == var_max) { h = (2 / 3) + del_g - del_r }
+        
+		if (h < 0) { h += 1 }
+        if (h > 1) { h -= 1 }
+	}
+    def hsl = [:]    
+    hsl = [h: h * 100, s: s * 100, l: l]
+    
+    hsl
+}
+
+def hexToRgb(colorHex) {
+	def rrInt = Integer.parseInt(colorHex.substring(1,3),16)
+    def ggInt = Integer.parseInt(colorHex.substring(3,5),16)
+    def bbInt = Integer.parseInt(colorHex.substring(5,7),16)
+    
+    def colorData = [:]
+    colorData = [r: rrInt, g: ggInt, b: bbInt]
+    colorData
+}
+
+def installed() {
+	state.heartbeat = false
+}
+
+def updated() {
+	state.heartbeat = false
+}