MSA-1435: Create connection between Ubi device and Smartthings device.

devicetypes/smartthings/bose-soundtouch.src/bose-soundtouch.groovy

@@ -64,10 +64,8 @@ metadata {
     }
 
     standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821", nextState:"turningOff"
+        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff"
-        state "turningOff", label:'TURNING OFF', icon:"st.Electronics.electronics16", backgroundColor:"#ffffff"
+        state "on", label: '${name}', action: "switch.off", icon: "st.Electronics.electronics16", backgroundColor: "#79b821"
-        state "off", label: '${name}', action: "switch.on", icon: "st.Electronics.electronics16", backgroundColor: "#ffffff", nextState:"turningOn"
-        state "turningOn", label:'TURNING ON', icon:"st.Electronics.electronics16", backgroundColor:"#79b821"
     }
     valueTile("1", "device.station1", decoration: "flat", canChangeIcon: false) {
         state "station1", label:'${currentValue}', action:"preset1"
@@ -749,16 +747,8 @@ def cb_boseSetInput(xml, input) {
  */
 def boseSetPowerState(boolean enable) {
     log.info "boseSetPowerState(${enable})"
-    // Fix to get faster update of power status back from speaker after sending on/off
+    queueCallback('nowPlaying', "cb_boseSetPowerState", enable ? "POWERON" : "POWEROFF")
-    // Instead of queuing the command to be sent after the refresh send it directly via sendHubCommand
+    return boseRefreshNowPlaying()
-    // Note: This is a temporary hack that should be replaced by a re-design of the
-    // DTH to use sendHubCommand for all commands
-    sendHubCommand(bosePOST("/key", "<key state=\"press\" sender=\"Gabbo\">POWER</key>")) 
-    sendHubCommand(bosePOST("/key", "<key state=\"release\" sender=\"Gabbo\">POWER</key>"))
-    sendHubCommand(boseGET("/now_playing"))
-    if (enable) {
-        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", 5)
-    }
 }
 
 /**
@@ -797,11 +787,10 @@ def cb_boseSetPowerState(xml, state) {
  */
 def cb_boseConfirmPowerOn(xml, tries) {
     def result = []
-    def attempt = tries as Integer
+    log.warn "boseConfirmPowerOn() attempt #" + tries
-    log.warn "boseConfirmPowerOn() attempt #$attempt"
+    if (xml.attributes()['source'] == "STANDBY" && tries > 0) {
-    if (xml.attributes()['source'] == "STANDBY" && attempt > 0) {
         result << boseRefreshNowPlaying()
-        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", attempt-1)
+        queueCallback('nowPlaying', "cb_boseConfirmPowerOn", tries-1)
     }
     return result
 }

devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy

@@ -43,7 +43,7 @@ metadata {
 		}
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -51,7 +51,7 @@ metadata {
 		}
 
 		main(["rich-control"])
-		details(["rich-control", "reset", "refresh"])
+		details(["rich-control", "colorTempSliderControl", "colorTemp", "reset", "refresh"])
 	}
 }
 
@@ -75,78 +75,118 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
+}
+
+void nextLevel() {
+	def level = device.latestValue("level") as Integer ?: 0
+	if (level <= 100) {
+		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+	}
+	else {
+		level = 25
+	}
+	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        sendEvent(name: "switch", value: "on")
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+        parent.setSaturation(this, percent)
+        sendEvent(name: "saturation", value: percent, displayed: false)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+        parent.setHue(this, percent)
+        sendEvent(name: "hue", value: percent, displayed: false)
     }
 }
 
 void setColor(value) {
+    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
+        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
+        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
+        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
+        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!validValues.isEmpty()) {
+    if (!events.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+        parent.setColor(this, validValues)
+    }
+    events.each {
+        sendEvent(it)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-	def value = [hue:20, saturation:2]
+    def value = [level:100, saturation:56, hue:23]
-	setAdjustedColor(value)
+    setAdjustedColor(value)
+    parent.poll()
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
+        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-	    setColor(adjusted)
+        setColor(adjusted)
     } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input"
+    }
+}
+
+void setColorTemperature(value) {
+    if (value) {
+        log.trace "setColorTemperature: ${value}k"
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
+    } else {
+        log.warn "Invalid color temperature"
     }
 }
 
@@ -155,6 +195,22 @@ void refresh() {
     parent.manualRefresh()
 }
 
+def adjustOutgoingHue(percent) {
+	def adjusted = percent
+	if (percent > 31) {
+		if (percent < 63.0) {
+			adjusted = percent + (7 * (percent -30 ) / 32)
+		}
+		else if (percent < 73.0) {
+			adjusted = 69 + (5 * (percent - 62) / 10)
+		}
+		else {
+			adjusted = percent + (2 * (100 - percent) / 28)
+		}
+	}
+	log.info "percent: $percent, adjusted: $adjusted"
+	adjusted
+}
 
 def verifyPercent(percent) {
     if (percent == null)

devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy

@@ -7,13 +7,8 @@
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Hue Bridge", namespace: "smartthings", author: "SmartThings") {
+		attribute "serialNumber", "string"
 		attribute "networkAddress", "string"
-        // Used to indicate if bridge is reachable or not, i.e. is the bridge connected to the network
-        // Possible values "Online" or "Offline"
-		attribute "status", "string"
-		// Id is the number on the back of the hub, Hue uses last six digits of Mac address
-		// This is also used in the Hue application as ID
-		attribute "idNumber", "string"
 	}
 
 	simulator {
@@ -22,23 +17,22 @@ metadata {
 
 	tiles(scale: 2) {
      	multiAttributeTile(name:"rich-control"){
-			tileAttribute ("device.status", key: "PRIMARY_CONTROL") {
+			tileAttribute ("", key: "PRIMARY_CONTROL") {
-				attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff"
+	            attributeState "default", label: "Hue Bridge", action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#F3C200"
-	            attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821"
 			}
+	        tileAttribute ("serialNumber", key: "SECONDARY_CONTROL") {
+	            attributeState "default", label:'SN: ${currentValue}'
 			}
-		valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
-			state "default", label:'Do not remove'
         }
-		valueTile("idNumber", "device.idNumber", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
+		valueTile("serialNumber", "device.serialNumber", decoration: "flat", height: 1, width: 2, inactiveLabel: false) {
-			state "default", label:'ID: ${currentValue}'
+			state "default", label:'SN: ${currentValue}'
 		}
-		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 6, inactiveLabel: false) {
+		valueTile("networkAddress", "device.networkAddress", decoration: "flat", height: 2, width: 4, inactiveLabel: false) {
-			state "default", label:'IP: ${currentValue}'
+			state "default", label:'${currentValue}', height: 1, width: 2, inactiveLabel: false
 		}
 
 		main (["rich-control"])
-		details(["rich-control", "idNumber", "networkAddress", "doNotRemove"])
+		details(["rich-control", "networkAddress"])
 	}
 }
 

devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy

@@ -43,16 +43,16 @@ metadata {
 			}
 		}
 
-    controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
-        state "colorTemperature", action:"color temperature.setColorTemperature"
+            state "colorTemperature", action:"color temperature.setColorTemperature"
-    }
+        }
 
-    valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-        state "colorTemperature", label: 'WHITES'
+            state "colorTemperature", label: '${currentValue} K'
-    }
+        }
 
 		standardTile("reset", "device.reset", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
-			state "default", label:"Reset To White", action:"reset", icon:"st.lights.philips.hue-single"
+			state "default", label:"Reset Color", action:"reset", icon:"st.lights.philips.hue-single"
 		}
 
 		standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -84,86 +84,118 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
+}
+
+void nextLevel() {
+	def level = device.latestValue("level") as Integer ?: 0
+	if (level <= 100) {
+		level = Math.min(25 * (Math.round(level / 25) + 1), 100) as Integer
+	}
+	else {
+		level = 25
+	}
+	setLevel(level)
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent, descriptionText: "Level has changed to ${percent}%")
+        sendEvent(name: "switch", value: "on")
     }
 }
 
 void setSaturation(percent) {
     log.debug "Executing 'setSaturation'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setSaturation(this, percent)
+        parent.setSaturation(this, percent)
+        sendEvent(name: "saturation", value: percent, displayed: false)
     }
 }
 
 void setHue(percent) {
     log.debug "Executing 'setHue'"
     if (verifyPercent(percent)) {
-	    log.trace parent.setHue(this, percent)
+        parent.setHue(this, percent)
+        sendEvent(name: "hue", value: percent, displayed: false)
     }
 }
 
 void setColor(value) {
+    log.debug "setColor: ${value}, $this"
     def events = []
     def validValues = [:]
 
     if (verifyPercent(value.hue)) {
+        events << createEvent(name: "hue", value: value.hue, displayed: false)
         validValues.hue = value.hue
     }
     if (verifyPercent(value.saturation)) {
+        events << createEvent(name: "saturation", value: value.saturation, displayed: false)
         validValues.saturation = value.saturation
     }
     if (value.hex != null) {
         if (value.hex ==~ /^\#([A-Fa-f0-9]){6}$/) {
+            events << createEvent(name: "color", value: value.hex)
             validValues.hex = value.hex
         } else {
             log.warn "$value.hex is not a valid color"
         }
     }
     if (verifyPercent(value.level)) {
+        events << createEvent(name: "level", value: value.level, descriptionText: "Level has changed to ${value.level}%")
         validValues.level = value.level
     }
     if (value.switch == "off" || (value.level != null && value.level <= 0)) {
+        events << createEvent(name: "switch", value: "off")
         validValues.switch = "off"
     } else {
+        events << createEvent(name: "switch", value: "on")
         validValues.switch = "on"
     }
-    if (!validValues.isEmpty()) {
+    if (!events.isEmpty()) {
-	    log.trace parent.setColor(this, validValues)
+        parent.setColor(this, validValues)
+    }
+    events.each {
+        sendEvent(it)
     }
 }
 
 void reset() {
     log.debug "Executing 'reset'"
-	setColorTemperature(4000)
+    def value = [level:100, saturation:56, hue:23]
+    setAdjustedColor(value)
+    parent.poll()
 }
 
 void setAdjustedColor(value) {
     if (value) {
         log.trace "setAdjustedColor: ${value}"
         def adjusted = value + [:]
+        adjusted.hue = adjustOutgoingHue(value.hue)
         // Needed because color picker always sends 100
         adjusted.level = null
-	    setColor(adjusted)
+        setColor(adjusted)
     } else {
-        log.warn "Invalid color input $value"
+        log.warn "Invalid color input"
     }
 }
 
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-	    log.trace parent.setColorTemperature(this, value)
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
     } else {
-        log.warn "Invalid color temperature $value"
+        log.warn "Invalid color temperature"
     }
 }
 
@@ -172,6 +204,23 @@ void refresh() {
     parent.manualRefresh()
 }
 
+def adjustOutgoingHue(percent) {
+	def adjusted = percent
+	if (percent > 31) {
+		if (percent < 63.0) {
+			adjusted = percent + (7 * (percent -30 ) / 32)
+		}
+		else if (percent < 73.0) {
+			adjusted = 69 + (5 * (percent - 62) / 10)
+		}
+		else {
+			adjusted = percent + (2 * (100 - percent) / 28)
+		}
+	}
+	log.info "percent: $percent, adjusted: $adjusted"
+	adjusted
+}
+
 def verifyPercent(percent) {
     if (percent == null)
         return false

devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy

@@ -68,16 +68,20 @@ def parse(description) {
 // handle commands
 void on() {
 	log.trace parent.on(this)
+	sendEvent(name: "switch", value: "on")
 }
 
 void off() {
 	log.trace parent.off(this)
+	sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
 	log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
 		parent.setLevel(this, percent)
+		sendEvent(name: "level", value: percent)
+		sendEvent(name: "switch", value: "on")
 	} else {
     	log.warn "$percent is not 0-100"
     }

devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy

@@ -36,12 +36,12 @@ metadata {
             }
         }
 
-        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2200..6500)") {
+        controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2000..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
 
         valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorTemperature", label: 'WHITES'
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         standardTile("refresh", "device.refresh", height: 2, width: 2, inactiveLabel: false, decoration: "flat") {
@@ -73,16 +73,20 @@ def parse(description) {
 // handle commands
 void on() {
     log.trace parent.on(this)
+    sendEvent(name: "switch", value: "on")
 }
 
 void off() {
     log.trace parent.off(this)
+    sendEvent(name: "switch", value: "off")
 }
 
 void setLevel(percent) {
     log.debug "Executing 'setLevel'"
     if (percent != null && percent >= 0 && percent <= 100) {
-        log.trace parent.setLevel(this, percent)
+        parent.setLevel(this, percent)
+        sendEvent(name: "level", value: percent)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "$percent is not 0-100"
     }
@@ -91,7 +95,9 @@ void setLevel(percent) {
 void setColorTemperature(value) {
     if (value) {
         log.trace "setColorTemperature: ${value}k"
-        log.trace parent.setColorTemperature(this, value)
+        parent.setColorTemperature(this, value)
+        sendEvent(name: "colorTemperature", value: value)
+        sendEvent(name: "switch", value: "on")
     } else {
         log.warn "Invalid color temperature"
     }
@@ -101,3 +107,4 @@ void refresh() {
     log.debug "Executing 'refresh'"
     parent.manualRefresh()
 }
+

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

@@ -22,7 +22,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Water Sensor"
 		capability "Health Check"
-		capability "Sensor"		
 
 		command "enrollResponse"
 

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

@@ -22,7 +22,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Refresh"
 		capability "Health Check"
-		capability "Sensor"		
 
 		command "enrollResponse"
 

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -24,7 +24,6 @@
  		capability "Refresh"
  		capability "Temperature Measurement"
 		capability "Health Check"
-		capability "Sensor"
 
 		command "enrollResponse"
  	}

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -21,7 +21,6 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
 		capability "Health Check"
-		capability "Sensor"
 
 		fingerprint endpointId: "01", inClusters: "0001,0003,0020,0402,0B05,FC45", outClusters: "0019,0003"
 	}

devicetypes/smartthings/testing/simulated-alarm.src/simulated-alarm.groovy

@@ -16,8 +16,6 @@
 metadata {
 	definition (name: "Simulated Alarm", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Alarm"
-		capability "Sensor"
-		capability "Actuator"
 	}
 
 	simulator {

devicetypes/smartthings/testing/simulated-color-control.src/simulated-color-control.groovy

@@ -1,8 +1,6 @@
 metadata {
 	definition (name: "Simulated Color Control", namespace: "smartthings/testing", author: "SmartThings") {
     	capability "Color Control"
-		capability "Sensor"
-		capability "Actuator"
 	}
 
 	simulator {

devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy

@@ -15,7 +15,6 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Contact Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Contact Sensor"
-		capability "Sensor"
 
 		command "open"
 		command "close"

devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy

@@ -15,8 +15,6 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Lock", namespace: "smartthings/testing", author: "bob") {
 		capability "Lock"
-		capability "Sensor"
-		capability "Actuator"
 	}
 
 	// Simulated lock

devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy

@@ -15,7 +15,6 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Motion Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Motion Sensor"
-		capability "Sensor"
 
 		command "active"
 		command "inactive"

devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy

@@ -15,7 +15,6 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Presence Sensor", namespace: "smartthings/testing", author: "bob") {
 		capability "Presence Sensor"
-		capability "Sensor"
 
 		command "arrived"
 		command "departed"

devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy

@@ -16,8 +16,6 @@ metadata {
     definition (name: "Simulated Switch", namespace: "smartthings/testing", author: "bob") {
 		capability "Switch"
         capability "Relay Switch"
-		capability "Sensor"
-		capability "Actuator"
 
 		command "onPhysical"
 		command "offPhysical"

devicetypes/smartthings/testing/simulated-temperature-sensor.src/simulated-temperature-sensor.groovy

@@ -16,7 +16,6 @@ metadata {
 	definition (name: "Simulated Temperature Sensor", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Temperature Measurement"
 		capability "Switch Level"
-		capability "Sensor"
 
 		command "up"
 		command "down"

devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy

@@ -16,8 +16,6 @@ metadata {
 	definition (name: "Simulated Thermostat", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Thermostat"
 		capability "Relative Humidity Measurement"
-		capability "Sensor"
-		capability "Actuator"
 
 		command "tempUp"
 		command "tempDown"

devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy

@@ -15,7 +15,6 @@ metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "Simulated Water Sensor", namespace: "smartthings/testing", author: "SmartThings") {
 		capability "Water Sensor"
-		capability "Sensor"
         
         command "wet"
         command "dry"

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

@@ -53,10 +53,7 @@ def parse(String description) {
 
     def event = zigbee.getEvent(description)
     if (event) {
-        if (event.name=="level" && event.value==0) {}
+        sendEvent(event)
-        else {
-            sendEvent(event)
-        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy

@@ -28,9 +28,6 @@ metadata {
         capability "Switch"
         capability "Switch Level"
 
-        attribute "colorName", "string"
-        command "setGenericName"
-
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
@@ -57,15 +54,15 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+            state "colorTemperature", label: '${currentValue} K'
         }
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
             state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -81,16 +78,10 @@ private getATTRIBUTE_COLOR_TEMPERATURE() { 0x0007 }
 def parse(String description) {
     log.debug "description is $description"
 
-    def event = zigbee.getEvent(description)
+    def finalResult = zigbee.getEvent(description)
-    if (event) {
+    if (finalResult) {
-        log.debug event
+        log.debug finalResult
-        if (event.name=="level" && event.value==0) {}
+        sendEvent(finalResult)
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
     }
     else {
         def zigbeeMap = zigbee.parseDescriptionAsMap(description)
@@ -130,27 +121,9 @@ def configure() {
 }
 
 def setColorTemperature(value) {
-    setGenericName(value)
     zigbee.setColorTemperature(value)
 }
 
-//Naming based on the wiki article here: http://en.wikipedia.org/wiki/Color_temperature
-def setGenericName(value){
-    if (value != null) {
-        def genericName = "White"
-        if (value < 3300) {
-            genericName = "Soft White"
-        } else if (value < 4150) {
-            genericName = "Moonlight"
-        } else if (value <= 5000) {
-            genericName = "Cool White"
-        } else if (value >= 5000) {
-            genericName = "Daylight"
-        }
-        sendEvent(name: "colorName", value: genericName)
-    }
-}
-
 def setLevel(value) {
     zigbee.setLevel(value)
 }

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

@@ -20,7 +20,6 @@ metadata {
         capability "Switch"
 
         fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0006", outClusters: "0003, 0006, 0019, 0406", manufacturer: "Leviton", model: "ZSS-10", deviceJoinName: "Leviton Switch"
     }
 
     // simulator metadata

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

@@ -1,5 +1,5 @@
 /**
- *  Copyright 2016 SmartThings
+ *  Copyright 2015 SmartThings
  *
  *  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:
@@ -11,133 +11,100 @@
  *  for the specific language governing permissions and limitations under the License.
  *
  */
+/*
+ * Capabilities
+ * - Battery
+ * - Configuration
+ * - Refresh
+ * - Switch
+ * - Valve
+*/
 
 metadata {
-    definition (name: "ZigBee Valve", namespace: "smartthings", author: "SmartThings") {
+	definition (name: "Zigbee Valve", namespace: "smartthings", author: "SmartThings") {
-        capability "Actuator"
+		capability "Battery"
-        capability "Battery"
+		capability "Configuration"
-        capability "Configuration"
+		capability "Refresh"
-        capability "Power Source"
+		capability "Switch"
-        capability "Refresh"
+		capability "Valve"
-        capability "Valve"
 
-        fingerprint profileId: "0104", inClusters: "0000, 0001, 0003, 0006, 0020, 0B02, FC02", outClusters: "0019", manufacturer: "WAXMAN", model: "leakSMART Water Valve v2.10", deviceJoinName: "leakSMART Valve"
+		fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0020,0006,0B02", outClusters: "0003"
-        fingerprint profileId: "0104", inClusters: "0000, 0001, 0003, 0004, 0005, 0006, 0008, 000F, 0020, 0B02", outClusters: "0003, 0019", manufacturer: "WAXMAN", model: "House Water Valve - MDL-TBD", deviceJoinName: "Waxman House Water Valve"
+	}
-    }
 
-    // simulator metadata
+	// simulator metadata
-    simulator {
+	simulator {
-        // status messages
+		// status messages
-        status "on": "on/off: 1"
+		status "on": "on/off: 1"
-        status "off": "on/off: 0"
+		status "off": "on/off: 0"
 
-        // reply messages
+		// reply messages
-        reply "zcl on-off on": "on/off: 1"
+		reply "zcl on-off on": "on/off: 1"
-        reply "zcl on-off off": "on/off: 0"
+		reply "zcl on-off off": "on/off: 0"
-    }
+	}
 
-    tiles(scale: 2) {
+	// UI tile definitions
-        multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){
+	tiles {
-            tileAttribute ("device.contact", key: "PRIMARY_CONTROL") {
+		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-                attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+			state "off", label: 'closed', action: "switch.on", icon: "st.Outdoor.outdoor16", backgroundColor: "#e86d13"
-                attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+			state "on", label: 'open', action: "switch.off", icon: "st.Outdoor.outdoor16", backgroundColor: "#53a7c0"
-                attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing"
+		}
-                attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening"
+		main "switch"
-            }
+		details(["switch"])
-            tileAttribute ("powerSource", key: "SECONDARY_CONTROL") {
+	}
-                attributeState "powerSource", label:'Power Source: ${currentValue}'
-            }
-        }
-
-        valueTile("battery", "device.battery", inactiveLabel:false, decoration:"flat", width:2, height:2) {
-            state "battery", label:'${currentValue}% battery', unit:""
-        }
-
-        standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh"
-        }
-
-        main(["valve"])
-        details(["valve", "battery", "refresh"])
-    }
 }
 
-private getCLUSTER_BASIC() { 0x0000 }
-private getBASIC_ATTR_POWER_SOURCE() { 0x0007 }
-private getCLUSTER_POWER() { 0x0001 }
-private getPOWER_ATTR_BATTERY_PERCENTAGE_REMAINING() { 0x0021 }
-private getTYPE_U8() { 0x20 }
-private getTYPE_ENUM8() { 0x30 }
-
 // Parse incoming device messages to generate events
 def parse(String description) {
-    log.debug "description is $description"
+	log.info description
-    def event = zigbee.getEvent(description)
+	if (description?.startsWith("catchall:")) {
-    if (event) {
+        def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
-        if(event.name == "switch") {
+		def result = createEvent(name: name, value: value)
-            event.name = "contact"                  //0006 cluster in valve is tied to contact
+        def msg = zigbee.parse(description)
-            if(event.value == "on") {
+		log.debug "Parse returned ${result?.descriptionText}"
-                event.value = "open"
+		return result
-            }
+		log.trace msg
-            else if(event.value == "off") {
+		log.trace "data: $msg.data"
-                event.value = "closed"
+	}
-            }
+	else {
-        }
+		def name = description?.startsWith("on/off: ") ? "switch" : null
-        sendEvent(event)
+		def value = name == "switch" ? (description?.endsWith(" 1") ? "on" : "off") : null
-    }
+		def result = createEvent(name: name, value: value)
-    else {
+		log.debug "Parse returned ${result?.descriptionText}"
-        def descMap = zigbee.parseDescriptionAsMap(description)
+		return result
-        if (descMap.clusterInt == CLUSTER_BASIC && descMap.attrInt == BASIC_ATTR_POWER_SOURCE){
+	}
-            def value = descMap.value
+}
-            if (value == "01" || value == "02") {
+
-                sendEvent(name: "powerSource", value: "Mains")
+// Commands to device
-            }
+def on() {
-            else if (value == "03") {
+	log.debug "on()"
-                sendEvent(name: "powerSource", value: "Battery")
+	sendEvent(name: "switch", value: "on")
-            }
+	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
-            else if (value == "04") {
+}
-                sendEvent(name: "powerSource", value: "DC")
+
-            }
+def off() {
-            else {
+	log.debug "off()"
-                sendEvent(name: "powerSource", value: "Unknown")
+	sendEvent(name: "switch", value: "off")
-            }
+	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
-        }
-        else if (descMap.clusterInt == CLUSTER_POWER && descMap.attrInt == POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) {
-            event.name = "battery"
-            event.value = Math.round(Integer.parseInt(descMap.value, 16) / 2)
-            sendEvent(event)
-        }
-        else {
-            log.warn "DID NOT PARSE MESSAGE for description : $description"
-            log.debug descMap
-        }
-    }
 }
 
 def open() {
-    zigbee.on()
+	log.debug "on()"
+	sendEvent(name: "switch", value: "on")
+	"st cmd 0x${device.deviceNetworkId} 1 6 1 {}"
 }
 
 def close() {
-    zigbee.off()
+	log.debug "off()"
+	sendEvent(name: "switch", value: "off")
+	"st cmd 0x${device.deviceNetworkId} 1 6 0 {}"
 }
 
 def refresh() {
-    log.debug "refresh called"
+	log.debug "sending refresh command"
-    zigbee.onOffRefresh() +
+	"st rattr 0x${device.deviceNetworkId} 1 6 0"
-    zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
-    zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING) +
-    zigbee.onOffConfig() +
-    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
-    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1)
 }
 
 def configure() {
-    log.debug "Configuring Reporting and Bindings."
+
-    zigbee.onOffConfig() +
+	"zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}"
-    zigbee.configureReporting(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING, TYPE_U8, 600, 21600, 1) +
-    zigbee.configureReporting(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE, TYPE_ENUM8, 5, 21600, 1) +
-    zigbee.onOffRefresh() +
-    zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_POWER_SOURCE) +
-    zigbee.readAttribute(CLUSTER_POWER, POWER_ATTR_BATTERY_PERCENTAGE_REMAINING)
 }

devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy

@@ -49,6 +49,9 @@ metadata {
             tileAttribute ("device.level", key: "SLIDER_CONTROL") {
                 attributeState "level", action:"switch level.setLevel"
             }
+            tileAttribute ("colorName", key: "SECONDARY_CONTROL") {
+                attributeState "colorName", label:'${currentValue}'
+            }
         }
 
         standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
@@ -58,12 +61,12 @@ metadata {
         controlTile("colorTempSliderControl", "device.colorTemperature", "slider", width: 4, height: 2, inactiveLabel: false, range:"(2700..6500)") {
             state "colorTemperature", action:"color temperature.setColorTemperature"
         }
-        valueTile("colorName", "device.colorName", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
+        valueTile("colorTemp", "device.colorTemperature", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
-            state "colorName", label: '${currentValue}'
+            state "colorTemperature", label: '${currentValue} K'
         }
 
         main(["switch"])
-        details(["switch", "colorTempSliderControl", "colorName", "refresh"])
+        details(["switch", "colorTempSliderControl", "colorTemp", "refresh"])
     }
 }
 
@@ -72,13 +75,7 @@ def parse(String description) {
     log.debug "description is $description"
     def event = zigbee.getEvent(description)
     if (event) {
-        if (event.name=="level" && event.value==0) {}
+        sendEvent(event)
-        else {
-            if (event.name=="colorTemperature") {
-                setGenericName(event.value)
-            }
-            sendEvent(event)
-        }
     }
     else {
         log.warn "DID NOT PARSE MESSAGE for description : $description"

smartapps/com-gidjit-smartthings-hub/gidjit-hub.src/gidjit-hub.groovy

@@ -24,24 +24,17 @@ definition(
     iconX3Url: "http://www.gidjit.com/appicon@3x.png",
     oauth: [displayName: "Gidjit", displayLink: "www.gidjit.com"])
 
-preferences(oauthPage: "deviceAuthorization") {
-    // deviceAuthorization page is simply the devices to authorize
-    page(name: "deviceAuthorization", title: "Device Authorization", nextPage: "instructionPage",
-         install: false, uninstall: true) {
-  		section ("Allow Gidjit to have access, thereby allowing you to quickly control and monitor your following devices. Privacy Policy can be found at http://priv.gidjit.com/privacy.html") {
-    		input "switches", "capability.switch", title: "Control/Monitor your switches", multiple: true, required: false
-    		input "thermostats", "capability.thermostat", title: "Control/Monitor your thermostats", multiple: true, required: false
-    		input "windowShades", "capability.windowShade", title: "Control/Monitor your window shades", multiple: true, required: false //windowShade
-        }
 
-    }
+
-    page(name: "instructionPage", title: "Device Discovery", install: true) {
+preferences {
-        section() {
+  section ("Allow Gidjit to have access, there by allowing you to quickly control and monitor the following devices") {
-            paragraph "Now the process is complete return to the Devices section of the Detected Screen. From there and you can add actions to each of your device panels, including launching SmartThings routines."
+    input "switches", "capability.switch", title: "Control/Monitor your switches", multiple: true, required: false
-        }
+    input "thermostats", "capability.thermostat", title: "Control/Monitor your thermostats", multiple: true, required: false
-    }
+    input "windowShades", "capability.windowShade", title: "Control/Monitor your window shades", multiple: true, required: false //windowShade
+    //input "bulbs", "capability.colorControl", title: "Control your lights", multiple: true, required: false //windowShade
+
+  }
 }
-
 mappings {
   path("/structureinfo") {
     action: [

smartapps/docwisdom/humidity-alert.src/humidity-alert.groovy

@@ -78,7 +78,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS and activating ${mySwitch}"
+			log.debug "Humidity Rose Above ${tooHumid}:  sending SMS to $phone1 and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.on()
 		}
@@ -91,7 +91,7 @@ def humidityHandler(evt) {
 			log.debug "Notification already sent within the last ${deltaMinutes} minutes"
 			
 		} else {
-			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS and activating ${mySwitch}"
+			log.debug "Humidity Fell Below ${notHumidEnough}:  sending SMS to $phone1 and activating ${mySwitch}"
 			send("${humiditySensor1.label} sensed high humidity level of ${evt.value}")
 			switch1?.off()
 		}

smartapps/dooglave/let-there-be-dark.src/let-there-be-dark.groovy

@@ -25,11 +25,15 @@ preferences {
 
 def installed() {
 	subscribe(contact1, "contact", contactHandler)
+	subscribe(switch1, "switch.on", switchOnHandler)
+    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def updated() {
 	unsubscribe()
 	subscribe(contact1, "contact", contactHandler)
+	subscribe(switch1, "switch.on", switchOnHandler)
+    subscribe(switch1, "switch.off", switchOffHandler)
 }
 
 def contactHandler(evt) {

smartapps/sheikhsphere/smart-humidifier.src/smart-humidifier.groovy

@@ -77,7 +77,7 @@ def humidityHandler(evt) {
 
 		} else {
          	if (state.lastStatus != "off") {
-                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS and deactivating $mySwitch"
+                log.debug "Humidity Rose Above $humidityHigh1:  sending SMS to $phone1 and deactivating $mySwitch"
                 send("${humiditySensor1.label} sensed high humidity level of ${evt.value}, turning off ${switch1.label}")
                 switch1?.off()
                 state.lastStatus = "off"
@@ -99,7 +99,7 @@ def humidityHandler(evt) {
 
 		} else {
         	if (state.lastStatus != "on") {
-                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS and activating $mySwitch"
+                log.debug "Humidity Dropped Below $humidityLow1:  sending SMS to $phone1 and activating $mySwitch"
                 send("${humiditySensor1.label} sensed low humidity level of ${evt.value}, turning on ${switch1.label}")
                 switch1?.on()
                 state.lastStatus = "on"

smartapps/smartthings/has-barkley-been-fed.src/has-barkley-been-fed.groovy

@@ -68,7 +68,7 @@ def scheduleCheck()
             sendNotificationToContacts("No one has fed the dog", recipients)
         }
         else {
-            log.debug "Feeder was not opened since $midnight, texting one phone number"
+            log.debug "Feeder was not opened since $midnight, texting $phone1"
             sendSms(phone1, "No one has fed the dog")
         }
 	}

smartapps/smartthings/its-too-cold.src/its-too-cold.groovy

@@ -69,10 +69,10 @@ def temperatureHandler(evt) {
 		def alreadySentSms = recentEvents.count { it.doubleValue <= tooCold } > 1
 
 		if (alreadySentSms) {
-			log.debug "SMS already sent within the last $deltaMinutes minutes"
+			log.debug "SMS already sent to $phone1 within the last $deltaMinutes minutes"
 			// TODO: Send "Temperature back to normal" SMS, turn switch off
 		} else {
-			log.debug "Temperature dropped below $tooCold:  sending SMS and activating $mySwitch"
+			log.debug "Temperature dropped below $tooCold:  sending SMS to $phone1 and activating $mySwitch"
 			def tempScale = location.temperatureScale ?: "F"
 			send("${temperatureSensor1.displayName} is too cold, reporting a temperature of ${evt.value}${evt.unit?:tempScale}")
 			switch1?.on()

smartapps/ucic-io/ubi.src/ubi.groovy

@@ -0,0 +1,520 @@
+/**
+ *  Ubi
+ *
+ *  Copyright 2016 UCIC
+ *
+ *  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: "Ubi",
+    namespace: "ucic.io",
+    author: "UCIC",
+    description: "Connect Ubi with SmartThings",
+    category: "SmartThings Labs",
+    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn.png",
+    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn@2x.png",
+    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Partner/ubi-app-icn@2x.png",
+    oauth: true)
+
+
+preferences {
+	section("Allow a web application to control these things...") {
+		input name: "switches", type: "capability.switch", title: "Which Switches?", multiple: true, required: false
+		input name: "motions", type: "capability.motionSensor", title: "Which Motion Sensors?", multiple: true, required: false
+		input name: "locks", type: "capability.lock", title: "Which Locks?", multiple: true, required: false
+		input name: "contactSensors", type: "capability.contactSensor", title: "Which Contact Sensors?", multiple: true, required: false
+		input name: "presenceSensors", type: "capability.presenceSensor", title: "Which Presence Sensors?", multiple: true, required: false
+	}
+}
+
+mappings {
+	path("/list") {
+		action: [
+			GET: "listAll"
+		]
+	}
+
+	path("/events/:id") {
+		action: [
+			GET: "showEvents"
+		]
+	}
+
+	path("/switches") {
+		action: [
+			GET: "listSwitches",
+			PUT: "updateSwitches",
+			POST: "updateSwitches"
+		]
+	}
+	path("/switches/:id") {
+		action: [
+			GET: "showSwitch",
+			PUT: "updateSwitch",
+			POST: "updateSwitch"
+		]
+	}
+	path("/switches/subscriptions") {
+		//log.debug "switches added"
+		action: [
+			POST: "addSwitchSubscription"
+		]
+	}
+	path("/switches/subscriptions/:id") {
+		action: [
+			DELETE: "removeSwitchSubscription",
+			GET: "removeSwitchSubscription"
+		]
+	}
+
+	path("/motionSensors") {
+		action: [
+			GET: "listMotions",
+			PUT: "updateMotions",
+			POST: "updateMotions"
+
+		]
+	}
+	path("/motionSensors/:id") {
+		action: [
+			GET: "showMotion",
+			PUT: "updateMotion",
+			POST: "updateMotion"
+		]
+	}
+	path("/motionSensors/subscriptions") {
+		//log.debug "motionSensors added"
+		action: [
+			POST: "addMotionSubscription"
+		]
+	}
+	path("/motionSensors/subscriptions/:id") {
+		//log.debug "motionSensors Deleted"
+		action: [
+			DELETE: "removeMotionSubscription",
+			GET: "removeMotionSubscription"
+		]
+	}
+
+	path("/locks") {
+		action: [
+			GET: "listLocks",
+			PUT: "updateLock",
+			POST: "updateLock"
+		]
+	}
+	path("/locks/:id") {
+		action: [
+			GET: "showLock",
+			PUT: "updateLock",
+			POST: "updateLock"
+		]
+	}
+	path("/locks/subscriptions") {
+		action: [
+			POST: "addLockSubscription"
+		]
+	}
+	path("/locks/subscriptions/:id") {
+		action: [
+			DELETE: "removeLockSubscription",
+			GET: "removeLockSubscription"
+		]
+	}
+
+	path("/contactSensors") {
+		action: [
+			GET: "listContactSensors",
+			PUT: "updateContactSensor",
+			POST: "updateContactSensor"
+		]
+	}
+	path("/contactSensors/:id") {
+		action: [
+			GET: "showContactSensor",
+			PUT: "updateContactSensor",
+			POST: "updateContactSensor"
+		]
+	}
+	path("/contactSensors/subscriptions") {
+		log.debug "contactSensors/subscriptions"
+		action: [
+			POST: "addContactSubscription"
+		]
+	}
+	path("/contactSensors/subscriptions/:id") {
+		action: [
+			DELETE: "removeContactSensorSubscription",
+			GET: "removeContactSensorSubscription"
+		]
+	}
+
+	path("/presenceSensors") {
+		action: [
+			GET: "listPresenceSensors",
+			PUT: "updatePresenceSensor",
+			POST: "updatePresenceSensor"
+		]
+	}
+	path("/presenceSensors/:id") {
+		action: [
+			GET: "showPresenceSensor",
+			PUT: "updatePresenceSensor",
+			POST: "updatePresenceSensor"
+		]
+	}
+	path("/presenceSensors/subscriptions") {
+		//log.debug "PresenceSensors/subscriptions"
+		action: [
+			POST: "addPresenceSubscription"
+		]
+	}
+	path("/presenceSensors/subscriptions/:id") {
+		action: [
+			DELETE: "removePresenceSensorSubscription",
+			GET: "removePresenceSensorSubscription"
+		]
+	}
+
+	path("/state") {
+		action: [
+			GET: "currentState"
+		]
+	}
+
+	path("/phrases") {
+		action: [
+			GET: "listPhrases"
+		]
+	}
+	path("/phrases/:phraseName") {
+		action: [
+			GET: "executePhrase",
+			POST: "executePhrase",
+		]
+	}
+
+}
+
+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.
+    log.debug "initialize, do nothing..."
+}
+
+def listAll() {
+	listSwitches() + listMotions() + listLocks() + listContactSensors() + listPresenceSensors()
+}
+
+def listContactSensors() {
+	contactSensors.collect { device(it, "contactSensor") }
+}
+
+
+void updateContactSensors() {
+	updateAll(contactSensors)
+}
+
+def showContactSensor() {
+	show(contactSensors, "contact")
+}
+
+void updateContactSensor() {
+	update(contactSensors)
+}
+
+def addContactSubscription() {
+	log.debug "addContactSensorSubscription,  params: ${params}"
+	addSubscription(contactSensors, "contact")
+}
+
+def removeContactSensorSubscription() {
+	removeSubscription(contactSensors)
+}
+
+
+def listPresenceSensors() {
+	presenceSensors.collect { device(it, "presenceSensor") }
+}
+
+
+void updatePresenceSensors() {
+	updateAll(presenceSensors)
+}
+
+def showPresenceSensor() {
+	show(presenceSensors, "presence")
+}
+
+void updatePresenceSensor() {
+	update(presenceSensors)
+}
+
+def addPresenceSubscription() {
+	log.debug "addPresenceSensorSubscription,  params: ${params}"
+	addSubscription(presenceSensors, "presence")
+}
+
+def removePresenceSensorSubscription() {
+	removeSubscription(presenceSensors)
+}
+
+
+def listSwitches() {
+	switches.collect { device(it, "switch") }
+}
+
+void updateSwitches() {
+	updateAll(switches)
+}
+
+def showSwitch() {
+	show(switches, "switch")
+}
+
+void updateSwitch() {
+	update(switches)
+}
+
+def addSwitchSubscription() {
+	log.debug "addSwitchSubscription,  params: ${params}"
+	addSubscription(switches, "switch")
+}
+
+def removeSwitchSubscription() {
+	removeSubscription(switches)
+}
+
+def listMotions() {
+	motions.collect { device(it, "motionSensor") }
+}
+
+void updateMotions() {
+	updateAll(motions)
+}
+
+def showMotion() {
+	show(motions, "motion")
+}
+
+void updateMotion() {
+	update(motions)
+}
+
+def addMotionSubscription() {
+
+	addSubscription(motions, "motion")
+}
+
+def removeMotionSubscription() {
+	removeSubscription(motions)
+}
+
+def listLocks() {
+	locks.collect { device(it, "lock") }
+}
+
+void updateLocks() {
+	updateAll(locks)
+}
+
+def showLock() {
+	show(locks, "lock")
+}
+
+void updateLock() {
+	update(locks)
+}
+
+def addLockSubscription() {
+	addSubscription(locks, "lock")
+}
+
+def removeLockSubscription() {
+	removeSubscription(locks)
+}
+
+/*
+def motionOpenHandler(evt) {
+//log.trace "$evt.value: $evt, $settings"
+
+	log.debug "$motions was active, sending push message to user"
+	//sendPush("Your ${contact1.label ?: contact1.name} was opened")
+
+
+	httpPostJson(uri: "http://automatesolutions.ca/test.php", path: '', body: [evt: [value: "motionSensor Active"]]) {
+	log.debug "Event data successfully posted"
+    }
+
+}
+def contactOpenHandler(evt) {
+	//log.trace "$evt.value: $evt, $settings"
+
+	log.debug "$contactSensors was opened, sending push message to user"
+	//sendPush("Your ${contact1.label ?: contact1.name} was opened")
+
+
+	httpPostJson(uri: "http://automatesolutions.ca/test.php", path: '', body: [evt: [value: "ContactSensor Opened"]]) {
+	log.debug "Event data successfully posted"
+    }
+
+
+}
+*/
+
+
+def deviceHandler(evt) {
+	log.debug "~~~~~TEST~~~~~~"
+	def deviceInfo = state[evt.deviceId]
+	if (deviceInfo)
+	{
+		httpPostJson(uri: deviceInfo.callbackUrl, path: '', body: [evt: [value: evt.value]]) {
+			log.debug "Event data successfully posted"
+		}
+	}
+	else
+	{
+		log.debug "No subscribed device found"
+	}
+}
+
+def currentState() {
+	state
+}
+
+def showStates() {
+	def device = (switches + motions + locks).find { it.id == params.id }
+	if (!device)
+	{
+		httpError(404, "Switch not found")
+	}
+	else
+	{
+		device.events(params)
+	}
+}
+
+def listPhrases() {
+	location.helloHome.getPhrases().label
+}
+
+def executePhrase() {
+	def phraseName = params.phraseName
+	if (phraseName)
+	{
+		location.helloHome.execute(phraseName)
+		log.debug "executed phrase: $phraseName"
+	}
+	else
+	{
+		httpError(404, "Phrase not found")
+	}
+}
+
+private void updateAll(devices) {
+	def command = request.JSON?.command
+	if (command)
+	{
+		command = command.toLowerCase()
+		devices."$command"()
+	}
+}
+
+private void update(devices) {
+	log.debug "update, request: ${request.JSON}, params: ${params}, devices: $devices.id"
+	//def command = request.JSON?.command
+	def command = params.command
+	if (command)
+	{
+		command = command.toLowerCase()
+		def device = devices.find { it.id == params.id }
+		if (!device)
+		{
+			httpError(404, "Device not found")
+		}
+		else
+		{
+			device."$command"()
+		}
+	}
+}
+
+private show(devices, type) {
+	def device = devices.find { it.id == params.id }
+	if (!device)
+	{
+		httpError(404, "Device not found")
+	}
+	else
+	{
+
+		def attributeName = type
+
+
+
+		def s = device.currentState(attributeName)
+		[id: device.id, label: device.displayName, value: s?.value, unitTime: s?.date?.time, type: type]
+	}
+}
+
+private addSubscription(devices, attribute) {
+	//def deviceId = request.JSON?.deviceId
+	//def callbackUrl = request.JSON?.callbackUrl
+
+	log.debug "addSubscription,  params: ${params}"
+
+	def deviceId = params.deviceId
+	def callbackUrl = params.callbackUrl
+
+
+
+
+	def myDevice = devices.find { it.id == deviceId }
+	if (myDevice)
+	{
+		if (state[deviceId])
+		{
+			log.debug "Switch subscription already exists, unsubcribing"
+			unsubscribe(myDevice)
+		}
+		log.debug "Adding switch subscription" + callbackUrl
+		state[deviceId] = [callbackUrl: callbackUrl]
+		log.debug "Added state: $state"
+		subscribe(myDevice, attribute, deviceHandler)
+	}
+}
+
+private removeSubscription(devices) {
+	def deviceId = params.id
+	def device = devices.find { it.id == deviceId }
+	if (device)
+	{
+		log.debug "Removing $device.displayName subscription"
+		state.remove(device.id)
+		unsubscribe(device)
+	}
+}
+
+private device(it, type) {
+	it ? [id: it.id, label: it.displayName, type: type] : null
+}