test: test

Rolling down staging to master

devicetypes/gouldner/stateless-on-off-button-tile.src/stateless-on-off-button-tile.groovy

@@ -0,0 +1,46 @@
+/**
+ *  Stateless On/Off Button Tile
+ *
+ *  Author: Ronald Gouldner
+ *
+ *  Date: 2015-05-14
+ */
+metadata {
+	// Automatically generated. Make future change here.
+	definition (name: "Stateless On-Off Button Tile", namespace: "gouldner", author: "Ronald Gouldner") {
+		capability "Actuator"
+		capability "Switch"
+		capability "Sensor"
+	}
+
+	// simulator metadata
+	simulator {
+	}
+
+	// UI tile definitions
+	tiles {
+		standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) {
+			state "offReady", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "onReady"
+			state "onReady", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "offReady"
+			state "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
+			state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
+		}
+		main "button"
+		details "button"
+	}
+}
+
+def parse(String description) {
+}
+
+def on() {
+    log.debug "Stateless On/Off Button Tile Virtual Switch ${device.name} turned on"
+    sendEvent(name: "switch", value: "on")
+    sendEvent(name: "switch", value: "onReady")
+}
+
+def off() {
+    log.debug "Stateless On/Off Button Tile Virtual Switch ${device.name} turned off"
+    sendEvent(name: "switch", value: "off")
+    sendEvent(name: "switch", value: "offReady")
+}

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

@@ -81,51 +81,47 @@ metadata {
 // parse events into attributes
 def parse(String description) {
 	log.debug "Parse description $description"
-	def map = [:]
-	if (description?.startsWith("read attr -")) {
-		def descMap = parseDescriptionAsMap(description)
+	List result = []
+	def descMap = zigbee.parseDescriptionAsMap(description)
 	log.debug "Desc Map: $descMap"
-		if (descMap.cluster == "0201" && descMap.attrId == "0000") {
+	List attrData = [[cluster: descMap.cluster ,attrId: descMap.attrId, value: descMap.value]]
+	descMap.additionalAttrs.each {
+	    attrData << [cluster: descMap.cluster, attrId: it.attrId, value: it.value]
+	}
+	attrData.each {
+		def map = [:]
+		if (it.cluster == "0201" && it.attrId == "0000") {
 			log.debug "TEMP"
 			map.name = "temperature"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0011") {
+		} else if (it.cluster == "0201" && it.attrId == "0011") {
 			log.debug "COOLING SETPOINT"
 			map.name = "coolingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "0012") {
+		} else if (it.cluster == "0201" && it.attrId == "0012") {
 			log.debug "HEATING SETPOINT"
 			map.name = "heatingSetpoint"
-			map.value = getTemperature(descMap.value)
+			map.value = getTemperature(it.value)
 			map.unit = temperatureScale
-		} else if (descMap.cluster == "0201" && descMap.attrId == "001c") {
+		} else if (it.cluster == "0201" && it.attrId == "001c") {
 			log.debug "MODE"
 			map.name = "thermostatMode"
-			map.value = getModeMap()[descMap.value]
-		} else if (descMap.cluster == "0202" && descMap.attrId == "0000") {
+			map.value = getModeMap()[it.value]
+		} else if (it.cluster == "0202" && it.attrId == "0000") {
 			log.debug "FAN MODE"
 			map.name = "thermostatFanMode"
-			map.value = getFanModeMap()[descMap.value]
+			map.value = getFanModeMap()[it.value]
 		}
-	}
-
-	def result = null
 		if (map) {
-		result = createEvent(map)
+			result << createEvent(map)
 		}
 		log.debug "Parse returned $map"
+	}
 	return result
 }
 
-def parseDescriptionAsMap(description) {
-	(description - "read attr - ").split(",").inject([:]) { map, param ->
-		def nameAndValue = param.split(":")
-		map += [(nameAndValue[0].trim()):nameAndValue[1].trim()]
-	}
-}
-
 def getModeMap() { [
 	"00":"off",
 	"03":"cool",

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

@@ -82,7 +82,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()       //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 /**

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

@@ -17,6 +17,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"

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

@@ -18,6 +18,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
 		command "setAdjustedColor"
         command "reset"

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

@@ -15,6 +15,7 @@ metadata {
 		capability "Refresh"
 		capability "Sensor"
 		capability "Health Check"
+		capability "Light"
 
         command "refresh"
 	}

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

@@ -16,6 +16,7 @@ metadata {
         capability "Switch"
         capability "Refresh"
         capability "Health Check"
+        capability "Light"
 
         command "refresh"
     }

devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy

@@ -89,7 +89,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def refresh() {

devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy

@@ -115,7 +115,7 @@ def refreshAttributes() {
 }
 
 def setLevel(value) {
-	zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+	zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -135,7 +135,7 @@ def setColorTemperature(value) {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()         //adding refresh because of ZLL bulb not conforming to send-me-a-report
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()        //adding refresh because of ZLL bulb not conforming to send-me-a-report
 }
 
 def setColor(value){

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

@@ -90,7 +90,7 @@ def on() {
 }
 
 def setLevel(value) {
-    zigbee.setLevel(value) + ["delay 1500"] + zigbee.levelRefresh()
+    zigbee.setLevel(value) + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }
 
 def refresh() {

smartapps/dianoga/netatmo-connect.src/netatmo-connect.groovy

@@ -73,7 +73,7 @@ def authPage() {
 			return dynamicPage(name: "Credentials", title: "Authorize Connection", nextPage:"listDevices", uninstall: uninstallAllowed, install:false) {
 				section() {
 					paragraph "Tap below to log in to the netatmo and authorize SmartThings access."
-					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}:", description:description
+					href url:redirectUrl, style:"embedded", required:false, title:"Connect to ${getVendorName()}", description:description
 				}
 			}
 		} else {
@@ -146,18 +146,23 @@ def callback() {
 
 		// log.debug "PARAMS: ${params}"
 
+		try {
             httpPost(params) { resp ->
 
                 def slurper = new JsonSlurper()
 
                 resp.data.each { key, value ->
                     def data = slurper.parseText(key)
-
+					log.debug "Data: $data"
                     state.refreshToken = data.refresh_token
                     state.authToken = data.access_token
+                    //state.accessToken = data.access_token
                     state.tokenExpires = now() + (data.expires_in * 1000)
                     // log.debug "swapped token: $resp.data"
                 }
+            }
+        } catch (Exception e) {
+			log.debug "callback: Call failed $e"
         }
 
 		// Handle success and failure here, and render stuff accordingly
@@ -387,18 +392,18 @@ def getDeviceList() {
 	state.deviceDetail = [:]
 	state.deviceState = [:]
 
-	apiGet("/api/devicelist") { response ->
+	apiGet("/api/getstationsdata") { response ->
 		response.data.body.devices.each { value ->
 			def key = value._id
 			deviceList[key] = "${value.station_name}: ${value.module_name}"
 			state.deviceDetail[key] = value
             state.deviceState[key] = value.dashboard_data
+            value.modules.each { value2 ->            
+                def key2 = value2._id
+                deviceList[key2] = "${value.station_name}: ${value2.module_name}"
+                state.deviceDetail[key2] = value2
+                state.deviceState[key2] = value2.dashboard_data            
             }
-		response.data.body.modules.each { value ->
-			def key = value._id
-			deviceList[key] = "${state.deviceDetail[value.main_device].station_name}: ${value.module_name}"
-			state.deviceDetail[key] = value
-            state.deviceState[key] = value.dashboard_data
 		}
 	}
 
@@ -448,6 +453,7 @@ def listDevices() {
 }
 
 def apiGet(String path, Map query, Closure callback) {
+
 	if(now() >= state.tokenExpires) {
 		refreshToken();
 	}
@@ -469,9 +475,13 @@ def apiGet(String path, Map query, Closure callback) {
 		log.debug "apiGet: Call failed $e"
         if(refreshToken()) {
             log.debug "apiGet: Trying again after refreshing token"
+            try {
                 httpGet(params)	{ response ->
                     callback.call(response)
                 }
+            } catch (Exception f) {
+                log.debug "apiGet: Call failed $f"
+            }
         }
 	}
 }

smartapps/osotech/plantlink-connector.src/plantlink-connector.groovy

@@ -137,6 +137,7 @@ def dock_sensor(device_serial, expected_plant_name) {
             contentType: "application/json",
     ]
     log.debug "Creating new plant on myplantlink.com - ${expected_plant_name}"
+    try {
         httpPost(docking_params) { docking_response ->
             if (parse_api_response(docking_response, "Docking a link")) {
                 if (docking_response.data.plants.size() == 0) {
@@ -145,6 +146,7 @@ def dock_sensor(device_serial, expected_plant_name) {
                     plant_post_body_map['links_key'] = [docking_response.data.key]
                     def plant_post_body_json_builder = new JsonBuilder(plant_post_body_map)
                     plant_post_params["body"] = plant_post_body_json_builder.toString()
+                    try {
                         httpPost(plant_post_params) { plant_post_response ->
                             if(parse_api_response(plant_post_response, 'creating plant')){
                                 def attached_map = atomicState.attached_sensors
@@ -152,6 +154,9 @@ def dock_sensor(device_serial, expected_plant_name) {
                                 atomicState.attached_sensors = attached_map
                             }
                         }
+                    } catch (Exception f) {
+                        log.debug "call failed $f"
+                    }
                 } else {
                     def plant = docking_response.data.plants[0]
                     def attached_map = atomicState.attached_sensors
@@ -161,6 +166,9 @@ def dock_sensor(device_serial, expected_plant_name) {
                 }
             }
         }
+    } catch (Exception e) {
+        log.debug "call failed $e"
+    }
     return true
 }
 
@@ -178,9 +186,13 @@ def checkAndUpdatePlantIfNeeded(plant, expected_plant_name){
         ]
         def plant_put_body_json_builder = new JsonBuilder(plant_put_body_map)
         plant_put_params["body"] = plant_put_body_json_builder.toString()
+        try {
             httpPut(plant_put_params) { plant_put_response ->
                 parse_api_response(plant_put_response, 'updating plant name')
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -198,6 +210,7 @@ def moistureHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
+        try {
             httpPost(measurement_post_params) { measurement_post_response ->
                 if (parse_api_response(measurement_post_response, 'creating moisture measurement') &&
                         measurement_post_response.data.size() >0){
@@ -218,6 +231,9 @@ def moistureHandler(event){
                     }
                 }
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -235,9 +251,13 @@ def batteryHandler(event){
                 contentType: "application/json",
                 body: event.value
         ]
+        try {
             httpPost(measurement_post_params) { measurement_post_response ->
                 parse_api_response(measurement_post_response, 'creating battery measurement')
             }
+        } catch (Exception e) {
+            log.debug "call failed $e"
+        }
     }
 }
 
@@ -275,9 +295,13 @@ def swapToken(){
     ]
 
     def jsonMap
+    try {
         httpPost(postParams) { resp ->
             jsonMap = resp.data
         }
+    } catch (Exception e) {
+        log.debug "call failed $e"
+    }
 
     atomicState.refreshToken = jsonMap.refresh_token
     atomicState.authToken = jsonMap.access_token