Merge pull request #506 from juano2310/hue_bu

PROB-537 - Fix error in line 335

devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy

@@ -0,0 +1,627 @@
+/**
+ *  Spruce Controller - Pre Release V2 10/11/2015
+ *
+ *  Copyright 2015 Plaid Systems
+ *
+ *	Author: NC
+ *	Date: 2015-11
+ *
+ *  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.
+ *
+ -----------V3 updates-11-2015------------
+ -Start program button updated to signal schedule check in Scheduler
+ 11/17 alarm "0" -> 0	(ln 305)
+ */
+
+metadata {
+	definition (name: "Spruce Controller", namespace: "plaidsystems", author: "NCauffman") {
+		capability "Switch"
+        capability "Configuration"
+        capability "Refresh"
+        capability "Actuator"
+        capability "Valve"        
+		
+        attribute "switch", "string"
+        attribute "switch1", "string"
+		attribute "switch2", "string"
+		attribute "switch8", "string"
+		attribute "switch5", "string"
+		attribute "switch3", "string"
+		attribute "switch4", "string"
+		attribute "switch6", "string"
+		attribute "switch7", "string"
+        attribute "switch9", "string"
+		attribute "switch10", "string"
+		attribute "switch11", "string"
+		attribute "switch12", "string"
+		attribute "switch13", "string"
+		attribute "switch14", "string"
+		attribute "switch15", "string"
+        attribute "switch16", "string"
+		attribute "status", "string"        
+        
+        command "programOn"
+        command "programOff"
+        command "on"
+        command "off"
+        command "z1on"
+		command "z1off"
+		command "z2on"
+		command "z2off"        
+		command "z3on"
+		command "z3off"
+		command "z4on"
+		command "z4off"
+		command "z5on"
+		command "z5off"
+		command "z6on"
+		command "z6off"
+		command "z7on"
+		command "z7off"
+		command "z8on"
+		command "z8off"
+        command "z9on"
+        command "z9off"
+		command "z10on"
+		command "z10off"
+		command "z11on"
+		command "z11off"
+		command "z12on"
+		command "z12off"
+		command "z13on"
+		command "z13off"
+		command "z14on"
+		command "z14off"
+		command "z15on"
+		command "z15off"
+		command "z16on"
+		command "z16off"
+        command "offtime"
+        
+        command "refresh"        
+        command "rain"
+        command "manual"
+        command "setDisplay"
+        
+        command "settingsMap"
+        command "writeTime"
+        command "writeType"        
+        command "notify"
+        command "updated"
+
+		fingerprint endpointId: "1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18", profileId: "0104", deviceId: "0002", deviceVersion: "00", inClusters: "0000,0003,0004,0005,0006,000F", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZ16-01"
+		
+	}
+
+	// simulator metadata
+	simulator {
+		// status messages
+		
+		// reply messages
+		
+	}
+    preferences {
+    input description: "Press Configure button after making changes to these preferences", displayDuringSetup: true, type: "paragraph", element: "paragraph", title: ""
+    input "RainEnable", "bool", title: "Rain Sensor Attached?", required: false, displayDuringSetup: true
+    input "ManualTime", "number", title: "Automatic shutoff time when a zone is turned on manually?", required: false, displayDuringSetup: true
+	}
+
+	// UI tile definitions
+	tiles {
+    
+    	standardTile("status", "device.status") {            
+            state "schedule", label: 'Schedule Set', icon: "http://www.plaidsystems.com/smartthings/st_spruce_leaf_225_t.png"
+            state "finished", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#46c2e8"
+            state "raintoday", label: 'Rain Today', icon: "st.custom.wuk.nt_chancerain"
+            state "rainy", label: 'Previous Rain', icon: "st.custom.wuk.nt_chancerain"
+            state "raintom", label: 'Rain Tomorrow', icon: "st.custom.wuk.nt_chancerain"           
+            state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#52c435"
+            state "skipping", label: 'Skip Today', icon: "st.Outdoor.outdoor20", backgroundColor: "#36cfe3"
+            state "moisture", label: '', icon: "st.Weather.weather2", backgroundColor: "#36cfe3"
+            state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#f2a51f"           
+            state "active", label: 'Active', icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E"
+            state "season", label: 'Seasonal Adjustment', icon: "st.Outdoor.outdoor17", backgroundColor: "#ffb900"
+            state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#888888"
+            state "warning", label: '', icon: "st.categories.damageAndDanger", backgroundColor: "#ffff7f"
+            state "alarm", label: 'Alarm', icon: "st.categories.damageAndDanger", backgroundColor: "#f9240c"
+        }
+		standardTile("switch", "device.switch") {			
+			//state "programOff", label: 'Start Program', action: "programOn", icon: "st.sonos.play-icon", backgroundColor: "#a9a9a9"
+            state "off", label: 'Start Program', action: "programOn", icon: "st.sonos.play-icon", backgroundColor: "#a9a9a9"
+            state "programOn", label: 'Initialize Program', action: "programOff", icon: "st.contact.contact.open", backgroundColor: "#f6e10e"            
+            state "on", label: 'Program Running', action: "off", icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E"
+		}
+        standardTile("rainsensor", "device.rainsensor") {			
+			state "rainSensrooff", label: 'Rain Sensor Clear', icon: "st.Weather.weather14", backgroundColor: "#a9a9a9"
+            state "rainSensoron", label: 'Rain Detected', icon: "st.Weather.weather10", backgroundColor: "#f6e10e"
+		}    	
+        standardTile("switch1", "device.switch1") {			
+			state "z1off", label: '1', action: "z1on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch2", "device.switch2") {            
+            state "z2off", label: '2', action: "z2on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}        
+        standardTile("switch3", "device.switch3", inactiveLabel: false) {			
+			state "z3off", label: '3', action: "z3on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch4", "device.switch4", inactiveLabel: false) {            
+            state "z4off", label: '4', action: "z4on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch5", "device.switch5", inactiveLabel: false) {            
+            state "z5off", label: '5', action: "z5on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+		standardTile("switch6", "device.switch6", inactiveLabel: false) {            
+            state "z6off", label: '6', action: "z6on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch7", "device.switch7", inactiveLabel: false) {            
+            state "z7off", label: '7', action: "z7on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+		standardTile("switch8", "device.switch8", inactiveLabel: false) {            
+            state "z8off", label: '8', action: "z8on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch9", "device.switch9", inactiveLabel: false) {			
+			state "z9off", label: '9', action: "z9on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch10", "device.switch10", inactiveLabel: false) {            
+            state "z10off", label: '10', action: "z10on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}        
+        standardTile("switch11", "device.switch11", inactiveLabel: false) {			
+			state "z11off", label: '11', action: "z11on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch12", "device.switch12", inactiveLabel: false) {            
+            state "z12off", label: '12', action: "z12on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch13", "device.switch13", inactiveLabel: false) {            
+            state "z13off", label: '13', action: "z13on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+		standardTile("switch14", "device.switch14", inactiveLabel: false) {            
+            state "z14off", label: '14', action: "z14on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}
+        standardTile("switch15", "device.switch15", inactiveLabel: false) {            
+            state "z15off", label: '15', action: "z15on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}		
+        standardTile("switch16", "device.switch16", inactiveLabel: false) {            
+            state "z16off", label: '16', action: "z16on", icon: "st.valves.water.closed", backgroundColor: "#ffffff"
+            state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#46c2e8"
+		}        
+        standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") {
+			state "default", action: "refresh", icon:"st.secondary.refresh"            
+		}
+        standardTile("configure", "device.configure", inactiveLabel: false, decoration: "flat") {
+			state "configure", label:'', action:"configuration.configure", icon:"st.secondary.configure"
+		}		
+		
+        main (["status"])        
+        details(["status","rainsensor","switch","switch1","switch2","switch3","switch4","switch5","switch6","switch7","switch8","switch9","switch10","switch11","switch12","switch13","switch14","switch15","switch16","refresh","configure"])		
+    }    
+}
+
+def programOn(){
+    sendEvent(name: "switch", value: "programOn", descriptionText: "Program turned on")    
+    }
+    
+def programOff(){    
+    sendEvent(name: "switch", value: "off", descriptionText: "Program turned off")
+    off()
+    }
+    
+def updated(){
+	log.debug "updated"    
+}
+
+// Parse incoming device messages to generate events
+def parse(String description) {	
+	//log.debug "Parse description $description"
+    def result = null
+    def map = [:]
+	if (description?.startsWith("read attr -")) {
+		def descMap = parseDescriptionAsMap(description)
+		//log.debug "Desc Map: $descMap"
+        //using 000F cluster instead of 0006 (switch) because ST does not differentiate between EPs and processes all as switch
+		if (descMap.cluster == "000F" && descMap.attrId == "0055") {
+			log.debug "Zone"
+            map = getZone(descMap)            
+		}
+        else if (descMap.cluster == "0009" && descMap.attrId == "0000") {
+			log.debug "Alarm"            
+            map = getAlarm(descMap)
+            }
+	}     
+	
+	if (map) {
+		result = createEvent(map)
+	}
+	log.debug "Parse returned $map $result"
+	return result
+}
+
+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
+def getZone(descMap){
+	def map = [:]
+    
+    def EP = Integer.parseInt(descMap.endpoint.trim(), 16)
+    
+    String onoff
+    if(descMap.value == "00"){
+    	onoff = "off"        
+    }    
+    else onoff = "on"
+            
+    if (EP == 1){
+    	map.name = "switch"
+        map.value = onoff
+        map.descriptionText = "${device.displayName} turned sprinkler program $onoff"
+        }
+        
+    else if (EP == 18) {
+        map.name = "rainsensor"
+    	map.value = "rainSensor" + onoff
+        map.descriptionText = "${device.displayName} rain sensor is $onoff"
+        }
+   	else {
+        EP -= 1
+        map.name = "switch" + EP
+    	map.value = "z" + EP + onoff
+    	map.descriptionText = "${device.displayName} turned Zone $EP $onoff"
+    	}
+        
+    map.isStateChange = true 
+    map.displayed = true    
+    return map
+}
+
+def getAlarm(descMap){
+	def map = [:]
+    map.name = "status"
+    def alarmID = Integer.parseInt(descMap.value.trim(), 16)
+    log.debug "${alarmID}"
+    if(alarmID <= 0) map.descriptionText = "${device.displayName} has rebooted, no other alarms"
+    else map.descriptionText = "${device.displayName} rebooted, reported error on zone ${alarmID - 1}, please check zone is working correctly"    
+	map.value = "alarm"
+    map.isStateChange = true
+    map.displayed = true
+    return map        
+}
+
+//status notify and change status
+def notify(value, text){	
+	sendEvent(name:"status", value:"$value", descriptionText:"$text", isStateChange: true, display: false)
+
+}
+
+//prefrences - rain sensor, manual time
+def rain() {
+    log.debug "Rain $RainEnable"
+    if (RainEnable) "st wattr 0x${device.deviceNetworkId} 18 0x0F 0x51 0x10 {01}"
+    else "st wattr 0x${device.deviceNetworkId} 18 0x0F 0x51 0x10 {00}"
+}
+def manual(){
+	log.debug "Time $ManualTime"
+    def mTime = 10
+    if (ManualTime) mTime = ManualTime
+    def manualTime = hex(mTime)
+    "st wattr 0x${device.deviceNetworkId} 1 6 0x4002 0x21 {00${manualTime}}"
+    
+    }
+
+//write switch time settings map
+def settingsMap(WriteTimes, attrType){
+	log.debug WriteTimes    
+	
+    def i = 1
+    def runTime
+    def sendCmds = []
+    while(i <= 17){
+    	  
+    	if (WriteTimes."${i}"){        	
+        	runTime = hex(Integer.parseInt(WriteTimes."${i}"))
+        	log.debug "${i} : $runTime"
+		
+        	if (attrType == 4001) sendCmds.push("st wattr 0x${device.deviceNetworkId} ${i} 0x06 0x4001 0x21 {00${runTime}}")
+        	else sendCmds.push("st wattr 0x${device.deviceNetworkId} ${i} 0x06 0x4002 0x21 {00${runTime}}")
+            sendCmds.push("delay 500")
+        }
+        i++
+    }    
+    return sendCmds
+}
+
+//send switch time
+def writeType(wEP, cycle){
+	log.debug "wt ${wEP} ${cycle}"
+    "st wattr 0x${device.deviceNetworkId} ${wEP} 0x06 0x4001 0x21 {00" + hex(cycle) + "}"
+    }
+//send switch off time
+def writeTime(wEP, runTime){    
+    "st wattr 0x${device.deviceNetworkId} ${wEP} 0x06 0x4002 0x21 {00" + hex(runTime) + "}"
+    }
+
+//set reporting and binding
+def configure() {
+
+	String zigbeeId = swapEndianHex(device.hub.zigbeeId)
+	log.debug "Confuguring Reporting and Bindings ${device.deviceNetworkId} ${device.zigbeeId}"
+	sendEvent(name: 'configuration',value: 100, descriptionText: "Configuration initialized")
+    
+    def configCmds = [	
+        //program on/off
+        "zdo bind 0x${device.deviceNetworkId} 1 1 6 {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x09 {${device.zigbeeId}} {}", "delay 1000",        
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        //zones 1-8
+        "zdo bind 0x${device.deviceNetworkId} 2 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 3 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+		"zdo bind 0x${device.deviceNetworkId} 4 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 5 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 6 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 7 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 8 1 0x0F {${device.zigbeeId}} {}", "delay 1000",        
+        "zdo bind 0x${device.deviceNetworkId} 9 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        //zones 9-16
+        "zdo bind 0x${device.deviceNetworkId} 10 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 11 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+		"zdo bind 0x${device.deviceNetworkId} 12 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 13 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 14 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 15 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        "zdo bind 0x${device.deviceNetworkId} 16 1 0x0F {${device.zigbeeId}} {}", "delay 1000",        
+        "zdo bind 0x${device.deviceNetworkId} 17 1 0x0F {${device.zigbeeId}} {}", "delay 1000",
+        //rain sensor
+        "zdo bind 0x${device.deviceNetworkId} 18 1 0x0F {${device.zigbeeId}} {}",
+        
+        "zcl global send-me-a-report 6 0 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500",
+       
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 2", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 3", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 4", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 5", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 6", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 7", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 8", "delay 500",      
+        
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 9", "delay 500",
+       
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 10", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 11", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 12", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 13", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 14", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 15", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 16", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 17", "delay 500",
+        
+        "zcl global send-me-a-report 0x0F 0x55 0x10 1 0 {01}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 18", "delay 500",
+        
+        "zcl global send-me-a-report 0x09 0x00 0x21 1 0 {00}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500"
+	]
+    return configCmds + rain() + manual()
+}
+
+
+
+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
+}    
+
+def refresh() {
+
+	log.debug "refresh"
+    def refreshCmds = [
+	        
+        "st rattr 0x${device.deviceNetworkId} 1 0x0F 0x55", "delay 500",
+        
+        "st rattr 0x${device.deviceNetworkId} 2 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 3 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 4 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 5 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 6 0x0F 0x55", "delay 500",        
+        "st rattr 0x${device.deviceNetworkId} 7 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 8 0x0F 0x55", "delay 500",        
+        "st rattr 0x${device.deviceNetworkId} 9 0x0F 0x55", "delay 500",
+        
+        "st rattr 0x${device.deviceNetworkId} 10 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 11 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 12 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 13 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 14 0x0F 0x55", "delay 500",        
+        "st rattr 0x${device.deviceNetworkId} 15 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 16 0x0F 0x55", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 17 0x0F 0x55", "delay 500",
+        
+        "st rattr 0x${device.deviceNetworkId} 18 0x0F 0x51","delay 500",
+ 	
+    ]
+    return refreshCmds + rain() + manual()
+}
+
+// Commands to device
+//zones on - 8
+def on() {
+    //sendEvent(name:"status", value:"active", descriptionText:"Program Running", isStateChange: true, display: false)
+    log.debug "on"
+    "st cmd 0x${device.deviceNetworkId} 1 6 1 {}"    
+}
+def off() {
+    log.debug "off"
+    "st cmd 0x${device.deviceNetworkId} 1 6 0 {}"    
+}
+def z1on() {	
+    "st cmd 0x${device.deviceNetworkId} 2 6 1 {}"
+}
+def z1off() {    
+    "st cmd 0x${device.deviceNetworkId} 2 6 0 {}"
+}
+def z2on() {	
+    "st cmd 0x${device.deviceNetworkId} 3 6 1 {}"    
+}
+def z2off() {    
+    "st cmd 0x${device.deviceNetworkId} 3 6 0 {}"    
+}
+def z3on() {        
+    "st cmd 0x${device.deviceNetworkId} 4 6 1 {}"    
+}
+def z3off() {	
+    "st cmd 0x${device.deviceNetworkId} 4 6 0 {}"    
+}
+def z4on() {	
+    "st cmd 0x${device.deviceNetworkId} 5 6 1 {}"    
+}
+def z4off() {    
+    "st cmd 0x${device.deviceNetworkId} 5 6 0 {}"    
+}
+def z5on() {	
+	"st cmd 0x${device.deviceNetworkId} 6 6 1 {}"   
+}
+def z5off() {
+	"st cmd 0x${device.deviceNetworkId} 6 6 0 {}"    
+}
+def z6on() {
+	"st cmd 0x${device.deviceNetworkId} 7 6 1 {}"
+}
+def z6off() {
+    "st cmd 0x${device.deviceNetworkId} 7 6 0 {}"
+}
+def z7on() {
+	"st cmd 0x${device.deviceNetworkId} 8 6 1 {}"  
+}
+def z7off() {
+	"st cmd 0x${device.deviceNetworkId} 8 6 0 {}"    
+}
+def z8on() {
+	"st cmd 0x${device.deviceNetworkId} 9 6 1 {}"    
+}
+def z8off() {
+	"st cmd 0x${device.deviceNetworkId} 9 6 0 {}"    
+}
+
+//zones 9 - 16
+def z9on() {	
+    "st cmd 0x${device.deviceNetworkId} 10 6 1 {}"    
+}
+def z9off() {	    
+    "st cmd 0x${device.deviceNetworkId} 10 6 0 {}"   
+}
+def z10on() {	
+    "st cmd 0x${device.deviceNetworkId} 11 6 1 {}"    
+}
+def z10off() {    
+    "st cmd 0x${device.deviceNetworkId} 11 6 0 {}"    
+}
+def z11on() {        
+    "st cmd 0x${device.deviceNetworkId} 12 6 1 {}"    
+}
+def z11off() {	
+    "st cmd 0x${device.deviceNetworkId} 12 6 0 {}"    
+}
+def z12on() {	
+    "st cmd 0x${device.deviceNetworkId} 13 6 1 {}"    
+}
+def z12off() {    
+    "st cmd 0x${device.deviceNetworkId} 13 6 0 {}"    
+}
+def z13on() {	
+	"st cmd 0x${device.deviceNetworkId} 14 6 1 {}"   
+}
+def z13off() {
+	"st cmd 0x${device.deviceNetworkId} 14 6 0 {}"    
+}
+def z14on() {
+	"st cmd 0x${device.deviceNetworkId} 15 6 1 {}"
+}
+def z14off() {
+    "st cmd 0x${device.deviceNetworkId} 15 6 0 {}"
+}
+def z15on() {
+	"st cmd 0x${device.deviceNetworkId} 16 6 1 {}"  
+}
+def z15off() {
+	"st cmd 0x${device.deviceNetworkId} 16 6 0 {}"    
+}
+def z16on() {
+	"st cmd 0x${device.deviceNetworkId} 17 6 1 {}"    
+}
+def z16off() {
+	"st cmd 0x${device.deviceNetworkId} 17 6 0 {}"    
+}

devicetypes/plaidsystems/spruce-sensor.src/spruce-sensor.groovy

@@ -0,0 +1,397 @@
+/**
+ *  Spruce Sensor -Pre-release V2 10/8/2015
+ *
+ *  Copyright 2014 Plaid Systems
+ *
+ *  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.
+ *
+ -------10/20/2015 Updates--------
+ -Fix/add battery reporting interval to update
+ -remove polling and/or refresh(?)
+ */
+metadata {
+	definition (name: "Spruce Sensor", namespace: "plaidsystems", author: "NCauffman") {
+		
+		capability "Configuration"
+		capability "Battery"
+        capability "Relative Humidity Measurement"
+        capability "Temperature Measurement"
+        capability "Sensor"
+        //capability "Polling"
+		
+        attribute "maxHum", "string"
+        attribute "minHum", "string"        
+        
+        command "resetHumidity"
+        command "refresh"
+        
+        fingerprint profileId: "0104", inClusters: "0000,0001,0003,0402,0405", outClusters: "0003, 0019", manufacturer: "PLAID SYSTEMS", model: "PS-SPRZMS-01"
+	}
+
+	preferences {
+		input description: "This feature allows you to correct any temperature variations by selecting an offset. Ex: If your sensor consistently reports a temp that's 5 degrees too warm, you'd enter \"-5\". If 3 degrees too cold, enter \"+3\".", displayDuringSetup: false, type: "paragraph", element: "paragraph", title: ""
+		input "tempOffset", "number", title: "Temperature Offset", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
+        input "interval", "number", title: "Measurement Interval 1-120 minutes (default: 10 minutes)", description: "Set how often you would like to check soil moisture in minutes", range: "1..120", defaultValue: 10, displayDuringSetup: false
+        input "resetMinMax", "bool", title: "Reset Humidity min and max", required: false, displayDuringSetup: false
+      }
+
+	tiles {
+		valueTile("temperature", "device.temperature", canChangeIcon: false, canChangeBackground: false) {
+			state "temperature", label:'${currentValue}°',
+				backgroundColors:[
+					[value: 31, color: "#153591"],
+					[value: 44, color: "#1e9cbb"],
+					[value: 59, color: "#90d2a7"],
+					[value: 74, color: "#44b621"],
+					[value: 84, color: "#f1d801"],
+					[value: 95, color: "#d04e00"],
+					[value: 96, color: "#bc2323"]
+				]
+		}
+		valueTile("humidity", "device.humidity", width: 2, height: 2, canChangeIcon: false, canChangeBackground: true) {
+			state "humidity", label:'${currentValue}%', unit:"",
+            	backgroundColors:[
+					[value: 0, color: "#635C0C"],
+					[value: 16, color: "#EBEB21"],
+					[value: 22, color: "#C7DE6A"],
+					[value: 42, color: "#9AD290"],
+					[value: 64, color: "#44B621"],
+					[value: 80, color: "#3D79D9"],
+					[value: 96, color: "#0A50C2"]
+				]
+		}
+        
+        valueTile("maxHum", "device.maxHum", canChangeIcon: false, canChangeBackground: false) {
+			state "maxHum", label:'High ${currentValue}%', unit:"",
+            	backgroundColors:[
+					[value: 0, color: "#635C0C"],
+					[value: 16, color: "#EBEB21"],
+					[value: 22, color: "#C7DE6A"],
+					[value: 42, color: "#9AD290"],
+					[value: 64, color: "#44B621"],
+					[value: 80, color: "#3D79D9"],
+					[value: 96, color: "#0A50C2"]
+				]
+		}
+		valueTile("minHum", "device.minHum", canChangeIcon: false, canChangeBackground: false) {
+			state "minHum", label:'Low ${currentValue}%', unit:"",
+            	backgroundColors:[
+					[value: 0, color: "#635C0C"],
+					[value: 16, color: "#EBEB21"],
+					[value: 22, color: "#C7DE6A"],
+					[value: 42, color: "#9AD290"],
+					[value: 64, color: "#44B621"],
+					[value: 80, color: "#3D79D9"],
+					[value: 96, color: "#0A50C2"]
+				]
+		} 
+ 
+		valueTile("battery", "device.battery", decoration: "flat", canChangeIcon: false, canChangeBackground: false) {
+			state "battery", label:'${currentValue}% battery'
+		}
+        
+		main  (["humidity"])
+		details(["humidity","maxHum","minHum","temperature","battery"])
+	}
+}
+
+def parse(String description) {
+	log.debug "Parse description $description config: ${device.latestValue('configuration')} interval: $interval"      
+    
+    Map map = [:]
+    
+    if (description?.startsWith('catchall:')) {
+		map = parseCatchAllMessage(description)
+	}
+	else if (description?.startsWith('read attr -')) {
+		map = parseReportAttributeMessage(description)
+	}    
+	else if (description?.startsWith('temperature: ') || description?.startsWith('humidity: ')) {
+		map = parseCustomMessage(description)
+	}
+    def result = map ? createEvent(map) : null
+ 	
+    //check in configuration change
+    if (!device.latestValue('configuration')) result = poll()
+    if (device.latestValue('configuration').toInteger() != interval && interval != null) {  	
+        result = poll()            
+    }
+ 	log.debug "result: $result"
+    return result
+    
+}
+
+
+
+private Map parseCatchAllMessage(String description) {
+    Map resultMap = [:]
+    def linkText = getLinkText(device)
+	//log.debug "Catchall"
+    def descMap = zigbee.parse(description)
+    
+    //check humidity configuration is complete
+    if (descMap.command == 0x07 && descMap.clusterId == 0x0405){    	
+        def configInterval = 10
+        if (interval != null) configInterval = interval        
+        sendEvent(name: 'configuration',value: configInterval, descriptionText: "Configuration Successful")        
+        //setConfig()
+        log.debug "config complete"        
+        //return resultMap = [name: 'configuration', value: configInterval, descriptionText: "Settings configured successfully"]                
+    }
+    else if (descMap.command == 0x0001){    
+    	def hexString = "${hex(descMap.data[5])}" + "${hex(descMap.data[4])}"
+    	def intString = Integer.parseInt(hexString, 16)    
+    	//log.debug "command: $descMap.command clusterid: $descMap.clusterId $hexString $intString"
+    
+    	if (descMap.clusterId == 0x0402){    	
+            def value = getTemperature(hexString)
+            resultMap = getTemperatureResult(value)    
+        }
+        else if (descMap.clusterId == 0x0405){
+            def value = Math.round(new BigDecimal(intString / 100)).toString()
+            resultMap = getHumidityResult(value)
+
+        }
+        else return null
+    }
+    else return null 
+    
+    return resultMap
+}    
+    
+private Map parseReportAttributeMessage(String description) {	
+    def descMap = parseDescriptionAsMap(description)
+	log.debug "Desc Map: $descMap"
+    log.debug "Report Attributes"
+ 
+	Map resultMap = [:]
+	if (descMap.cluster == "0001" && descMap.attrId == "0000") {		
+        resultMap = getBatteryResult(descMap.value)
+	}    
+    return resultMap
+}
+
+def parseDescriptionAsMap(description) {
+	(description - "read attr - ").split(",").inject([:]) { map, param ->
+		def nameAndValue = param.split(":")
+		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
+	}
+}
+
+private Map parseCustomMessage(String description) {
+	Map resultMap = [:]  
+        
+	log.debug "parseCustom"
+	if (description?.startsWith('temperature: ')) {
+		def value = zigbee.parseHATemperatureValue(description, "temperature: ", getTemperatureScale())
+		resultMap = getTemperatureResult(value)
+	}
+	else if (description?.startsWith('humidity: ')) {
+		def pct = (description - "humidity: " - "%").trim()
+		if (pct.isNumber()) {        	
+            def value = Math.round(new BigDecimal(pct)).toString()
+			resultMap = getHumidityResult(value)
+		} else {
+			log.error "invalid humidity: ${pct}"
+		}    
+	}
+	return resultMap
+}
+ 
+private Map getHumidityResult(value) {
+    def linkText = getLinkText(device)
+    def maxHumValue = 0
+    def minHumValue = 0
+    if (device.currentValue("maxHum") != null) maxHumValue = device.currentValue("maxHum").toInteger()
+    if (device.currentValue("minHum") != null) minHumValue = device.currentValue("minHum").toInteger()
+    log.debug "Humidity max: ${maxHumValue} min: ${minHumValue}"
+    def compare = value.toInteger()
+    
+    if (compare > maxHumValue) {
+        sendEvent(name: 'maxHum', value: value, unit: '%', descriptionText: "${linkText} soil moisture high is ${value}%")
+        }
+    else if (((compare < minHumValue) || (minHumValue <= 2)) && (compare != 0)) {
+        sendEvent(name: 'minHum', value: value, unit: '%', descriptionText: "${linkText} soil moisture low is ${value}%")
+        }    
+    
+    return [
+    	name: 'humidity',
+    	value: value,
+    	unit: '%',
+        descriptionText: "${linkText} soil moisture is ${value}%"
+    ]
+}
+
+
+
+def getTemperature(value) {
+	def celsius = (Integer.parseInt(value, 16).shortValue()/100)
+    //log.debug "Report Temp $value : $celsius C"
+	if(getTemperatureScale() == "C"){
+		return celsius
+	} else {
+		return celsiusToFahrenheit(celsius) as Integer
+	}
+}
+
+private Map getTemperatureResult(value) {
+	log.debug "Temperature: $value"
+	def linkText = getLinkText(device)
+        
+	if (tempOffset) {
+		def offset = tempOffset as int
+		def v = value as int
+		value = v + offset        
+	}
+	def descriptionText = "${linkText} is ${value}°${temperatureScale}"
+	return [
+		name: 'temperature',
+		value: value,
+		descriptionText: descriptionText
+	]
+}
+
+private Map getBatteryResult(value) {
+	log.debug 'Battery'
+	def linkText = getLinkText(device)
+        
+    def result = [
+    	name: 'battery'
+    ]
+    	
+	def min = 2500   
+	def percent = ((Integer.parseInt(value, 16) - min) / 5)
+	percent = Math.max(0, Math.min(percent, 100.0))
+    result.value = Math.round(percent)
+    
+    def descriptionText
+    if (percent < 10) result.descriptionText = "${linkText} battery is getting low $percent %."
+	else result.descriptionText = "${linkText} battery is ${result.value}%"
+	
+	return result
+}
+
+def resetHumidity(){
+	def linkText = getLinkText(device)
+    def minHumValue = 0
+    def maxHumValue = 0
+    sendEvent(name: 'minHum', value: minHumValue, unit: '%', descriptionText: "${linkText} min soil moisture reset to ${minHumValue}%")
+    sendEvent(name: 'maxHum', value: maxHumValue, unit: '%', descriptionText: "${linkText} max soil moisture reset to ${maxHumValue}%")
+}	
+
+def setConfig(){
+	def configInterval = 100
+    if (interval != null) configInterval = interval        
+    sendEvent(name: 'configuration',value: configInterval, descriptionText: "Configuration initialized")
+}
+
+//when device preferences are changed
+def updated(){	
+    log.debug "device updated"
+    if (!device.latestValue('configuration')) configure()
+    else{
+    	if (resetMinMax == true) resetHumidity()
+        if (device.latestValue('configuration').toInteger() != interval && interval != null){    	
+            sendEvent(name: 'configuration',value: 0, descriptionText: "Settings changed and will update at next report. Measure interval set to ${interval} mins")
+    	}
+    }
+}
+
+//poll
+def poll() {
+	log.debug "poll called"
+    List cmds = []
+    if (!device.latestValue('configuration')) cmds += configure()
+    else if (device.latestValue('configuration').toInteger() != interval && interval != null) { 
+    	cmds += intervalUpdate()
+    }
+    //cmds += refresh()
+    log.debug "commands $cmds"
+    return cmds?.collect { new physicalgraph.device.HubAction(it) }    
+}
+
+//update intervals
+def intervalUpdate(){
+	log.debug "intervalUpdate"
+    def minReport = 10
+    def maxReport = 610
+    if (interval != null) {
+    	minReport = interval
+        maxReport = interval * 61
+    }
+    [    
+    	"zcl global send-me-a-report 0x405 0x0000 0x21 $minReport $maxReport {6400}", "delay 500",
+    	"send 0x${device.deviceNetworkId} 1 1", "delay 500",
+        "zcl global send-me-a-report 1 0x0000 0x21 0x0C 0 {0500}", "delay 500",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500",
+    ]    
+}
+
+def refresh() {
+	log.debug "refresh"
+    [
+        "st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 500",
+        "st rattr 0x${device.deviceNetworkId} 1 0x405 0", "delay 500",    
+        "st rattr 0x${device.deviceNetworkId} 1 1 0"
+    ]    
+}
+
+//configure
+def configure() {
+	//set minReport = measurement in minutes
+    def minReport = 10
+    def maxReport = 610
+	    
+    //String zigbeeId = swapEndianHex(device.hub.zigbeeId)
+	//log.debug "zigbeeid ${device.zigbeeId} deviceId ${device.deviceNetworkId}"
+    if (!device.zigbeeId) sendEvent(name: 'configuration',value: 0, descriptionText: "Device Zigbee Id not found, remove and attempt to rejoin device")
+    else sendEvent(name: 'configuration',value: 100, descriptionText: "Configuration initialized")
+    //log.debug "Configuring Reporting and Bindings. min: $minReport max: $maxReport "
+	
+    [
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x402 {${device.zigbeeId}} {}", "delay 500",
+        "zdo bind 0x${device.deviceNetworkId} 1 1 0x405 {${device.zigbeeId}} {}", "delay 500",                
+		"zdo bind 0x${device.deviceNetworkId} 1 1 1 {${device.zigbeeId}} {}", "delay 1000",
+        
+        //temperature
+        "zcl global send-me-a-report 0x402 0x0000 0x29 1 0 {3200}",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500",
+        
+        //min = soil measure interval
+        "zcl global send-me-a-report 0x405 0x0000 0x21 $minReport $maxReport {6400}",        
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500",       
+     
+        //min = battery measure interval  1 = 1 hour     
+        "zcl global send-me-a-report 1 0x0000 0x21 0x0C 0 {0500}",
+        "send 0x${device.deviceNetworkId} 1 1", "delay 500"
+	] + refresh()
+}
+
+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/smartthings/homeseer-multisensor.src/homeseer-multisensor.groovy

@@ -80,19 +80,12 @@ def parse(String description) {
 	if (cmd) {
 		result = zwaveEvent(cmd)
 	}
-	// log.debug "Parsed ${description.inspect()} to ${result.inspect()}"
+	log.debug "Parsed ${description.inspect()} to ${result.inspect()}"
 	return result
 }
 
 def zwaveEvent(physicalgraph.zwave.commands.multiinstancev1.MultiInstanceCmdEncap cmd) {
-	def encapsulated = null
-	if (cmd.respondsTo("encapsulatedCommand")) {
-		encapsulated = cmd.encapsulatedCommand()
-	} else {
-		def hex1 = { n -> String.format("%02X", n) }
-		def sorry = "command: ${hex1(cmd.commandClass)}${hex1(cmd.command)}, payload: " + cmd.parameter.collect{ hex1(it) }.join(" ")
-		encapsulated = zwave.parse(sorry, [0x31: 1, 0x84: 2, 0x60: 1, 0x85: 1, 0x70: 1])
-	}
+	def encapsulated = cmd.encapsulatedCommand([0x31: 1, 0x84: 2, 0x60: 1, 0x85: 1, 0x70: 1])
 	return encapsulated ? zwaveEvent(encapsulated) : null
 }
 

devicetypes/smartthings/navien-room-controller.src/navien-room-controller.groovy

@@ -1,348 +0,0 @@
-/**
- *  Navien Thermostat
- *
- *  Author: Navien Within
- *  Date: 2015-11-02
- */
-metadata {
-	definition (name: "Navien Room Controller", namespace: "smartthings", author: "Navien") {
-        capability "Thermostat"
-        capability "Polling"
-        capability "Refresh"
-        
-        command "generateEvent"
-        command "powerONOFF"
-        command "setRoomTemp"
-        command "setOndolTemp"
-        command "controlMode1"
-        command "controlMode2"
-        
-        attribute "setRoomSlider",  "NUMBER"
-        attribute "setOndolSlider", "NUMBER"
-	}
-
-  	// simulator metadata
-	simulator { }
-	
-    //tiles(scale: 2) {
-    tiles {
-    	/*
-		multiAttributeTile(name: "temperature", type: "thermostat", canChangeIcon: true, canChangeBackground: true) {
-			tileAttribute("temperature", key: "PRIMARY_CONTROL") {
-                attributeState "temperature", label: '${currentValue}°', icon:"st.Home.home1", backgroundColor:"#FFA81E"
-            }
-            tileAttribute ("statusText", key: "SECONDARY_CONTROL") {
-				attributeState "statusText", label: 'statusText'
-			}
-            tileAttribute("button", key: "VALUE_CONTROL"){
-                attributeState "setUp"
-                attributeState "setDown"
-            }
-		}
-        */
-        
-        valueTile("thermostatStatus", "device.thermostatStatus", width: 3, height: 2) {
-			state "전원 OFF",       label:'${currentValue}', icon:"st.Navien.bgs_power_off",     backgroundColor:"#BDBDBD"
-            state "외출 ON",        label:'${currentValue}', icon:"st.Navien.bgs_out",           backgroundColor:"#FF8C17"
-            state "실내난방",       label:'${currentValue}', icon:"st.Navien.bgs_indoor",        backgroundColor:"#FF8C17"
-            state "온돌난방",       label:'${currentValue}', icon:"st.Navien.bgs_ondol",         backgroundColor:"#FF8C17"
-            state "반복예약난방",   label:'${currentValue}', icon:"st.Navien.bgs_heating_again", backgroundColor:"#FF8C17"
-            state "24시간예약난방", label:'${currentValue}', icon:"st.Navien.bgs_24heat",        backgroundColor:"#FF8C17"
-            state "간편예약난방",   label:'${currentValue}', icon:"st.Navien.bgs_heat",          backgroundColor:"#FF8C17"
-            state "온수전용",       label:'${currentValue}', icon:"st.Navien.bgs_water",         backgroundColor:"#FF8C17"
-            state "빠른온수",       label:'${currentValue}', icon:"st.Navien.bgs_water_fast",    backgroundColor:"#FF8C17"
-		}
-        
-        valueTile("temperature", "device.temperature", width: 1, height: 1, inactiveLabel: false) {
-            state "OFF",     label:'',                  unit:"C", icon:"st.Navien.bg_recent_off"
-            state "default", label:'${currentValue}°', unit:"C", icon:"st.Navien.bg_recent"
-		}
-        
-        valueTile("hotWater", "device.hotWater", width: 1, height: 1) {
-        	state "OFF",     label:'',                  unit:"C", icon:"st.Navien.bg_water_off"
-			state "default", label:'${currentValue}°', unit:"C", icon:"st.Navien.bg_water"
-		}
-        
-        standardTile("refresh", "device.refresh", , width: 1, height: 1, inactiveLabel: false) {
-			state "default", action:"refresh.refresh", icon:"st.Navien.but_refresh"
-		}
-               
-        valueTile("setRoomTemp", "device.setRoomTemp", width: 1, height:1) {
-        	state "OFF",     label:'',                  icon:"st.Navien.bg_indoor_off"
-			state "default", label:'${currentValue}°', icon:"st.Navien.bg_indoor"
-		}
-        
-        controlTile("setRoomSlider", "device.setRoomSlider", "slider", height: 1, width: 2, inactiveLabel: false, range:"(10..40)") {
-			state "default", action:"setRoomTemp", backgroundColor:"#F08C00"
-		}
-        
-        valueTile("setOndolTemp", "device.setOndolTemp", width: 1, height:1) {
-        	state "OFF",     label:'',                  icon:"st.Navien.bg_ondol"
-			state "default", label:'${currentValue}°', icon:"st.Navien.bg_ondol_off"
-		}
-        
-        controlTile("setOndolSlider", "device.setOndolSlider", "slider", height: 1, width: 2, inactiveLabel: false, range:"(40..83)") {
-			state "default", action:"setOndolTemp", backgroundColor:"#F08C00"
-		}
-        
-        standardTile("power", "device.power", width: 1, height: 1, inactiveLabel: false) {
-			state "ON",      label:'', action:"powerONOFF", icon:"st.Navien.but_power"
-            state "default", label:'', action:"powerONOFF", icon:"st.Navien.but_power_off"
-		}
-        
-        standardTile("controlMode1", "device.controlMode1", width: 1, height: 1, inactiveLabel: false) {
-            state "실내난방 ON", label:'', action:"controlMode1", icon:"st.Navien.but_indoor"
-            state "온돌난방 ON", label:'', action:"controlMode1", icon:"st.Navien.but_ondol"
-            state "default",     label:'',                        icon:"st.Navien.but_indoor_off"
-		}
-        
-        standardTile("controlMode2", "device.controlMode2", width: 1, height: 1, inactiveLabel: false) {
-            state "외출해제", label:'', action:"controlMode2", icon:"st.Navien.but_out_off"
-            state "외출설정", label:'', action:"controlMode2", icon:"st.Navien.but_out"
-            state "default",  label:'',                        icon:"st.Navien.but_out_dis"
-		}
-        
-        valueTile("herotile", "device.herotile", width: 3, height:1) {
-			state "default", label:'', icon:"st.Navien.bg_herotile"
-		}
-        
-		main "thermostatStatus"
-		details(["thermostatStatus", "temperature", "hotWater", "refresh", "setRoomTemp", "setRoomSlider", "setOndolTemp", "setOndolSlider", "power", "controlMode1", "controlMode2", "herotile"])
-	}
-}
-
-def powerONOFF()
-{
-	log.debug "powerONOFF called"
-    def powerStatus = device.currentValue("power")
-    def results
-    if(powerStatus == "ON")
-    {
-    	results = parent.childRequest(this, "1", "33", "0")
-    }
-    else if(powerStatus == "전원 OFF")
-    {
-    	results = parent.childRequest(this, "1", "34", "0")
-    }
-    generateEvent(results)
-    log.debug "powerONOFF ended"
-}
-
-def setRoomTemp(degrees)
-{
-    def degreesInteger = degrees as Integer
-	sendEvent("name":"setRoomSlider", "value":degreesInteger)
-    
-    def status = device.currentValue("thermostatStatus")
-    if(status == "실내난방")
-    {
-    	def results = parent.childRequest(this, "1", "44", degreesInteger*2)
-        generateEvent(results)
-    }
-}
-
-def setOndolTemp(degrees)
-{
-    def degreesInteger = degrees as Integer
-	sendEvent("name":"setOndolSlider", "value":degreesInteger)
-    
-    def status = device.currentValue("thermostatStatus")
-    if(status == "온돌난방")
-    {
-    	def results = parent.childRequest(this, "1", "36", degreesInteger*2)
-        generateEvent(results)
-    }
-}
-
-def controlMode1()
-{
-	log.debug "controlMode1"
-	def control = device.currentValue("controlMode1")
-    controlMode(control)
-}
-
-def controlMode2()
-{
-	log.debug "controlMode2"
-    def control = device.currentValue("controlMode2")
-    controlMode(control)
-}
-
-def controlMode(control)
-{    
-    if(control == "실내난방 ON")
-    {
-    	log.debug "실내난방 ON : 제어"
-    	def value   = device.currentValue("setRoomSlider")*2
-    	def results = parent.childRequest(this, "1", "43", value)
-        generateEvent(results)
-        
-    }
-    else if(control == "온돌난방 ON")
-    {
-    	log.debug "온돌난방 ON : 제어"
-		def value   = device.currentValue("setOndolSlider")*2
-        def results = parent.childRequest(this, "1", "35", value)
-        generateEvent(results)
-        
-    }
-    else if(control == "외출해제")
-    {
-    	log.debug "외출해제 : 제어"
-        def results = parent.childRequest(this, "1", "46", "0")
-        generateEvent(results)
-        
-    }
-    else if(control == "외출설정")
-    {
-    	log.debug "외출설정 : 제어"
-        def results = parent.childRequest(this, "1", "46", "1")
-        generateEvent(results)
-    }
-}
-
-def refresh()
-{
-	log.debug "refresh called"
-	poll()
-	log.debug "refresh ended"
-}
-
-void poll() {
-	log.debug "Executing 'poll' using parent SmartApp"
-	
-	def results = parent.pollChild(this)
-	generateEvent(results)
-}
-
-void generateEvent(Map results)
-{
-	log.debug "parsing data $results"
-    
-	if(results)
-	{
-		results.each { name, value -> 
- 			def linkText    = getLinkText(device)
-            def isChange    = true
-            def isDisplayed = true
-            
-            if (name=="temperature" || name=="hotWater") 
-            {
-				//isChange = isTemperatureStateChange(device, name, value.toString())
-                isDisplayed = isChange
-                   
-				sendEvent(
-					name: name,
-					value: value,
-					unit: "C",
-					linkText: linkText,
-					descriptionText: getThermostatDescriptionText(name, value, linkText),
-					handlerName: name,
-					isStateChange: isChange,
-					displayed: isDisplayed)                                    									 
-            }
-            else if (name=="thermostatStatus") 
-            {
-            	isChange = isStateChange(device, name, value.toString())
-                isDisplayed = isChange
-                
-                sendEvent(
-					name: name,
-					value: value.toString(),
-					linkText: linkText,
-					descriptionText: getThermostatDescriptionText(name, value, linkText),
-					handlerName: name,
-					isStateChange: isChange,
-					displayed: isDisplayed)
-            }
-		}
-        generateStatusEvent(results)
-	}
-}
-
-private getThermostatDescriptionText(name, value, linkText)
-{
-	if(name == "temperature")
-	{
-		return "$linkText was $value°C"
-	}
-	else if(name == "roomTemp")
-	{
-		return "latest roomTemp setpoint was $value°C"
-	}
-	else if(name == "ondolTemp")
-	{
-		return "latest ondolTemp setpoint was $value°C"
-	}
-    else if (name == "thermostatMode")
-    {
-        return "thermostat mode is ${value}"
-    }
-    else
-    {
-        return "${name} = ${value}"
-    }
-}
-
-def generateStatusEvent(Map results) {
-	log.debug "generateStatusEvent"
-    
-	def status       = results.thermostatStatus
-    def setRoomTemp  = results.roomTemp
-    def setOndolTemp = results.ondolTemp
-    
-    log.debug "status ===> ${status}"
-        
-    if (status == "전원 OFF") {       
-        sendEvent("name":"temperature",    "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"hotWater",       "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomTemp",    "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomSlider",  "value":"0",                                    displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolTemp",   "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolSlider", "value":"0",                                    displayed: true, isStateChange: true)
-		sendEvent("name":"power",          "value":"ON",      "description":"전원 ON",     displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode1",   "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode2",   "value":"OFF",     "description":"OFF",         displayed: true, isStateChange: true)
-        
-
-    }else if(status == "온수전용"){
-        sendEvent("name":"setRoomTemp",    "value":"OFF",      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomSlider",  "value":"0",                                     displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolTemp",   "value":"OFF",      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolSlider", "value":"0",                                     displayed: true, isStateChange: true)
-		sendEvent("name":"power",          "value":"전원 OFF", "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode1",   "value":"실내 ON",  "description":"ON",          displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode2",   "value":"온돌 ON",  "description":"ON",          displayed: true, isStateChange: true)
-        
-    }else if(status == "외출 ON"){
-    	sendEvent("name":"setRoomTemp",    "value":"OFF",      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomSlider",  "value":"0",                                     displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolTemp",   "value":"OFF",      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolSlider", "value":"0",                                     displayed: true, isStateChange: true)
-        sendEvent("name":"power",          "value":"전원 OFF", "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode1",   "value":"OFF",      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode2",   "value":"외출해제", "description":"외출해제",    displayed: true, isStateChange: true)
-        
-    }else if(status == "실내난방"){
-        sendEvent("name":"setRoomTemp",    "value":"${setRoomTemp}",  "description":"설정온도",    displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomSlider",  "value":setRoomTemp,                                                  displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolTemp",   "value":"${setOndolTemp}", "description":"설정온도",    displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolSlider", "value":setOndolTemp,                                                 displayed: true, isStateChange: true)
-        sendEvent("name":"power",          "value":"전원 OFF",                      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode1",   "value":"온돌난방 ON",                   "description":"온돌난방 ON", displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode2",   "value":"외출설정",                      "description":"외출설정",    displayed: true, isStateChange: true)
-        
-    }
-    else if(status == "온돌난방"){      
-        sendEvent("name":"setRoomTemp",    "value":"${setRoomTemp}",  "description":"설정온도",    displayed: true, isStateChange: true)
-        sendEvent("name":"setRoomSlider",  "value":setRoomTemp,                                                  displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolTemp",   "value":"${setOndolTemp}", "description":"설정온도",    displayed: true, isStateChange: true)
-        sendEvent("name":"setOndolSlider", "value":setOndolTemp,                                                 displayed: true, isStateChange: true)
-        sendEvent("name":"power",          "value":"전원 OFF",                      "description":"OFF",         displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode1",   "value":"실내난방 ON",                   "description":"실내난방 ON", displayed: true, isStateChange: true)
-        sendEvent("name":"controlMode2",   "value":"외출설정",                      "description":"외출설정",    displayed: true, isStateChange: true)
-        
-    }
-
-    log.debug "Generate Status Event = ${status}"
-}

devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy

@@ -5,7 +5,7 @@ metadata {
 		capability "Switch"
 		capability "Sensor"
 
-		fingerprint profileId: "0104", inClusters: "0000,0003,0006", outClusters: "0019"
+		fingerprint profileId: "0104", inClusters: "0006, 0004, 0003, 0000, 0005", outClusters: "0019", manufacturer: "Compacta International, Ltd", model: "ZBMPlug15", deviceJoinName: "SmartPower Outlet V1"
 	}
 
 	// simulator metadata

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

@@ -441,28 +441,28 @@ def configure() {
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 1 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}",		//checkin time 6 hrs
+		"zcl global send-me-a-report 1 0x20 0x20 30 21600 {01}", "delay 200",		//checkin time 6 hrs
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0x402 {${device.zigbeeId}} {}", "delay 200",
-		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}",
+		"zcl global send-me-a-report 0x402 0 0x29 30 3600 {6400}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
 		"zdo bind 0x${device.deviceNetworkId} ${endpointId} 1 0xFC02 {${device.zigbeeId}} {}", "delay 200",
-		"zcl mfg-code ${manufacturerCode}",
-		"zcl global send-me-a-report 0xFC02 0x0010 0x18 10 3600 {01}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0010 0x18 10 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
-		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {01}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0012 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
-		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {01}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0013 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500",
 
-		"zcl mfg-code ${manufacturerCode}",
-		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {01}",
+		"zcl mfg-code ${manufacturerCode}", "delay 200",
+		"zcl global send-me-a-report 0xFC02 0x0014 0x29 1 3600 {01}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 		]
 
@@ -481,17 +481,12 @@ def enrollResponse() {
 		"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}",
+		"raw 0x500 {01 23 00 00 00}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 1", "delay 200"
 	]
 }
 
 private Map parseAxis(String description) {
-	def hexToSignedInt = { hexVal ->
-		def unsignedVal = hexToInt(hexVal)
-		unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
-	}
-
 	def z = hexToSignedInt(description[0..3])
 	def y = hexToSignedInt(description[10..13])
 	def x = hexToSignedInt(description[20..23])
@@ -518,6 +513,11 @@ private Map parseAxis(String description) {
 	getXyzResult(xyzResults, description)
 }
 
+private hexToSignedInt(hexVal) {
+	def unsignedVal = hexToInt(hexVal)
+	unsignedVal > 32767 ? unsignedVal - 65536 : unsignedVal
+}
+
 def garageEvent(zValue) {
 	def absValue = zValue.abs()
 	def contactValue = null

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

@@ -275,6 +275,7 @@ def zwaveEvent(physicalgraph.zwave.commands.alarmv2.AlarmReport cmd) {
 		case 32:
 			map = [ name: "codeChanged", value: "all", descriptionText: "$device.displayName: all user codes deleted", isStateChange: true ]
 			allCodesDeleted()
+			break
 		case 33:
 			map = [ name: "codeReport", value: cmd.alarmLevel, data: [ code: "" ], isStateChange: true ]
 			map.descriptionText = "$device.displayName code $cmd.alarmLevel was deleted"
@@ -341,14 +342,14 @@ def zwaveEvent(UserCodeReport cmd) {
 			map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: code ] ]
 			map.descriptionText = "$device.displayName code $cmd.userIdentifier is set"
 			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
-			map.isStateChange = (code != decrypt(state[name]))
+			map.isStateChange = true
 		}
 		result << createEvent(map)
 	} else {
 		map = [ name: "codeReport", value: cmd.userIdentifier, data: [ code: "" ] ]
 		if (state.blankcodes && state["reset$name"]) {  // we deleted this code so we can tell that our new code gets set
 			map.descriptionText = "$device.displayName code $cmd.userIdentifier was reset"
-			map.displayed = map.isStateChange = false
+			map.displayed = map.isStateChange = true
 			result << createEvent(map)
 			state["set$name"] = state["reset$name"]
 			result << response(setCode(cmd.userIdentifier, state["reset$name"]))
@@ -360,7 +361,7 @@ def zwaveEvent(UserCodeReport cmd) {
 				map.descriptionText = "$device.displayName code $cmd.userIdentifier is not set"
 			}
 			map.displayed = (cmd.userIdentifier != state.requestCode && cmd.userIdentifier != state.pollCode)
-			map.isStateChange = state[name] as Boolean
+			map.isStateChange = true
 			result << createEvent(map)
 		}
 		code = ""

smartapps/initialstate-events/initial-state-event-streamer.src/initial-state-event-streamer.groovy

@@ -1,7 +1,7 @@
 /**
  *  Initial State Event Streamer
  *
- *  Copyright 2015 David Sulpy
+ *  Copyright 2016 David Sulpy
  *
  *  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:
@@ -77,6 +77,62 @@ mappings {
 	}
 }
 
+def getAccessKey() {
+	log.trace "get access key"
+	if (atomicState.accessKey == null) {
+		httpError(404, "Access Key Not Found")
+	} else {
+		[
+			accessKey: atomicState.accessKey
+		]
+	}
+}
+
+def getBucketKey() {
+	log.trace "get bucket key"
+	if (atomicState.bucketKey == null) {
+		httpError(404, "Bucket key Not Found")
+	} else {
+		[
+			bucketKey: atomicState.bucketKey,
+			bucketName: atomicState.bucketName
+		]
+	}
+}
+
+def setBucketKey() {
+	log.trace "set bucket key"
+	def newBucketKey = request.JSON?.bucketKey
+	def newBucketName = request.JSON?.bucketName
+
+	log.debug "bucket name: $newBucketName"
+	log.debug "bucket key: $newBucketKey"
+
+	if (newBucketKey && (newBucketKey != atomicState.bucketKey || newBucketName != atomicState.bucketName)) {
+		atomicState.bucketKey = "$newBucketKey"
+		atomicState.bucketName = "$newBucketName"
+		atomicState.isBucketCreated = false
+	}
+
+	tryCreateBucket()
+}
+
+def setAccessKey() {
+	log.trace "set access key"
+	def newAccessKey = request.JSON?.accessKey
+	def newGrokerSubdomain = request.JSON?.grokerSubdomain
+
+	if (newGrokerSubdomain && newGrokerSubdomain != "" && newGrokerSubdomain != atomicState.grokerSubdomain) {
+		atomicState.grokerSubdomain = "$newGrokerSubdomain"
+		atomicState.isBucketCreated = false
+	}
+
+	if (newAccessKey && newAccessKey != atomicState.accessKey) {
+		atomicState.accessKey = "$newAccessKey"
+		atomicState.isBucketCreated = false
+	}
+}
+
 def subscribeToEvents() {
 	if (accelerometers != null) {
 		subscribe(accelerometers, "acceleration", genericHandler)
@@ -169,85 +225,27 @@ def subscribeToEvents() {
 	}
 }
 
-def getAccessKey() {
-	log.trace "get access key"
-	if (atomicState.accessKey == null) {
-		httpError(404, "Access Key Not Found")
-	} else {
-		[
-			accessKey: atomicState.accessKey
-		]
-	}
-}
-
-def getBucketKey() {
-	log.trace "get bucket key"
-	if (atomicState.bucketKey == null) {
-		httpError(404, "Bucket key Not Found")
-	} else {
-		[
-			bucketKey: atomicState.bucketKey,
-			bucketName: atomicState.bucketName
-		]
-	}
-}
-
-def setBucketKey() {
-	log.trace "set bucket key"
-	def newBucketKey = request.JSON?.bucketKey
-	def newBucketName = request.JSON?.bucketName
-
-	log.debug "bucket name: $newBucketName"
-	log.debug "bucket key: $newBucketKey"
-
-	if (newBucketKey && (newBucketKey != atomicState.bucketKey || newBucketName != atomicState.bucketName)) {
-		atomicState.bucketKey = "$newBucketKey"
-		atomicState.bucketName = "$newBucketName"
-		atomicState.isBucketCreated = false
-	}
-
-	tryCreateBucket()
-}
-
-def setAccessKey() {
-	log.trace "set access key"
-	def newAccessKey = request.JSON?.accessKey
-	def newGrokerSubdomain = request.JSON?.grokerSubdomain
-
-	if (newGrokerSubdomain && newGrokerSubdomain != "" && newGrokerSubdomain != atomicState.grokerSubdomain) {
-		atomicState.grokerSubdomain = "$newGrokerSubdomain"
-		atomicState.isBucketCreated = false
-	}
-
-	if (newAccessKey && newAccessKey != atomicState.accessKey) {
-		atomicState.accessKey = "$newAccessKey"
-		atomicState.isBucketCreated = false
-	}
-}
-
 def installed() {
-	atomicState.version = "1.0.18"
+	atomicState.version = "1.1.0"
+
+	atomicState.isBucketCreated = false
+	atomicState.grokerSubdomain = "groker"
+
 	subscribeToEvents()
 
 	atomicState.isBucketCreated = false
 	atomicState.grokerSubdomain = "groker"
-	atomicState.eventBuffer = []
-
-	runEvery15Minutes(flushBuffer)
 
 	log.debug "installed (version $atomicState.version)"
 }
 
 def updated() {
-	atomicState.version = "1.0.18"
+	atomicState.version = "1.1.0"
 	unsubscribe()
 
 	if (atomicState.bucketKey != null && atomicState.accessKey != null) {
 		atomicState.isBucketCreated = false
 	}
-	if (atomicState.eventBuffer == null) {
-		atomicState.eventBuffer = []
-	}
 	if (atomicState.grokerSubdomain == null || atomicState.grokerSubdomain == "") {
 		atomicState.grokerSubdomain = "groker"
 	}
@@ -327,37 +325,17 @@ def genericHandler(evt) {
 	eventHandler(key, value)
 }
 
-// This is a handler function for flushing the event buffer
-// after a specified amount of time to reduce the load on ST servers
-def flushBuffer() {
-	def eventBuffer = atomicState.eventBuffer
-	log.trace "About to flush the buffer on schedule"
-	if (eventBuffer != null && eventBuffer.size() > 0) {
-		atomicState.eventBuffer = []
-		tryShipEvents(eventBuffer)
-	}
-}
-
 def eventHandler(name, value) {
 	def epoch = now() / 1000
-	def eventBuffer = atomicState.eventBuffer ?: []
-	eventBuffer << [key: "$name", value: "$value", epoch: "$epoch"]
 
-	if (eventBuffer.size() >= 10) {
-		// Clear eventBuffer right away since we've already pulled it off of atomicState to reduce the risk of missing
-		// events.  This assumes the grokerSubdomain, accessKey, and bucketKey are set correctly to avoid the eventBuffer
-		// from growing unbounded.
-		atomicState.eventBuffer = []
-		tryShipEvents(eventBuffer)
-	} else {
-		// Make sure we persist the updated eventBuffer with the new event added back to atomicState
-		atomicState.eventBuffer = eventBuffer
-	}
-	log.debug "Event added to buffer: " + eventBuffer
+	def event = new JsonSlurper().parseText("{\"key\": \"$name\", \"value\": \"$value\", \"epoch\": \"$epoch\"}")
+
+	tryShipEvents(event)
+	
+	log.debug "Shipped Event: " + event
 }
 
-// a helper function for shipping the atomicState.eventBuffer to Initial State
-def tryShipEvents(eventBuffer) {
+def tryShipEvents(event) {
 
 	def grokerSubdomain = atomicState.grokerSubdomain
 	// can't ship events if there is no grokerSubdomain
@@ -380,7 +358,7 @@ def tryShipEvents(eventBuffer) {
 			"X-IS-AccessKey": "${accessKey}",
 			"Accept-Version": "0.0.2"
 		],
-		body: eventBuffer
+		body: event
 	]
 
 	try {

smartapps/smartthings/-.src/-.groovy

@@ -1,668 +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.
- *
- *	Navien Service Manager
- *
- *	Author: sangju
- *	Date: 2015-11-01
- *
- */
-definition(
-    name: "나비엔 스마트톡 연동",
-    namespace: "smartthings",
-    author: "나비엔 스마트톡",
-    description: "SmartThings에서 나비엔 스마트톡의 온도조절기를 연결합니다.",
-    category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Navien/navien.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Navien/navien@2x.png",
-    singleInstance: true
-) {
-	appSetting "clientId"
-	appSetting "serverUrl"
-    appSetting "bcd"
-}
-
-preferences {
-	page(name: "loginPage",        title: "나비엔 스마트톡 등록")
-	page(name: "navienAuth",       title: "나비엔 스마트톡 등록")
-    page(name: "navienDeviceList", title: "나비엔 스마트톡 등록", install: true )
-}
-
-def refreshToken
-def authToken
-def userName
-
-def loginPage(){
-	log.debug "authPage()"
-	
-    def showUninstall = username != null && password != null
-    return dynamicPage(name: "loginPage", title: "경동나비엔", nextPage:"navienAuth", uninstall:false) {
-        section("나비엔 스마트톡 등록"){
-            input "username", "text",     title: "나비엔 스마트톡 아이디",   required: true, autoCorrect:false
-            input "password", "password", title: "나비엔 스마트톡 패스워드", required: true, autoCorrect:false
-        }
-        //section("To use Navien, SmartThings encrypts and securely stores your Navien credentials.") {}
-    }
-}
-
-def navienAuth(){
-	log.debug "navienAuth()"
-    
-    def loginResult = forceLogin()
-    if(loginResult.success)
-    {
-    	return dynamicPage(name: "navienAuth", title: "나비엔 스마트톡 인증", nextPage:"navienDeviceList", uninstall:false) { 
-            section(){
-        		paragraph "나비엔 스마트톡 인증 성공"
-        	}
-        }
-    }
-    else
-    {
-    	return dynamicPage(name: "navienAuth", title: "나비엔 스마트톡 인증", nextPage:null, uninstall:false) { 
-        	section("Login failed"){
-        		paragraph "나비엔 스마트톡 인증 실패"
-        	}
-        }
-    }
-}
-
-def navienDeviceList(){
-	log.debug "navienDeviceList()"
-    
-    def connectResult = navienConnecting()
-    def p
-    if(connectResult.success)
-    {
-    	statusSetting(state.status)
-        
-        def stats = getNavienThermostats()
-        log.debug "device list: $stats"
-                
-        p = dynamicPage(name: "navienDeviceList", title: "나비엔 스마트톡 선택", install:true) {
-            section(""){
-                paragraph "나비엔 스마트톡 계정에서 사용할 수 있는 온도 조절 장치의 목록을 확인하고 SmartTings에 연결하려는 목록을 선택하려면 아래에서 선택해 주세요."
-                input(name: "thermostats", title:"", type: "enum", required:true, multiple:true, description: "Tap to choose", metadata:[values:stats])
-            }
-		}
-    }
-    else
-    {
-    	p =  dynamicPage(name: "navienDeviceList", title: "나비엔 스마트톡 선택", nextPage:null, uninstall:false) { 
-        	section("나비엔 스마트톡 온도 조절 장치의 연결 상태를 확인하시기 바랍니다."){
-        		paragraph ""
-        	}
-        }
-    }
-    log.debug "list p: $p"
-	return p
-}
-
-def getNavienThermostats() {
-    def stats = [:]
-    def dni = [getChildName()].join('.')
-    
-    if(state.boilerType == "01") stats[dni] = "스마트톡"
-    else if(state.boilerType == "02") stats[dni] = "콘덴싱톡"
-    else stats[dni] = "----"
-    
-    return stats
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def uninstalled() {
-	def devices = getChildDevices()
-	if(devices != null) log.trace "deleting ${devices.size()} device"
-}
-
-def initialize() {
-	log.debug "initialize"
-    
-    def d = getChildDevice(getChildName())
-
-    if(!d)
-    {
-        d = addChildDevice(getChildNamespace(), getChildName(), getChildName())
-        log.debug "created ${d.displayName} with id $dni"
-    }
-    else
-    {
-        log.debug "found ${d.displayName} with id $dni already exists"
-    }
-
-    def devices = d
-    
-    log.debug "created ${devices.size()} thermostats"
-	
-    def delete
-	// Delete any that are no longer in settings   
-    
-	if(!thermostats)
-	{
-		log.debug "If delete thermostats"
-		delete = getAllChildDevices()
-	}
-	else
-	{
-    	log.debug "Else delete thermostats"
-    	if(it != null) delete = getChildDevices().findAll { !thermostats.contains(it.deviceNetworkId) }
-	}
-
-	if(delete != null) log.debug "deleting ${delete.size()} thermostats"
-	if(it != null) delete.each { deleteChildDevice(it.deviceNetworkId) }
-
-	atomicState.thermostatData = [:]
-    
-    pollHandler()    
-}
-
-def pollHandler() {
-	log.debug ("pollHandler.")
-	pollChildren()    
-    
-    atomicState.thermostats.each {stat ->
-		def dni = stat.key
-
-		log.debug ("DNI = ${dni}")
-        debugEvent ("DNI = ${dni}")
-        
-        def d = getChildDevice(dni)
-        if(d)
-		{
-			log.debug ("Found Child Device.")
-			debugEvent ("Found Child Device.")
-			debugEvent("Event Data before generate event call = ${stat}")
-
-			d.generateEvent(atomicState.thermostats[dni].data)
-		}
-	}
-}
-
-def pollChildren()
-{
-	log.trace "polling children"
-        
-    def pollParams = [
-        uri: getServerUrl()+"/api/SmartTokApi?bcd="+getBCD()+"&mid=${state.mid}&did=36&subid=1&cmd=01&data=0",
-		headers: ["Authorization": "Bearer ${state.authToken}"]
-	]
-    
-    log.trace "Before HTTPGET to navien."
-    def jsonData
-    try{
-        httpGet(pollParams) { resp ->            
-            if (resp.status == 200)
-         	{
-            	log.debug "poll results returned"
-                //atomicState.thermostats = resp.data.Status.inject([:]) { collector, stat ->
-				atomicState.thermostats = "1".inject([:]) { collector, stat ->
-					def dni = [getChildName()].join('.')
-
-					log.debug "updating dni $dni"
-
-					def data = statusSetting(resp.data.Status)
-
-					log.debug ("Event Data = ${data}")
-
-					collector[dni] = [data:data]
-					return collector
-                }
-                
-                log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
-            }
-            else
-			{
-				log.error "polling children & got http status ${resp.status}"
-
-				//refresh the auth token
-				if(resp.status == 400)
-                {
-                	log.debug "Bad Request Description"
-                }
-                else if(resp.status == 401)
-                {
-                	log.debug "Unauthorized Description"
-                }
-                else if(resp.status == 500)
-                {
-                	log.debug "InternalServerError Description"
-                    atomicState.action = "pollChildren";
-                    refreshAuthToken()
-                }
-                else
-				{
-					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
-				}
-			}
-        }       
-    }
-	catch(all)
-	{
-		log.debug "___exception polling children: "
-		//refreshAuthToken()
-	}
-}
-
-def getPollRateMillis() { return 2 * 60 * 1000 }
-
-def pollChild( child )
-{
-	log.debug "poll child"
-	debugEvent ("poll child")
-	def now = new Date().time
-    log.debug "now ====> ${now}"
-
-	debugEvent ("Last Poll Millis = ${atomicState.lastPollMillis}")
-	def last = atomicState.lastPollMillis ?: 0
-	def next = last + pollRateMillis
-
-	log.debug "pollChild( ${child.device.deviceNetworkId} ): $now > $next ?? w/ current state: ${atomicState.thermostats}"
-	debugEvent ("pollChild( ${child.device.deviceNetworkId} ): $now > $next ?? w/ current state: ${atomicState.thermostats}")
-
-	// if( now > next )
-	if( true ) // for now let's always poll/refresh
-	{
-		log.debug "polling children because $now > $next"
-		debugEvent("polling children because $now > $next")
-
-		pollChildren()
-
-		log.debug "polled children and looking for ${child.device.deviceNetworkId} from ${atomicState.thermostats}"
-		debugEvent ("polled children and looking for ${child.device.deviceNetworkId} from ${atomicState.thermostats}")
-
-		def currentTime = new Date().time
-		debugEvent ("Current Time = ${currentTime}")
-		atomicState.lastPollMillis = currentTime
-
-		def tData = atomicState.thermostats[child.device.deviceNetworkId]
-
-		if(!tData)
-		{
-			log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
-
-			// TODO: flag device as in error state
-			// child.errorState = true
-
-			return null
-		}
-
-		tData.updated = currentTime
-
-		return tData.data
-	}
-	else if(atomicState.thermostats[child.device.deviceNetworkId] != null)
-	{
-		log.debug "not polling children, found child ${child.device.deviceNetworkId} "
-
-		def tData = atomicState.thermostats[child.device.deviceNetworkId]
-		if(!tData.updated)
-		{
-			// we have pulled new data for this thermostat, but it has not asked us for it
-			// track it and return the data
-			tData.updated = new Date().time
-			return tData.data
-		}
-		return null
-	}
-	else if(atomicState.thermostats[child.device.deviceNetworkId] == null)
-	{
-		log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId}"
-
-		// TODO: flag device as in error state
-		// child.errorState = true
-
-		return null
-	}
-	else
-	{
-		// it's not time to poll again and this thermostat already has its latest values
-	}
-
-	return null
-}
-
-def childRequest( child, subid, cmd, data )
-{
-	getControlSend(subid, cmd, data)
-    def tData = atomicState.thermostats[child.device.deviceNetworkId]
-
-    if(!tData)
-    {
-        log.error "ERROR: Device connection removed? no data for ${child.device.deviceNetworkId} after polling"
-        return null
-    }
-    tData.updated = currentTime
-
-    return tData.data
-}
-
-def getControlSend(subid, cmd, data)
-{
-	log.trace "getParams"
-        
-    def pollParams = [
-        uri: getServerUrl()+"/api/SmartTokApi?bcd="+getBCD()+"&mid=${state.mid}&did=36&subid=${subid}&cmd=${cmd}&data=${data}",
-		headers: ["Authorization": "Bearer ${state.authToken}"]
-	]
-    
-    log.trace "Before Control HTTPGET to navien."
-    def jsonData
-    try{
-        httpGet(pollParams) { resp ->
-        	debugEvent ("Response (resp.data.Staus) : = ${resp.data.Staus}", true)
-            if (resp.status == 200)
-         	{
-            	log.debug "poll results returned"
-                //atomicState.thermostats = resp.data.Status.inject([:]) { collector, stat ->
-				atomicState.thermostats = "1".inject([:]) { collector, stat ->
-					def dni = [getChildName()].join('.')
-
-					log.debug "updating dni $dni"
-
-					def response = statusSetting(resp.data.Status)
-
-					log.debug ("Event Data = ${response}")
-
-					collector[dni] = [data:response]
-					return collector
-                }
-                
-                log.debug "updated ${atomicState.thermostats?.size()} stats: ${atomicState.thermostats}"
-            }
-            else
-			{
-				log.error "polling children & got http status ${resp.status}"
-
-				//refresh the auth token
-				if(resp.status == 400)
-                {
-                	log.debug "Bad Request Description"
-                }
-                else if(resp.status == 401)
-                {
-                	log.debug "Unauthorized Description"
-                }
-                else if(resp.status == 500)
-                {
-                	log.debug "InternalServerError Description"
-                    atomicState.action = "pollChildren";
-                    refreshAuthToken()
-                }
-                else
-				{
-					log.error "Authentication error, invalid authentication method, lack of credentials, etc."
-				}
-			}
-        }       
-    }
-	catch(all)
-	{
-		log.debug "___exception polling children: "
-		//refreshAuthToken()
-	}
-}
-
-private refreshAuthToken() {
-	log.trace "refreshing auth token"
-
-	if(!atomicState.refreshToken) {
-		log.warn "Can not refresh OAuth token since there is no refreshToken stored"
-	} else {      
-        def refreshParams = [
-            uri: getServerUrl(),
-            path: "/Token",
-            headers: ['Content-Type': "application/x-www-form-urlencoded"],
-            body: [grant_type: "refresh_token", refresh_token: "${state.refreshToken}"]
-		]
-
-		log.debug refreshParams
-
-		try {
-			def jsonMap
-			httpPost(refreshParams) { resp ->
-
-				if(resp.status == 200) {
-					log.debug "Token refreshed...calling saved RestAction now! ${resp}"
-
-					if(resp.data) 
-                    {
-                    	jsonMap = resp.data
-                    	state.refreshToken = jsonMap.refresh_token
-                    	state.authToken = jsonMap.access_token
-
-						if(atomicState.action && atomicState.action != "") {
-							log.debug "Executing next action: ${atomicState.action}"
-							"{atomicState.action}"()
-
-							//remove saved action
-							atomicState.action = ""
-						}
-					}
-					atomicState.action = ""
-				} 
-                else 
-                {
-					log.debug "refresh failed ${resp.status} : ${resp.status.code}"
-				}
-			}
-		}
-		catch(Exception e) {
-			log.debug "caught exception refreshing auth token: " + e.getStackTrace()
-		}
-	}
-}
-
-def statusSetting(status){
-	/*
-	log.debug "state.status ====> ${state.status}"
-    log.debug "제품아이디 ====> ${state.status.substring(0, 16)}"       // 제품아이디
-    log.debug "보일러모델타입 ====> ${state.status.substring(26, 28)}"   // 보일러모델타입
-    log.debug "에러코드 ====> ${state.status.substring(32, 36)}"        // 에러코드
-    log.debug "온수설정온도 ====> ${state.status.substring(36, 38)}"     // 온수설정온도
-    log.debug "state.status ====> ${state.status.substring(38, 40)}"   // 난방세기
-    log.debug "state.status ====> ${state.status.substring(40, 42)}"   // 옵션기능
-    log.debug "작동모드 ====> ${state.status.substring(42, 44)}"        // 작동모드
-    log.debug "현재실내온도 ====> ${state.status.substring(44, 46)}"     // 현재실내온도
-    log.debug "실내난방설정온도 ====> ${state.status.substring(46, 48)}"  // 실내난방설정온도
-    log.debug "온돌난방설정온도 ====> ${state.status.substring(48, 50)}"  // 온돌난방설정온도
-	*/        
-    state.mid              = status.substring(0, 16)
-    state.boilerType       = status.substring(26, 28)				
-    state.errorCode        = status.substring(32, 36)				
-    state.hotWater         = convertHexToInt(status.substring(36, 38))
-    
-    def s = status.substring(42, 44)
-    if(s == "01") state.thermostatStatus = "전원 OFF"
-    else if(s == "02") state.thermostatStatus = "외출 ON"
-    else if(s == "03") state.thermostatStatus = "실내난방"
-    else if(s == "04") state.thermostatStatus = "온돌난방"
-    else if(s == "05") state.thermostatStatus = "반복예약난방"
-    else if(s == "06") state.thermostatStatus = "24시간예약난방"
-    else if(s == "07") state.thermostatStatus = "간편예약난방"
-    else if(s == "08") state.thermostatStatus = "온수전용"
-    else if(s == "09") state.thermostatStatus = "빠른온수"
-    else state.thermostatStatus = "---"
-    
-    state.temperature      = convertHexToInt(status.substring(44, 46))
-    state.roomTemp         = convertHexToInt(status.substring(46, 48))
-    state.ondolTemp        = convertHexToInt(status.substring(48, 50))
-    
-    def data = [
-    	mid: state.mid,
-        boilerType: state.boilerType,
-        errorCode: state.errorCode,
-        hotWater: state.hotWater,
-        thermostatStatus: state.thermostatStatus,
-        temperature: state.temperature,
-        roomTemp: state.roomTemp,
-        ondolTemp: state.ondolTemp
-    ]
-	return data
-}
-
-def navienConnecting(){
-	log.debug "navienConnecting()"
-    
-    def connectParams = [
-        uri: getServerUrl()+"/api/SmartTokApi?bcd="+getBCD()+"&uid=${state.userName}&scd=2",
-		headers: ["Authorization": "Bearer ${state.authToken}"]
-	]
-    
-    def result = [success:false]
-    def jsonData
-    
-    httpGet(connectParams) { resp ->
-        if (resp.status == 200)
-		{
-            jsonData = resp.data
-            result.success = true
-            state.status = jsonData.Status
-        }
-        else if(resp.status == 400)
-        {
-        	result.reason = "Bad Request"
-        }
-        else if(resp.status == 401)
-        {
-        	result.reason = "Unauthorized"
-        }
-        else if(resp.status == 500)
-        {
-        	result.reason = "Internal ServerError"
-        }
-        else
-        {
-        	result.reason = "Bad Connect"
-        }
-    }
-    
-    return result
-}
-
-private forceLogin(){
-    log.debug "forceLogin()"
-    
-	updateCookie(null)
-    login()
-}
-
-private updateCookie(String cookie){
-	atomicState.cookie = cookie
-    state.cookie = cookie
-}
-
-private login(){
-	if(getCookieValueIsValid())
-	{
-		return [success:true]
-	}
-	return doLogin()
-}
-
-private doLogin() {
-    log.debug "doLogin()"
-    
-	def loginParams = [
-		uri: getServerUrl(),
-		path: "/Token",
-		headers: ['Content-Type': "application/x-www-form-urlencoded"],
-		body: [grant_type: "password", username: username, password: password]
-	]
-
-	def result = [success:false]
-	def jsonMap
-    
-    try
-    {
-        httpPost(loginParams) { resp ->
-            if (resp.status == 200 && resp.headers.'Content-Type'.contains("application/json"))
-            {
-                log.debug "login 200 json headers: " + resp.headers.collect { "${it.name}:${it.value}" }
-                def cookie = resp?.headers?.'Set-Cookie'?.split(";")?.getAt(0)
-                if (cookie) {
-                    log.debug "login setting cookie to $cookie"
-                    updateCookie(cookie)
-                    result.success = true
-
-                    jsonMap = resp.data
-                    state.refreshToken = jsonMap.refresh_token
-                    state.authToken = jsonMap.access_token
-                    state.userName = jsonMap.userName
-                }
-                else
-                {
-                    // ERROR: any more information we can give?
-                    result.reason = "Bad login"
-                }
-            }
-            else
-            {
-                result.reason = "Bad login"
-            }
-        }
-    }
-    catch(groovyx.net.http.HttpResponseException hre)
-    {
-    	result.reason = "Exception"
-    }
-
-	return result
-}
-
-private Boolean getCookieValueIsValid()
-{
-	// TODO: make a call with the cookie to verify that it works
-	return getCookieValue()
-}
-
-private getCookieValue(){
-	state.cookie
-}
-
-def getChildNamespace() { "smartthings" }
-def getChildName() { "Navien Room Controller" }
-
-def getChildDeviceIdsString()
-{
-	log.debug "thermostats ====> ${thermostats}"
-	return thermostats.collect { it.split(/\./).last() }.join(',')
-}
-
-def getServerUrl()           { return appSettings.serverUrl }
-def getSmartThingsClientId() { return appSettings.clientId }
-def getBCD()                 { return appSettings.bcd }
-
-def debugEvent(message, displayEvent = true) {
-
-	def results = [
-		name: "appdebug",
-		descriptionText: message,
-		displayed: displayEvent
-	]
-	log.debug "Generating AppDebug Event: ${results}"
-	sendEvent (results)
-}
-
-private convertHexToInt(hex) {
-	return (Integer.parseInt(hex,16) / 2)
-}

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

@@ -326,6 +326,7 @@ def addBulbs() {
                         d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.value.hub, ["label":newHueBulb?.value.name])
                     }
                     log.debug "created ${d.displayName} with id $dni"
+                    d.refresh()
                 } else {
                 	log.debug "$dni in not longer paired to the Hue Bridge or ID changed"
                 }
@@ -333,8 +334,8 @@ def addBulbs() {
             	//backwards compatable
 				newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni }
 				d = addChildDevice("smartthings", "Hue Bulb", dni, newHueBulb?.hub, ["label":newHueBulb?.name])
+                d.refresh()
 			}
-			d.refresh()
 		} else {
 			log.debug "found ${d.displayName} with id $dni already exists, type: '$d.typeName'"
 			if (bulbs instanceof java.util.Map) {
@@ -774,4 +775,4 @@ private Boolean hasAllHubsOver(String desiredFirmware) {
 
 private List getRealHubFirmwareVersions() {
 	return location.hubs*.firmwareVersionString.findAll { it }
-}
+}

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

@@ -316,60 +316,40 @@ private def parseEventMessage(String description) {
 	parts.each { part ->
 		part = part.trim()
 		if (part.startsWith('devicetype:')) {
-			def valueString = part.split(":")[1].trim()
-			event.devicetype = valueString
+			part -= "devicetype:"
+			event.devicetype = part.trim()
 		}
 		else if (part.startsWith('mac:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				event.mac = valueString
-			}
+			part -= "mac:"
+			event.mac = part.trim()
 		}
 		else if (part.startsWith('networkAddress:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				event.ip = valueString
-			}
+			part -= "networkAddress:"
+			event.ip = part.trim()
 		}
 		else if (part.startsWith('deviceAddress:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				event.port = valueString
-			}
+			part -= "deviceAddress:"
+			event.port = part.trim()
 		}
 		else if (part.startsWith('ssdpPath:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				event.ssdpPath = valueString
-			}
+			part -= "ssdpPath:"
+			event.ssdpPath = part.trim()
 		}
 		else if (part.startsWith('ssdpUSN:')) {
 			part -= "ssdpUSN:"
-			def valueString = part.trim()
-			if (valueString) {
-				event.ssdpUSN = valueString
-			}
+			event.ssdpUSN = part.trim()
 		}
 		else if (part.startsWith('ssdpTerm:')) {
 			part -= "ssdpTerm:"
-			def valueString = part.trim()
-			if (valueString) {
-				event.ssdpTerm = valueString
-			}
+			event.ssdpTerm = part.trim()
 		}
 		else if (part.startsWith('headers')) {
 			part -= "headers:"
-			def valueString = part.trim()
-			if (valueString) {
-				event.headers = valueString
-			}
+			event.headers = part.trim()
 		}
 		else if (part.startsWith('body')) {
 			part -= "body:"
-			def valueString = part.trim()
-			if (valueString) {
-				event.body = valueString
-			}
+			event.body = part.trim()
 		}
 	}
 	event

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

@@ -473,68 +473,48 @@ private def parseXmlBody(def body) {
 }
 
 private def parseDiscoveryMessage(String description) {
-	def device = [:]
+	def event = [:]
 	def parts = description.split(',')
 	parts.each { part ->
 		part = part.trim()
 		if (part.startsWith('devicetype:')) {
-			def valueString = part.split(":")[1].trim()
-			device.devicetype = valueString
+			part -= "devicetype:"
+			event.devicetype = part.trim()
 		}
 		else if (part.startsWith('mac:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				device.mac = valueString
-			}
+			part -= "mac:"
+			event.mac = part.trim()
 		}
 		else if (part.startsWith('networkAddress:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				device.ip = valueString
-			}
+			part -= "networkAddress:"
+			event.ip = part.trim()
 		}
 		else if (part.startsWith('deviceAddress:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				device.port = valueString
-			}
+			part -= "deviceAddress:"
+			event.port = part.trim()
 		}
 		else if (part.startsWith('ssdpPath:')) {
-			def valueString = part.split(":")[1].trim()
-			if (valueString) {
-				device.ssdpPath = valueString
-			}
+			part -= "ssdpPath:"
+			event.ssdpPath = part.trim()
 		}
 		else if (part.startsWith('ssdpUSN:')) {
 			part -= "ssdpUSN:"
-			def valueString = part.trim()
-			if (valueString) {
-				device.ssdpUSN = valueString
-			}
+			event.ssdpUSN = part.trim()
 		}
 		else if (part.startsWith('ssdpTerm:')) {
 			part -= "ssdpTerm:"
-			def valueString = part.trim()
-			if (valueString) {
-				device.ssdpTerm = valueString
-			}
+			event.ssdpTerm = part.trim()
 		}
 		else if (part.startsWith('headers')) {
 			part -= "headers:"
-			def valueString = part.trim()
-			if (valueString) {
-				device.headers = valueString
-			}
+			event.headers = part.trim()
 		}
 		else if (part.startsWith('body')) {
 			part -= "body:"
-			def valueString = part.trim()
-			if (valueString) {
-				device.body = valueString
-			}
+			event.body = part.trim()
 		}
 	}
-	device
+	event
 }
 
 def doDeviceSync(){