MSA-907: Care Pendant

Fix fan mode notifications

.gitignore

@@ -0,0 +1,23 @@
+# Eclipse files
+/.settings
+/.classpath
+/.project
+/eclipse/
+/target-eclipse
+
+# IntelliJ files
+*.iws
+*.iml
+.idea
+/out
+*.ipr
+
+# Gradle files
+.gradletasknamecache
+.gradle/
+
+# Mac OS files
+.DS_Store
+
+# Build files
+/build

build.gradle

@@ -0,0 +1,57 @@
+import java.nio.charset.StandardCharsets
+import java.nio.file.Paths
+
+apply plugin: 'groovy'
+apply plugin: 'smartthings-executable-deployment'
+apply plugin: 'smartthings-hipchat'
+
+buildscript {
+    dependencies {
+        classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.3"
+    }
+    repositories {
+        jcenter()
+        maven {
+            credentials {
+                username smartThingsArtifactoryUserName
+                password smartThingsArtifactoryPassword
+            }
+            url "http://artifactory.smartthings.com/libs-release-local"
+        }
+    }
+}
+
+repositories {
+    mavenLocal()
+    jcenter()
+}
+
+dependencies {
+}
+
+hipchatShareFile {
+    List<String> archives = []
+    File rootDir = new File("${project.buildDir}/archives")
+    if (rootDir.exists()) {
+        // Create a list of archives which were deployed.
+        java.nio.file.Path rootPath = Paths.get(rootDir.absolutePath)
+        rootDir.eachFileRecurse { File file ->
+            if (file.name.endsWith('.tar.gz')) {
+                java.nio.file.Path archivePath = Paths.get(file.absolutePath)
+                archives.add(rootPath.relativize(archivePath).toString())
+            }
+        }
+    }
+
+    // Set task properties
+    data = archives.join('\n').getBytes(StandardCharsets.UTF_8)
+    fileName = 'deployment-notes.txt'
+    contentType = 'text/html'
+}
+
+hipchatSendNotification {
+    String branch = project.hasProperty('branch') ? project.property('branch') : 'unknown'
+    message = "Began executable deploy of SmartThingsPublic(${branch})."
+    color = branch == 'master' ? 'yellow' : 'red'
+    notify = true
+}

circle.yml

@@ -0,0 +1,27 @@
+machine:
+  java:
+    version:
+      oraclejdk8
+
+dependencies:
+  override:
+    - echo "Nothing to do."
+
+test:
+  override:
+    - echo "We don't have any tests :-("
+
+deployment:
+  develop:
+    branch: master
+    commands:
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_DEV
+      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
+      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD
+
+  stage:
+    branch: staging
+    commands:
+      - ./gradlew deployArchives -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Ps3BucketName=$S3_BUCKET_NAME_PREPROD_STAGING
+      - ./gradlew hipchatSendNotification -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD -Pbranch=$CIRCLE_BRANCH
+      - ./gradlew hipchatShareFile -PsmartThingsArtifactoryUserName=$ARTIFACTORY_USERNAME -PsmartThingsArtifactoryPassword=$ARTIFACTORY_PASSWORD

devicetypes/mitchpond/iris-care-pendant.src/iris-care-pendant.groovy

@@ -0,0 +1,225 @@
+/**
+ *  Iris Care Pendant
+ *	
+ *  Copyright 2015 Mitch Pond
+ *
+ *  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.
+ *
+ */
+ 
+metadata {
+	definition (name: "Iris Care Pendant", namespace: "mitchpond", author: "Mitch Pond") {
+    	capability "Sensor"
+    	capability "Battery"
+		capability "Configuration"
+        capability "Button"
+        
+        command "enrollResponse"
+
+		fingerprint endpointId: "01", inClusters: "0000,0001,0003,0020,0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L"
+	}
+
+	preferences {}
+ 
+	tiles(scale: 2) {
+    	standardTile("button", "device.button", decoration: "flat", width: 2, height:2) {
+        	state "default", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff"
+            state "pushed", backgroundColor: "#79b821"
+        }
+		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
+			state "battery", label:'${currentValue}% battery', unit:""
+		}
+
+		main (["battery"])
+		details(["button","battery"])
+	}
+}
+ 
+def parse(String description) {
+	//log.debug "description: $description"
+    
+	def results = []
+	if (description?.startsWith('catchall:')) {
+		results = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		results = parseReportAttributeMessage(description)
+	}
+    else if (description?.startsWith('zone status')) {
+    	results = parseIasMessage(description)
+    }
+    
+    if (description?.startsWith('enroll request')) {
+    	List cmds = enrollResponse()
+        log.debug "enroll response: ${cmds}"
+        results = cmds?.collect { new physicalgraph.device.HubAction(it) }
+    }
+    return results
+}
+ 
+private Map parseCatchAllMessage(String description) {
+    Map resultMap = [:]
+    def cluster = zigbee.parse(description)
+    if (shouldProcessMessage(cluster)) {
+        switch(cluster.clusterId) {
+            case 0x0001:
+            	resultMap = getBatteryResult(cluster.data.last())
+                break
+        }
+    }
+
+    return resultMap
+}
+
+private boolean shouldProcessMessage(cluster) {
+    // 0x0B is default response indicating message got through
+    // 0x07 is bind message
+    boolean ignoredMessage = cluster.profileId != 0x0104 || 
+        cluster.command == 0x0B ||
+        cluster.command == 0x07 ||
+        (cluster.data.size() > 0 && cluster.data.first() == 0x3e)
+    return !ignoredMessage
+}
+ 
+private parseReportAttributeMessage(String description) {
+	Map descMap = (description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+
+	def results = []
+    
+	if (descMap.cluster == "0001" && descMap.attrId == "0020") {
+		log.debug "Received battery level report"
+		results = createEvent(getBatteryResult(Integer.parseInt(descMap.value, 16)))
+	}
+
+	return results
+}
+
+private parseIasMessage(String description) {
+	List parsedMsg = description.split(' ')
+	String msgCode = parsedMsg[2]
+	int status = Integer.decode(msgCode)
+	def linkText = getLinkText(device)
+
+	def results = []
+	//log.debug(description)
+	if (status & 0b00000010) {results << createEvent(getButtonResult('pushed'))}
+	else if (~status & 0b00000010) results << createEvent(getButtonResult('released'))
+
+	if (status & 0b00000100) {
+    	//tampered
+	}
+	else if (~status & 0b00000100) {
+		//not tampered
+	}
+	
+	if (status & 0b00001000) {
+	}
+	else if (~status & 0b00001000) {
+		//log.debug "${linkText} battery OK"
+	}
+	//log.debug results
+	return results
+}
+
+private Map getBatteryResult(rawValue) {
+	log.debug 'Battery'
+	def linkText = getLinkText(device)
+    
+    def result = [
+    	name: 'battery'
+    ]
+    
+	def volts = rawValue / 10
+	def descriptionText
+	if (volts > 3.5) {
+		result.descriptionText = "${linkText} battery has too much power (${volts} volts)."
+	}
+	else {
+		def minVolts = 2.1
+    	def maxVolts = 3.0
+		def pct = (volts - minVolts) / (maxVolts - minVolts)
+		result.value = Math.min(100, (int) pct * 100)
+		result.descriptionText = "${linkText} battery was ${result.value}%"
+	}
+
+	return result
+}
+
+private Map getButtonResult(value) {
+	//log.debug 'Button Status'
+	def linkText = getLinkText(device)
+	def descriptionText = "${linkText} was ${value == 'pushed' ? 'pushed' : 'released'}"
+	return [
+		name: 'button',
+		value: value,
+        data: [buttonNumber: 1],
+		descriptionText: descriptionText,
+        displayed: true,
+        isStateChange: true
+	]
+}
+
+def configure() {
+
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	log.debug "Configuring Reporting, IAS CIE, and Bindings."
+	def configCmds = [
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 100",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
+
+		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
+		"zcl global send-me-a-report 1 0x20 0x20 3600 21600 {01}",		//checkin time 6 hrs
+		"send 0x${device.deviceNetworkId} 1 1", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 1 1 0x20"
+	]
+    return configCmds
+}
+
+def enrollResponse() {
+	log.debug "Sending enroll response"
+	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
+	[
+		//Resending the CIE in case the enroll request is sent before CIE is written
+		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
+		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
+		//Enroll Response
+		"raw 0x500 {01 23 00 00 00}",
+		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
+	]
+}
+
+private getEndpointId() {
+	new BigInteger(device.endpointId, 16).toString()
+}
+
+private hex(value) {
+	new BigInteger(Math.round(value).toString()).toString(16)
+}
+
+private String swapEndianHex(String hex) {
+    reverseArray(hex.decodeHex()).encodeHex()
+}
+
+private byte[] reverseArray(byte[] array) {
+    int i = 0;
+    int j = array.length - 1;
+    byte tmp;
+    while (j > i) {
+        tmp = array[j];
+        array[j] = array[i];
+        array[i] = tmp;
+        j--;
+        i++;
+    }
+    return array
+}

devicetypes/osotech/plantlink.src/plantlink.groovy

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

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

@@ -45,7 +45,16 @@ metadata {
 		valueTile("temperature", "device.temperature", width: 2, height: 2) {
 			state("temperature", label:'${currentValue}°', unit:"F",
 					backgroundColors:[
-							[value: 31, color: "#153591"],
+							// Celsius
+							[value: 0, color: "#153591"],
+							[value: 7, color: "#1e9cbb"],
+							[value: 15, color: "#90d2a7"],
+							[value: 23, color: "#44b621"],
+							[value: 28, color: "#f1d801"],
+							[value: 35, color: "#d04e00"],
+							[value: 37, color: "#bc2323"],
+							// Fahrenheit
+							[value: 40, color: "#153591"],
 							[value: 44, color: "#1e9cbb"],
 							[value: 59, color: "#90d2a7"],
 							[value: 74, color: "#44b621"],
@@ -386,7 +395,7 @@ def generateModeEvent(mode) {
 }
 
 def generateFanModeEvent(fanMode) {
-	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${mode} mode", displayed: true)
+	sendEvent(name: "thermostatFanMode", value: fanMode, descriptionText: "$device.displayName fan is in ${fanMode} mode", displayed: true)
 }
 
 def generateOperatingStateEvent(operatingState) {
@@ -421,6 +430,10 @@ def heat() {
 	generateStatusEvent()
 }
 
+def emergencyHeat() {
+	auxHeatOnly()
+}
+
 def auxHeatOnly() {
 	log.debug "auxHeatOnly"
 	def deviceId = device.deviceNetworkId.split(/\./).last()
@@ -480,7 +493,7 @@ def fanOn() {
 	} else {
 		log.debug "Error setting new mode."
 		def currentFanMode = device.currentState("thermostatFanMode")?.value
-		generateModeEvent(currentFanMode) // reset the tile back
+		generateFanModeEvent(currentFanMode) // reset the tile back
 	}
 }
 
@@ -501,7 +514,7 @@ def fanAuto() {
 	} else {
 		log.debug "Error setting new mode."
 		def currentFanMode = device.currentState("thermostatFanMode")?.value
-		generateModeEvent(currentFanMode) // reset the tile back
+		generateFanModeEvent(currentFanMode) // reset the tile back
 	}
 }
 

devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy

@@ -84,6 +84,7 @@ def setHue(percentage) {
 			log.error("Bad setHue result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def setSaturation(percentage) {
@@ -97,6 +98,7 @@ def setSaturation(percentage) {
 			log.error("Bad setSaturation result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def setColor(Map color) {
@@ -122,13 +124,15 @@ def setColor(Map color) {
 	parent.logErrors(logObject:log) {
 		def resp = parent.apiPUT("/lights/${selector()}/state", [color: attrs.join(" "), power: "on"])
 		if (resp.status < 300) {
-			sendEvent(name: "color", value: color.hex)
+			if (color.hex)
+				sendEvent(name: "color", value: color.hex)
 			sendEvent(name: "switch", value: "on")
 			events.each { sendEvent(it) }
 		} else {
 			log.error("Bad setColor result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def setLevel(percentage) {
@@ -150,6 +154,7 @@ def setLevel(percentage) {
 			log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def setColorTemperature(kelvin) {
@@ -165,6 +170,7 @@ def setColorTemperature(kelvin) {
 		}
 
 	}
+	return []
 }
 
 def on() {
@@ -174,6 +180,7 @@ def on() {
 			sendEvent(name: "switch", value: "on")
 		}
 	}
+	return []
 }
 
 def off() {
@@ -183,6 +190,7 @@ def off() {
 			sendEvent(name: "switch", value: "off")
 		}
 	}
+	return []
 }
 
 def poll() {

devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy

@@ -84,6 +84,7 @@ def setLevel(percentage) {
 			log.error("Bad setLevel result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def setColorTemperature(kelvin) {
@@ -99,6 +100,7 @@ def setColorTemperature(kelvin) {
 			log.error("Bad setColorTemperature result: [${resp.status}] ${resp.data}")
 		}
 	}
+	return []
 }
 
 def on() {
@@ -108,6 +110,7 @@ def on() {
 			sendEvent(name: "switch", value: "on")
 		}
 	}
+	return []
 }
 
 def off() {
@@ -117,6 +120,7 @@ def off() {
 			sendEvent(name: "switch", value: "off")
 		}
 	}
+	return []
 }
 
 def poll() {

devicetypes/smartthings/samsung-smart-tv.src/samsung-smart-tv.groovy

@@ -1,235 +0,0 @@
-/**
- *  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:
- *
- *      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.
- *
- *  Samsung TV
- *
- *  Author: SmartThings (juano23@gmail.com)
- *  Date: 2015-01-08
- */
- 
-metadata {
-	definition (name: "Samsung Smart TV", namespace: "smartthings", author: "SmartThings") {
-    		capability "switch" 
-            
-			command "mute" 
-			command "source"
-			command "menu"    
-            command "tools"           
-			command "HDMI"    
-            command "Sleep"
-            command "Up"
-            command "Down"
-            command "Left"
-            command "Right" 
-			command "chup" 
- 			command "chdown"               
-			command "prech"
-			command "volup"    
-            command "voldown"           
-            command "Enter"
-            command "Return"
-            command "Exit"
-            command "Info"            
-            command "Size"
-	}
-
-    standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) {
-        state "default", label:'TV', action:"switch.off", icon:"st.Electronics.electronics15", backgroundColor:"#ffffff"
-    }
-    standardTile("power", "device.switch", width: 1, height: 1, canChangeIcon: false) {
-        state "default", label:'', action:"switch.off", decoration: "flat", icon:"st.thermostat.heating-cooling-off", backgroundColor:"#ffffff"
-    }    
-    standardTile("mute", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Mute', action:"mute", icon:"st.custom.sonos.muted", backgroundColor:"#ffffff"
-    }    
-	standardTile("source", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Source', action:"source", icon:"st.Electronics.electronics15"
-    }
-	standardTile("tools", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Tools', action:"tools", icon:"st.secondary.tools"
-    }
-	standardTile("menu", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Menu', action:"menu", icon:"st.vents.vent"
-    }
-	standardTile("HDMI", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Source', action:"HDMI", icon:"st.Electronics.electronics15"
-    }
-    standardTile("Sleep", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Sleep', action:"Sleep", icon:"st.Bedroom.bedroom10"
-    }
-    standardTile("Up", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Up', action:"Up", icon:"st.thermostat.thermostat-up"
-    }
-    standardTile("Down", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Down', action:"Down", icon:"st.thermostat.thermostat-down"
-    }
-    standardTile("Left", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Left', action:"Left", icon:"st.thermostat.thermostat-left"
-    }
-    standardTile("Right", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Right', action:"Right", icon:"st.thermostat.thermostat-right"
-    }  
-	standardTile("chup", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'CH Up', action:"chup", icon:"st.thermostat.thermostat-up"
-    }
-	standardTile("chdown", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'CH Down', action:"chdown", icon:"st.thermostat.thermostat-down"
-    }
-	standardTile("prech", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Pre CH', action:"prech", icon:"st.secondary.refresh-icon"
-    }
-    standardTile("volup", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Vol Up', action:"volup", icon:"st.thermostat.thermostat-up"
-    }
-    standardTile("voldown", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Vol Down', action:"voldown", icon:"st.thermostat.thermostat-down"
-    }
-    standardTile("Enter", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Enter', action:"Enter", icon:"st.illuminance.illuminance.dark"
-    }
-    standardTile("Return", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Return', action:"Return", icon:"st.secondary.refresh-icon"
-    }
-    standardTile("Exit", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Exit', action:"Exit", icon:"st.locks.lock.unlocked"
-    }    
-    standardTile("Info", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Info', action:"Info", icon:"st.motion.acceleration.active"
-    }    
-    standardTile("Size", "device.switch", decoration: "flat", canChangeIcon: false) {
-        state "default", label:'Picture Size', action:"Size", icon:"st.contact.contact.open"
-    }      
-    main "switch"
-    details (["power","HDMI","Sleep","chup","prech","volup","chdown","mute","voldown", "menu", "Up", "tools", "Left", "Enter", "Right", "Return", "Down", "Exit", "Info","Size"])	
-}
-
-def parse(String description) {
-	return null
-}
-
-def off() {
-	log.debug "Turning TV OFF"
-    parent.tvAction("POWEROFF",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Power Off", displayed: true) 
-}
-
-def mute() {
-	log.trace "MUTE pressed"
-    parent.tvAction("MUTE",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Mute", displayed: true) 
-}
-
-def source() {
-	log.debug "SOURCE pressed"
-    parent.tvAction("SOURCE",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Source", displayed: true) 
-}
-
-def menu() {
-	log.debug "MENU pressed"
-    parent.tvAction("MENU",device.deviceNetworkId) 
-}
-
-def tools() {
-	log.debug "TOOLS pressed"
-    parent.tvAction("TOOLS",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Tools", displayed: true)     
-}
-
-def HDMI() {
-	log.debug "HDMI pressed"
-    parent.tvAction("HDMI",device.deviceNetworkId) 
-    sendEvent(name:"Command sent", value: "Source", displayed: true)
-}
-
-def Sleep() {
-	log.debug "SLEEP pressed"
-    parent.tvAction("SLEEP",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Sleep", displayed: true)
-}
-
-def Up() {
-	log.debug "UP pressed"
-    parent.tvAction("UP",device.deviceNetworkId)
-}
-
-def Down() {
-	log.debug "DOWN pressed"
-    parent.tvAction("DOWN",device.deviceNetworkId) 
-}
-
-def Left() {
-	log.debug "LEFT pressed"
-    parent.tvAction("LEFT",device.deviceNetworkId) 
-}
-
-def Right() {
-	log.debug "RIGHT pressed"
-    parent.tvAction("RIGHT",device.deviceNetworkId) 
-}
-
-def chup() {
-	log.debug "CHUP pressed"
-    parent.tvAction("CHUP",device.deviceNetworkId)
-    sendEvent(name:"Command", value: "Channel Up", displayed: true)         
-}
-
-def chdown() {
-	log.debug "CHDOWN pressed"
-    parent.tvAction("CHDOWN",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Channel Down", displayed: true)     
-}
-
-def prech() {
-	log.debug "PRECH pressed"
-    parent.tvAction("PRECH",device.deviceNetworkId)
-    sendEvent(name:"Command", value: "Prev Channel", displayed: true)       
-}
-
-def Exit() {
-	log.debug "EXIT pressed"
-    parent.tvAction("EXIT",device.deviceNetworkId) 
-}
-
-def volup() {
-	log.debug "VOLUP pressed"
-    parent.tvAction("VOLUP",device.deviceNetworkId)
-    sendEvent(name:"Command", value: "Volume Up", displayed: true)         
-}
-
-def voldown() {
-	log.debug "VOLDOWN pressed"
-    parent.tvAction("VOLDOWN",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Volume Down", displayed: true)         
-}
-
-def Enter() {
-	log.debug "ENTER pressed"
-    parent.tvAction("ENTER",device.deviceNetworkId) 
-}
-
-def Return() {
-	log.debug "RETURN pressed"
-    parent.tvAction("RETURN",device.deviceNetworkId) 
-}
-
-def Info() {
-	log.debug "INFO pressed"
-    parent.tvAction("INFO",device.deviceNetworkId) 
-	sendEvent(name:"Command", value: "Info", displayed: true)    
-}
-
-def Size() {
-	log.debug "PICTURE_SIZE pressed"
-    parent.tvAction("PICTURE_SIZE",device.deviceNetworkId) 
-    sendEvent(name:"Command", value: "Picture Size", displayed: true)
-}

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

@@ -100,9 +100,6 @@ metadata {
 				]
 			)
 		}
-		valueTile("3axis", "device.threeAxis", decoration: "flat", wordWrap: false, width: 2, height: 2) {
-			state("threeAxis", label:'${currentValue}', unit:"", backgroundColor:"#ffffff")
-		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
@@ -112,7 +109,7 @@ metadata {
 
 
 		main(["status", "acceleration", "temperature"])
-		details(["status", "acceleration", "temperature", "3axis", "battery", "refresh"])
+		details(["status", "acceleration", "temperature", "battery", "refresh"])
 	}
  }
 

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

@@ -23,22 +23,14 @@
         capability "Battery"
         capability "Configuration"
 
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019",
-                        manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_5", deviceJoinName: "Kwikset 5-Button Deadbolt"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019",
-                        manufacturer: "Kwikset", model: "SMARTCODE_LEVER_5", deviceJoinName: "Kwikset 5-Button Lever"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019",
-                        manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_10", deviceJoinName: "Kwikset 10-Button Deadbolt"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019",
-                        manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_10T", deviceJoinName: "Kwikset 10-Button Touch Deadbolt"
-        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019",
-                        manufacturer: "Yale", model: "YRL220 TS LL", deviceJoinName: "Yale Touch Screen Lever Lock"
-        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,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_5", deviceJoinName: "Kwikset 5-Button Deadbolt"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_LEVER_5", deviceJoinName: "Kwikset 5-Button Lever"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_10", deviceJoinName: "Kwikset 10-Button Deadbolt"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0004,0005,0009,0020,0101,0402,0B05,FDBD", outClusters: "000A,0019", manufacturer: "Kwikset", model: "SMARTCODE_DEADBOLT_10T", deviceJoinName: "Kwikset 10-Button Touch Deadbolt"
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0009,000A,0101,0020", outClusters: "000A,0019", manufacturer: "Yale", model: "YRL220 TS LL", deviceJoinName: "Yale Touch Screen Lever Lock"
+        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"
     }
 
     tiles(scale: 2) {

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

@@ -119,6 +119,10 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm
 def zwaveEvent(physicalgraph.zwave.commands.wakeupv1.WakeUpNotification cmd)
 {
 	def result = [createEvent(descriptionText: "${device.displayName} woke up", isStateChange: false)]
+
+	if (state.MSR == "011A-0601-0901" && device.currentState('motion') == null) {  // Enerwave motion doesn't always get the associationSet that the hub sends on join
+		result << response(zwave.associationV1.associationSet(groupingIdentifier:1, nodeId:zwaveHubNodeId))
+	}
 	if (!state.lastbat || (new Date().time) - state.lastbat > 53*60*60*1000) {
 		result << response(zwave.batteryV1.batteryGet())
 		result << response("delay 1200")
@@ -179,4 +183,4 @@ def zwaveEvent(physicalgraph.zwave.commands.manufacturerspecificv2.ManufacturerS
 
 	result << createEvent(descriptionText: "$device.displayName MSR: $msr", isStateChange: false)
 	result
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Thu Feb 25 08:56:06 CST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

settings.gradle

@@ -0,0 +1,19 @@
+/*
+ * This settings file was auto generated by the Gradle buildInit task
+ * by 'jblaisdell' at '2/25/16 8:56 AM' with Gradle 2.10
+ *
+ * The settings file is used to specify which projects to include in your build.
+ * In a single project build this file can be empty or even removed.
+ *
+ * Detailed information about configuring a multi-project build in Gradle can be found
+ * in the user guide at https://docs.gradle.org/2.10/userguide/multi_project_builds.html
+ */
+
+/*
+// To declare projects as part of a multi-project build use the 'include' method
+include 'shared'
+include 'api'
+include 'services:webservice'
+*/
+
+rootProject.name = 'SmartThingsPublic'

smartapps/mitchpond/3400-x-keypad-manager.src/3400-x-keypad-manager.groovy

@@ -0,0 +1,129 @@
+/**
+ *  3400-X Keypad Manager
+ *
+ *  Copyright 2015 Mitch Pond
+ *
+ *  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: "3400-X Keypad Manager",
+    namespace: "mitchpond",
+    author: "Mitch Pond",
+    description: "Service manager for Centralite 3400-X security keypad. Keeps keypad state in sync with Smart Home Monitor",
+    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",
+    singleInstance: false)
+
+
+preferences {
+	page(name: "setupPage")
+}
+
+def setupPage() {
+	dynamicPage(name: "setupPage",title: "3400-X Keypad Manager", install: true, uninstall: true) {
+        section("Settings") {
+            input(name: "keypad", title: "Keypad", type: "capability.lockCodes", multiple: false, required: true)
+            input(name: "pin"	, title: "PIN code", type: "number", range: "0000..9999", required: true)
+            paragraph "PIN should be four digits. Shorter PINs will be padded with leading zeroes. (42 becomes 0042)"
+            label(title: "Assign a name", required: false)
+        }
+        def routines = location.helloHome?.getPhrases()*.label
+        routines?.sort()
+        section("Routines", hideable: true, hidden: true) {
+        	input(name: "armRoutine", title: "Arm/Away routine", type: "enum", options: routines, required: false)
+            input(name: "disarmRoutine", title: "Disarm routine", type: "enum", options: routines, required: false)
+            input(name: "stayRoutine", title: "Arm/Stay routine", type: "enum", options: routines, required: false)
+            //input(name: "nightRoutine", title: "Arm/Night routine", type: "enum", options: routines, required: false)
+        }
+    }
+}
+
+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(location,"alarmSystemStatus",alarmStatusHandler)
+    subscribe(keypad,"codeEntered",codeEntryHandler)   
+
+    //initialize keypad to correct state
+    def event = [name:"alarmSystemStatus", value: location.currentState("alarmSystemStatus").value, 
+    			displayed: true, description: "System Status is ${shmState}"]
+    alarmStatusHandler(event)
+}
+
+//Returns the PIN padded with zeroes to 4 digits
+private String getPIN(){
+	return settings.pin.value.toString().padLeft(4,'0')
+}
+
+// TODO: implement event handlers
+def alarmStatusHandler(event) {
+	log.debug "Keypad manager caught alarm status change: "+event.value
+    if (event.value == "off") keypad?.setDisarmed()
+    else if (event.value == "away") keypad?.setArmedAway()
+    else if (event.value == "stay") keypad?.setArmedStay()
+}
+
+private sendSHMEvent(String shmState){
+	def event = [name:"alarmSystemStatus", value: shmState, 
+    			displayed: true, description: "System Status is ${shmState}"]
+    sendLocationEvent(event)
+}
+
+private execRoutine(armMode) {
+	if (armMode == 'away') location.helloHome?.execute(settings.armRoutine)
+    else if (armMode == 'stay') location.helloHome?.execute(settings.stayRoutine)
+    else if (armMode == 'off') location.helloHome?.execute(settings.disarmRoutine)    
+}
+
+def codeEntryHandler(evt){
+	//do stuff
+    log.debug "Caught code entry event! ${evt.value.value}"
+    
+    def codeEntered = evt.value as String
+    def correctCode = getPIN()
+    def data = evt.data as String
+    def armMode = ''
+    
+    if (data == '0') armMode = 'off'
+    else if (data == '3') armMode = 'away'
+    else if (data == '1') armMode = 'stay'
+    else if (data == '2') armMode = 'stay'	//Currently no separate night mode for SHM, set to 'stay'
+    else {
+    	log.error "${app.label}: Unexpected arm mode sent by keypad!: "+data
+        return []
+        }
+    
+    if (codeEntered == correctCode) {
+    	log.debug "Correct PIN entered. Change SHM state to ${armMode}"
+        keypad.acknowledgeArmRequest(data)
+        sendSHMEvent(armMode)
+		execRoutine(armMode)
+    }
+    else {
+    	log.debug "Invalid PIN"
+        //Could also call acknowledgeArmRequest() with a parameter of 4 to report invalid code. Opportunity to simplify code?
+    	keypad.sendInvalidKeycodeResponse()
+    }
+}

smartapps/smartthings/bose-soundtouch-connect.src/bose-soundtouch-connect.groovy

@@ -353,7 +353,7 @@ def onLocation(evt) {
     }
     else if (
         lanEvent.headers && lanEvent.body &&
-        lanEvent.headers."content-type".contains("xml")
+        lanEvent.headers."content-type"?.contains("xml")
         )
     {
         def parsers = getParsers()

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

@@ -89,7 +89,7 @@ mappings {
 }
 
 def getServerUrl() { return "https://graph.api.smartthings.com" }
-def getCallbackUrl() { "https://graph.api.smartthings.com/oauth/callback" }
+def getServercallbackUrl() { "https://graph.api.smartthings.com/oauth/callback" }
 def getBuildRedirectUrl() { "${serverUrl}/oauth/initialize?appId=${app.id}&access_token=${state.accessToken}&apiServerUrl=${apiServerUrl}" }
 
 def authPage() {
@@ -166,7 +166,7 @@ def callback() {
 
 def init() {
 	log.debug "Requesting Code"
-	def oauthParams = [client_id: "${appSettings.clientId}", scope: "remote", response_type: "code", redirect_uri: "${callbackUrl}" ]
+	def oauthParams = [client_id: "${appSettings.clientId}", scope: "remote", response_type: "code", redirect_uri: "${servercallbackUrl}" ]
 	redirect(location: "https://home.myharmony.com/oauth2/authorize?${toQueryString(oauthParams)}")
 }
 

smartapps/smartthings/samsung-tv-connect.src/samsung-tv-connect.groovy

@@ -1,401 +0,0 @@
-/**
- *  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:
- *
- *      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.
- *
- *  Samsung TV Service Manager
- *
- *  Author: SmartThings (Juan Risso)
- */
- 
-definition(
-	name: "Samsung TV (Connect)",
-	namespace: "smartthings",
-	author: "SmartThings",
-	description: "Allows you to control your Samsung TV from the SmartThings app. Perform basic functions like power Off, source, volume, channels and other remote control functions.",
-	category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Samsung/samsung-remote%402x.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Samsung/samsung-remote%403x.png",
-    singleInstance: true
-)
-
-preferences {
-	page(name:"samsungDiscovery", title:"Samsung TV Setup", content:"samsungDiscovery", refreshTimeout:5)
-}
-
-def getDeviceType() {
-	return "urn:samsung.com:device:RemoteControlReceiver:1"
-}
-
-//PAGES
-def samsungDiscovery()
-{
-	if(canInstallLabs())
-	{	
-		int samsungRefreshCount = !state.samsungRefreshCount ? 0 : state.samsungRefreshCount as int
-		state.samsungRefreshCount = samsungRefreshCount + 1
-		def refreshInterval = 3
-
-		def options = samsungesDiscovered() ?: []
-
-		def numFound = options.size() ?: 0
-
-		if(!state.subscribe) {
-			log.trace "subscribe to location"
-			subscribe(location, null, locationHandler, [filterEvents:false])
-			state.subscribe = true
-		}
-
-		//samsung discovery request every 5 //25 seconds
-		if((samsungRefreshCount % 5) == 0) {
-        	log.trace "Discovering..."
-			discoversamsunges()
-		}
-
-		//setup.xml request every 3 seconds except on discoveries
-		if(((samsungRefreshCount % 1) == 0) && ((samsungRefreshCount % 8) != 0)) {
-            log.trace "Verifing..."
-			verifysamsungPlayer()
-		}
-
-		return dynamicPage(name:"samsungDiscovery", title:"Discovery Started!", nextPage:"", refreshInterval:refreshInterval, install:true, uninstall: true) {
-			section("Please wait while we discover your Samsung TV. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") {
-				input "selectedsamsung", "enum", required:false, title:"Select Samsung TV (${numFound} found)", multiple:true, options:options
-			}
-		}
-	}
-	else
-	{
-		def upgradeNeeded = """To use SmartThings Labs, your Hub should be completely up to date.
-
-To update your Hub, access Location Settings in the Main Menu (tap the gear next to your location name), select your Hub, and choose "Update Hub"."""
-
-		return dynamicPage(name:"samsungDiscovery", title:"Upgrade needed!", nextPage:"", install:true, uninstall: true) {
-			section("Upgrade") {
-				paragraph "$upgradeNeeded"
-			}
-		}
-	}
-}
-
-def installed() {
-	log.trace "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.trace "Updated with settings: ${settings}"
-	unschedule()
-	initialize()
-}
-
-def uninstalled() {
-	def devices = getChildDevices()
-	log.trace "deleting ${devices.size()} samsung"
-	devices.each {
-		deleteChildDevice(it.deviceNetworkId)
-	}
-}
-
-def initialize() {
-	// remove location subscription afterwards
-	if (selectedsamsung) {
-		addsamsung()
-	}
-    //Check every 5 minutes for IP change
-	runEvery5Minutes("discoversamsunges")
-}
-
-//CHILD DEVICE METHODS
-def addsamsung() {
-	def players = getVerifiedsamsungPlayer()
-    log.trace "Adding childs" 
-	selectedsamsung.each { dni ->
-		def d = getChildDevice(dni)
-		if(!d) {
-			def newPlayer = players.find { (it.value.ip + ":" + it.value.port) == dni }
-			log.trace "newPlayer = $newPlayer"
-			log.trace "dni = $dni"
-			d = addChildDevice("smartthings", "Samsung Smart TV", dni, newPlayer?.value.hub, [label:"${newPlayer?.value.name}"])
-			log.trace "created ${d.displayName} with id $dni"
-
-			d.setModel(newPlayer?.value.model)
-			log.trace "setModel to ${newPlayer?.value.model}"
-		} else {
-			log.trace "found ${d.displayName} with id $dni already exists"
-		}
-	}
-}
-
-private tvAction(key,deviceNetworkId) {
-    log.debug "Executing ${tvCommand}"
-    
-	def tvs = getVerifiedsamsungPlayer()
-	def thetv = tvs.find { (it.value.ip + ":" + it.value.port) == deviceNetworkId }
-    
-    // Standard Connection Data
-    def appString = "iphone..iapp.samsung"
-    def appStringLength = appString.getBytes().size()
-
-    def tvAppString = "iphone.UN60ES8000.iapp.samsung"
-    def tvAppStringLength = tvAppString.getBytes().size()
-
-    def remoteName = "SmartThings".encodeAsBase64().toString()
-    def remoteNameLength = remoteName.getBytes().size()
-
-    // Device Connection Data
-    def ipAddress = convertHexToIP(thetv?.value.ip).encodeAsBase64().toString()
-    def ipAddressHex = deviceNetworkId.substring(0,8)
-    def ipAddressLength = ipAddress.getBytes().size()
-    
-    def macAddress = thetv?.value.mac.encodeAsBase64().toString()
-    def macAddressLength = macAddress.getBytes().size()
-
-    // The Authentication Message
-    def authenticationMessage = "${(char)0x64}${(char)0x00}${(char)ipAddressLength}${(char)0x00}${ipAddress}${(char)macAddressLength}${(char)0x00}${macAddress}${(char)remoteNameLength}${(char)0x00}${remoteName}"
-    def authenticationMessageLength = authenticationMessage.getBytes().size()
-    
-    def authenticationPacket = "${(char)0x00}${(char)appStringLength}${(char)0x00}${appString}${(char)authenticationMessageLength}${(char)0x00}${authenticationMessage}"
-
-    // If our initial run, just send the authentication packet so the prompt appears on screen
-    if (key == "AUTHENTICATE") {
-	    sendHubCommand(new physicalgraph.device.HubAction(authenticationPacket, physicalgraph.device.Protocol.LAN, "${ipAddressHex}:D6D8"))
-    } else {
-        // Build the command we will send to the Samsung TV
-        def command = "KEY_${key}".encodeAsBase64().toString()
-        def commandLength = command.getBytes().size()
-
-        def actionMessage = "${(char)0x00}${(char)0x00}${(char)0x00}${(char)commandLength}${(char)0x00}${command}"
-        def actionMessageLength = actionMessage.getBytes().size()
-
-        def actionPacket = "${(char)0x00}${(char)tvAppStringLength}${(char)0x00}${tvAppString}${(char)actionMessageLength}${(char)0x00}${actionMessage}"
-
-        // Send both the authentication and action at the same time
-        sendHubCommand(new physicalgraph.device.HubAction(authenticationPacket + actionPacket, physicalgraph.device.Protocol.LAN, "${ipAddressHex}:D6D8"))
-    }
-}
-
-private discoversamsunges()
-{
-	sendHubCommand(new physicalgraph.device.HubAction("lan discovery ${getDeviceType()}", physicalgraph.device.Protocol.LAN))
-}
-
-
-private verifysamsungPlayer() {
-	def devices = getsamsungPlayer().findAll { it?.value?.verified != true }
-
-	if(devices) {
-		log.warn "UNVERIFIED PLAYERS!: $devices"
-	}
-
-	devices.each {
-		verifysamsung((it?.value?.ip + ":" + it?.value?.port), it?.value?.ssdpPath)
-	}
-}
-
-private verifysamsung(String deviceNetworkId, String devicessdpPath) {
-	log.trace "dni: $deviceNetworkId, ssdpPath: $devicessdpPath"
-	String ip = getHostAddress(deviceNetworkId)
-	log.trace "ip:" + ip
-	sendHubCommand(new physicalgraph.device.HubAction("""GET ${devicessdpPath} HTTP/1.1\r\nHOST: $ip\r\n\r\n""", physicalgraph.device.Protocol.LAN, "${deviceNetworkId}"))
-}
-
-Map samsungesDiscovered() {
-	def vsamsunges = getVerifiedsamsungPlayer()
-	def map = [:]
-	vsamsunges.each {
-		def value = "${it.value.name}"
-		def key = it.value.ip + ":" + it.value.port
-		map["${key}"] = value
-	}
-    log.trace "Devices discovered $map"
-	map
-}
-
-def getsamsungPlayer()
-{
-	state.samsunges = state.samsunges ?: [:]
-}
-
-def getVerifiedsamsungPlayer()
-{
-	getsamsungPlayer().findAll{ it?.value?.verified == true }
-}
-
-def locationHandler(evt) {
-	def description = evt.description
-	def hub = evt?.hubId
-	def parsedEvent = parseEventMessage(description)
-	parsedEvent << ["hub":hub] 
-    log.trace "${parsedEvent}"
-    log.trace "${getDeviceType()} - ${parsedEvent.ssdpTerm}"
-	if (parsedEvent?.ssdpTerm?.contains(getDeviceType()))
-	{ //SSDP DISCOVERY EVENTS
-
-		log.trace "TV found"
-		def samsunges = getsamsungPlayer()
-
-		if (!(samsunges."${parsedEvent.ssdpUSN.toString()}"))
-		{ //samsung does not exist
-        	log.trace "Adding Device to state..."
-			samsunges << ["${parsedEvent.ssdpUSN.toString()}":parsedEvent]
-		}
-		else
-		{ // update the values
-
-			log.trace "Device was already found in state..."
-
-			def d = samsunges."${parsedEvent.ssdpUSN.toString()}"
-			boolean deviceChangedValues = false
-
-			if(d.ip != parsedEvent.ip || d.port != parsedEvent.port) {
-				d.ip = parsedEvent.ip
-				d.port = parsedEvent.port
-				deviceChangedValues = true
-				log.trace "Device's port or ip changed..."
-			}
-
-			if (deviceChangedValues) {
-				def children = getChildDevices()
-				children.each {
-					if (it.getDeviceDataByName("mac") == parsedEvent.mac) {
-						log.trace "updating dni for device ${it} with mac ${parsedEvent.mac}"
-						it.setDeviceNetworkId((parsedEvent.ip + ":" + parsedEvent.port)) //could error if device with same dni already exists
-					}
-				}
-			}
-		}
-	}
-	else if (parsedEvent.headers && parsedEvent.body)
-	{ // samsung RESPONSES
-    	def deviceHeaders = parseLanMessage(description, false)
-		def type = deviceHeaders.headers."content-type" 
-		def body
-		log.trace "REPONSE TYPE: $type"
-		if (type?.contains("xml"))
-		{ // description.xml response (application/xml)
-			body = new XmlSlurper().parseText(deviceHeaders.body)
-			log.debug body.device.deviceType.text()
-			if (body?.device?.deviceType?.text().contains(getDeviceType()))
-			{
-				def samsunges = getsamsungPlayer()
-				def player = samsunges.find {it?.key?.contains(body?.device?.UDN?.text())}
-				if (player)
-				{
-					player.value << [name:body?.device?.friendlyName?.text(),model:body?.device?.modelName?.text(), serialNumber:body?.device?.serialNum?.text(), verified: true]
-				}
-				else
-				{
-					log.error "The xml file returned a device that didn't exist"
-				}
-			}
-		}
-		else if(type?.contains("json"))
-		{ //(application/json)
-			body = new groovy.json.JsonSlurper().parseText(bodyString)
-			log.trace "GOT JSON $body"
-		}
-
-	}
-	else {
-		log.trace "TV not found..."
-		//log.trace description
-	}
-}
-
-private def parseEventMessage(String description) {
-	def event = [:]
-	def parts = description.split(',')
-	parts.each { part ->
-		part = part.trim()
-		if (part.startsWith('devicetype:')) {
-			part -= "devicetype:"
-			event.devicetype = part.trim()
-		}
-		else if (part.startsWith('mac:')) {
-			part -= "mac:"
-			event.mac = part.trim()
-		}
-		else if (part.startsWith('networkAddress:')) {
-			part -= "networkAddress:"
-			event.ip = part.trim()
-		}
-		else if (part.startsWith('deviceAddress:')) {
-			part -= "deviceAddress:"
-			event.port = part.trim()
-		}
-		else if (part.startsWith('ssdpPath:')) {
-			part -= "ssdpPath:"
-			event.ssdpPath = part.trim()
-		}
-		else if (part.startsWith('ssdpUSN:')) {
-			part -= "ssdpUSN:"
-			event.ssdpUSN = part.trim()
-		}
-		else if (part.startsWith('ssdpTerm:')) {
-			part -= "ssdpTerm:"
-			event.ssdpTerm = part.trim()
-		}
-		else if (part.startsWith('headers')) {
-			part -= "headers:"
-			event.headers = part.trim()
-		}
-		else if (part.startsWith('body')) {
-			part -= "body:"
-			event.body = part.trim()
-		}
-	}
-	event
-}
-
-def parse(childDevice, description) {
-	def parsedEvent = parseEventMessage(description)
-
-	if (parsedEvent.headers && parsedEvent.body) {
-		def headerString = new String(parsedEvent.headers.decodeBase64())
-		def bodyString = new String(parsedEvent.body.decodeBase64())
-		log.trace "parse() - ${bodyString}"
-
-		def body = new groovy.json.JsonSlurper().parseText(bodyString)
-	} else {
-		log.trace "parse - got something other than headers,body..."
-		return []
-	}
-}
-
-private Integer convertHexToInt(hex) {
-	Integer.parseInt(hex,16)
-}
-
-private String convertHexToIP(hex) {
-	[convertHexToInt(hex[0..1]),convertHexToInt(hex[2..3]),convertHexToInt(hex[4..5]),convertHexToInt(hex[6..7])].join(".")
-}
-
-private getHostAddress(d) {
-	def parts = d.split(":")
-	def ip = convertHexToIP(parts[0])
-	def port = convertHexToInt(parts[1])
-	return ip + ":" + port
-}
-
-private Boolean canInstallLabs()
-{
-	return hasAllHubsOver("000.011.00603")
-}
-
-private Boolean hasAllHubsOver(String desiredFirmware)
-{
-	return realHubFirmwareVersions.every { fw -> fw >= desiredFirmware }
-}
-
-private List getRealHubFirmwareVersions()
-{
-	return location.hubs*.firmwareVersionString.findAll { it }
-}

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

@@ -341,8 +341,12 @@ def ssdpSwitchHandler(evt) {
 			deviceChangedValues = true
 			log.debug "Device's port or ip changed..."
 			def child = getChildDevice(parsedEvent.mac)
-			child.subscribe(parsedEvent.ip, parsedEvent.port)
-			child.poll()
+			if (child) {
+				child.subscribe(parsedEvent.ip, parsedEvent.port)
+				child.poll()
+			} else {
+				log.debug "Device with mac $parsedEvent.mac not found"
+			}
 		}
 	}
 }
@@ -410,8 +414,12 @@ def ssdpLightSwitchHandler(evt) {
 			deviceChangedValues = true
 			log.debug "Device's port or ip changed..."
 			def child = getChildDevice(parsedEvent.mac)
-			log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
-			child.subscribe(parsedEvent.ip, parsedEvent.port)
+			if (child) {
+				log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
+				child.subscribe(parsedEvent.ip, parsedEvent.port)
+			} else {
+				log.debug "Device with mac $parsedEvent.mac not found"
+			}
 		}
 	}
 }
@@ -463,8 +471,12 @@ def locationHandler(evt) {
 				deviceChangedValues = true
 				log.debug "Device's port or ip changed..."
 				def child = getChildDevice(parsedEvent.mac)
-				child.subscribe(parsedEvent.ip, parsedEvent.port)
-				child.poll()
+				if (child) {
+					child.subscribe(parsedEvent.ip, parsedEvent.port)
+					child.poll()
+				} else {
+					log.debug "Device with mac $parsedEvent.mac not found"
+				}
 			}
 		}
 	}
@@ -518,8 +530,12 @@ def locationHandler(evt) {
 				deviceChangedValues = true
 				log.debug "Device's port or ip changed..."
 				def child = getChildDevice(parsedEvent.mac)
-				log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
-				child.subscribe(parsedEvent.ip, parsedEvent.port)
+				if (child) {
+					log.debug "updating ip and port, and resubscribing, for device with mac ${parsedEvent.mac}"
+					child.subscribe(parsedEvent.ip, parsedEvent.port)
+				} else {
+					log.debug "Device with mac $parsedEvent.mac not found"
+				}
 			}
 		}
 	}