MSA-973: This application will subscribe to sensors (temperature, door sensor, humidity, energy meter...) and send events and metrics into a remote Influxdb 0.9.x database using the line protocol.

Rolling down changes in staging to master

devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties

@@ -23,6 +23,7 @@
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Outlet'''.ko=플러그
 # Events descriptionText
 '''{{ device.displayName }} is On'''.ko={{ device.displayName }}켜졌습니다.
 '''{{ device.displayName }} is Off'''.ko={{ device.displayName }}꺼졌습니다.

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

@@ -22,7 +22,6 @@
  *  1. 20160117 TW - Update/Edit to support i18n translations
 ===============================================================================
  */
-
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
@@ -104,8 +103,8 @@ def parse(String description) {
 			log.info "$device updates: ${finalResult.value}"
 		}
 		else if (finalResult.type == "power") {
-			def value = (finalResult.value as Integer)/10
-			createEvent(name: "power", value: value, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true )
+			def powerValue = (finalResult.value as Integer)/10
+			sendEvent(name: "power", value: powerValue, descriptionText: '{{ device.displayName }} power is {{ value }} Watts', translatable: true )
 			/*
 				Dividing by 10 as the Divisor is 10000 and unit is kW for the device. AttrId: 0302 and 0300. Simplifying to 10
 				power level is an integer. The exact power level with correct units needs to be handled in the device type
@@ -113,10 +112,8 @@ def parse(String description) {
 			*/
 		}
 		else {
-        	if ( finalResult.value == "on" )
-				createEvent(name: finalResult.type, value: finalResult.value, descriptionText: '{{ device.displayName }} is On', translatable: true)
-            else
-            	createEvent(name: finalResult.type, value: finalResult.value, descriptionText: '{{ device.displayName }} is Off', translatable: true)
+			def descriptionText = finalResult.value == "on" ? '{{ device.displayName }} is On' : '{{ device.displayName }} is Off'
+			sendEvent(name: finalResult.type, value: finalResult.value, descriptionText: descriptionText, translatable: true)
 		}
 	}
 	else {

devicetypes/smartthings/smartsense-moisture-sensor.src/i18n/messages.properties

@@ -30,11 +30,12 @@
 '''Degrees'''.ko=온도
 '''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Water Leak Sensor'''.ko=누수센서
 # Events descriptionText
 '''{{ device.displayName }} is dry'''.ko={{ device.displayName }}가 건조
 '''{{ device.displayName }} is wet'''.ko={{ device.displayName }}누수
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가) {{ value }}°C였습니다
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
 '''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 #==============================================================================

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

@@ -34,6 +34,7 @@ metadata {
 
 		command "enrollResponse"
 
+
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-S", deviceJoinName: "Water Leak Sensor"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite",  model: "3315-Seu", deviceJoinName: "Water Leak Sensor"
@@ -66,7 +67,7 @@ metadata {
 			}
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false, width: 2, height: 2) {
-			state "temperature", label:'${currentValue}°',
+			state "temperature", label:'${currentValue}°',
 				backgroundColors:[
 					[value: 31, color: "#153591"],
 					[value: 44, color: "#1e9cbb"],
@@ -256,8 +257,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-                    def value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 				}
 			}
 			else {
@@ -265,13 +265,14 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
 
 	return result
 }
+
 private Map getTemperatureResult(value) {
 	log.debug 'TEMP'
 	if (tempOffset) {
@@ -281,9 +282,9 @@ private Map getTemperatureResult(value) {
 	}
     def descriptionText
     if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
+    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
     else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
+    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
 
 	return [
 		name: 'temperature',

devicetypes/smartthings/smartsense-motion-sensor.src/i18n/messages.properties

@@ -29,11 +29,12 @@
 '''Degrees'''.ko=온도
 '''Adjust temperature by this many degrees'''.ko=몇 도씩 온도를 조절하십시오
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Motion Sensor'''.ko=모션 센서
 # Events descriptionText
 '''{{ device.displayName }} detected motion'''.ko={{ device.displayName }} 가 움직임을 감지하였습니다.
 '''{{ device.displayName }} motion has stopped'''.ko={{ device.displayName }}움직임이 중단되었습니다
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
 '''{{ device.displayName }} battery has too much power: (> 3.5) volts.'''.ko={{ device.displayName }} 배터리 전력이 너무 높습니다(3.5볼트 초과).
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 #==============================================================================

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

@@ -39,6 +39,7 @@ metadata {
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3305"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3325"
 		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326"
+		fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326-L", deviceJoinName: "Iris Motion Sensor"
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor"
 	}
 
@@ -272,7 +273,7 @@ private Map getBatteryResult(rawValue) {
 				if (pct != null) {
 					result.value = pct
                     def value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 				}
 			}
 			else {
@@ -280,7 +281,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
@@ -312,7 +313,6 @@ private Map getTemperatureResult(value) {
 private Map getMotionResult(value) {
 	log.debug 'motion'
 	String descriptionText = value == 'active' ? "{{ device.displayName }} detected motion" : "{{ device.displayName }} motion has stopped"
-    //String descriptionText = '{{ device.displayName }} is {{ value | translate }}'
 	return [
 		name: 'motion',
 		value: value,
@@ -322,7 +322,7 @@ private Map getMotionResult(value) {
 }
 
 def refresh() {
-	log.debug "refresh executed"
+	log.debug "refresh called"
 	def refreshCmds = [
 		"st rattr 0x${device.deviceNetworkId} 1 0x402 0", "delay 200",
 		"st rattr 0x${device.deviceNetworkId} 1 1 0x20", "delay 200"

devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties

@@ -32,6 +32,7 @@
 '''Do you want to use this sensor on a garage door?'''.ko=차고 문의 센서 사용 설정하기
 '''Tap to set'''.ko=눌러서 설정
 '''Give your device a name'''.ko=기기 이름 바꾸기
+'''Multipurpose Sensor'''.ko=멀티 센서
 # Events descriptionText
 '''{{ device.displayName }} was opened'''.ko={{ device.displayName }}열림을 감지하였습니다.
 '''{{ device.displayName }} was closed'''.ko={{ device.displayName }}닫혔습니다.
@@ -39,8 +40,6 @@
 '''{{ device.displayName }} was inactive'''.ko={{ device.displayName }}비활성화되었습니다.
 '''{{ device.displayName }} was {{ value }}°C'''.ko={{ device.displayName }}이(가){{ value }}°C였습니다.
 '''{{ device.displayName }} was {{ value }}°F'''.ko={{ device.displayName }}이(가) {{ value }}°F였습니다
-'''{{ device.displayName }} battery was {{ value }}'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}입니다.
+'''{{ device.displayName }} battery was {{ value }}%'''.ko={{ device.displayName }}남아있는 배터리는 {{ value }}%입니다.
 '''Updating device to garage sensor'''.ko=기기-차고 센서 업데이트 중
 '''Updating device to open/close sensor'''.ko=기기-열림/닫힘 센서 업데이트 중
-'''{{ device.displayName }} status was closed'''.ko={{ device.displayName }}은(는) 닫힌 상태입니다
-'''{{ device.displayName }} status was opened'''.ko={{ device.displayName }}은(는) 열린 상태입니다

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

@@ -24,8 +24,9 @@
 ===============================================================================
  */
 
- metadata {
+metadata {
 	definition (name: "SmartSense Multi Sensor", namespace: "smartthings", author: "SmartThings") {
+
 		capability "Three Axis"
 		capability "Battery"
 		capability "Configuration"
@@ -75,7 +76,7 @@
 			input "tempOffset", "number", title: "Degrees", description: "Adjust temperature by this many degrees", range: "*..*", displayDuringSetup: false
 		}
 		section {
- 			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", translatable: true, description: "Tap to set", options: ["Yes","No"], defaultValue: "No", required: false, displayDuringSetup: false)
+			input("garageSensor", "enum", title: "Do you want to use this sensor on a garage door?", description: "Tap to set", options: ["Yes", "No"], defaultValue: "No", required: false, displayDuringSetup: false)
 		}
 	}
 
@@ -109,9 +110,6 @@
 				]
 			)
 		}
-		valueTile("3axis", "device.threeAxis", decoration: "flat", wordWrap: false, width: 2, height: 2) {
-			state("threeAxis", label:'${currentValue}', unit:"", backgroundColor:"#ffffff")
-		}
 		valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
 		}
@@ -121,7 +119,7 @@
 
 
 		main(["status", "acceleration", "temperature"])
-		details(["status", "acceleration", "temperature", "3axis", "battery", "refresh"])
+		details(["status", "acceleration", "temperature", "battery", "refresh"])
 	}
  }
 
@@ -150,7 +148,7 @@ def parse(String description) {
 	return result
 }
 
- private Map parseCatchAllMessage(String description) {
+private Map parseCatchAllMessage(String description) {
 	Map resultMap = [:]
 	def cluster = zigbee.parse(description)
 	log.debug cluster
@@ -175,7 +173,7 @@ def parse(String description) {
 	}
 
 	return resultMap
-    }
+}
 
 private boolean shouldProcessMessage(cluster) {
 	// 0x0B is default response indicating message got through
@@ -214,6 +212,8 @@ private List parseReportAttributeMessage(String description) {
 		result << getAccelerationResult(descMap.value)
 	}
 	else if (descMap.cluster == "FC02" && descMap.attrId == "0012" && descMap.value.size() == 24) {
+		// The size is checked to ensure the attribute report contains X, Y and Z values
+		// If all three axis are not included then the attribute report is ignored
 		result << parseAxis(descMap.value)
 	}
 	else if (descMap.cluster == "0001" && descMap.attrId == "0020") {
@@ -311,7 +311,6 @@ def getTemperature(value) {
 
 private Map getBatteryResult(rawValue) {
 	log.debug "Battery rawValue = ${rawValue}"
-	def linkText = getLinkText(device)
 
 	def result = [
 		name: 'battery',
@@ -341,8 +340,7 @@ private Map getBatteryResult(rawValue) {
 				def pct = batteryMap[volts]
 				if (pct != null) {
 					result.value = pct
-                    def value = pct
-					result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+					result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 				}
 			}
 			else {
@@ -350,7 +348,7 @@ private Map getBatteryResult(rawValue) {
 				def maxVolts = 3.0
 				def pct = (volts - minVolts) / (maxVolts - minVolts)
 				result.value = Math.min(100, (int) pct * 100)
-				result.descriptionText = "{{ device.displayName }} battery was {{ value }}"
+				result.descriptionText = "{{ device.displayName }} battery was {{ value }}%"
 			}
 		}
 	}
@@ -359,22 +357,17 @@ private Map getBatteryResult(rawValue) {
 }
 
 private Map getTemperatureResult(value) {
-	log.debug 'TEMP'
-    def name = "temperature"
+	log.debug "Temperature"
 	if (tempOffset) {
 		def offset = tempOffset as int
 		def v = value as int
 		value = v + offset
 	}
-    
-    def descriptionText
-    if ( temperatureScale == 'C' )
-    	descriptionText = '{{ device.displayName }} was {{ value }}°C'
-    else
-    	descriptionText = '{{ device.displayName }} was {{ value }}°F'
+	def descriptionText = temperatureScale == 'C' ? '{{ device.displayName }} was {{ value }}°C':
+			'{{ device.displayName }} was {{ value }}°F'
 
 	return [
-		name: name,
+	name: 'temperature',
 	value: value,
 	descriptionText: descriptionText,
     translatable: true
@@ -383,28 +376,13 @@ private Map getTemperatureResult(value) {
 
 private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
-    def name = "contact"
-    
-    def descriptionText    
-    if ( value == 'open' )    
-		descriptionText = '{{ device.displayName }} was opened'
-    else
-    	descriptionText = '{{ device.displayName }} was closed'
-        
-    sendEvent(name: 'status', value: value, descriptionText: descriptionText, displayed: false)
-    def isStateChange = isStateChange(device, name, value)
-	return [
-		name: name,
-		value: value,
-		descriptionText: descriptionText,
-        isStateChange: isStateChange,
-        translatable: true
-	]
-	
+	def descriptionText = value == 'open' ? '{{ device.displayName }} was opened' : '{{ device.displayName }} was closed'
+	sendEvent(name: 'contact', value: value, descriptionText: descriptionText, displayed: false, translatable: true)
+	sendEvent(name: 'status', value: value, descriptionText: descriptionText, translatable: true)
 }
 
 private getAccelerationResult(numValue) {
-	log.debug "Acceleration is $value"
+	log.debug "Acceleration"
 	def name = "acceleration"
     def value
     def descriptionText
@@ -473,37 +451,38 @@ def refresh() {
 
 def configure() {
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
-	log.debug "Configuring Device Reporting"
+	log.debug "Configuring Reporting"
 
 	def configCmds = [
 		"zcl global write 0x500 0x10 0xf0 {${zigbeeEui}}", "delay 200",
 		"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 {0100}", "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 {0100}", "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 {0100}", "delay 200",
 		"send 0x${device.deviceNetworkId} 1 ${endpointId}", "delay 500"
 		]
+
 	return configCmds + refresh()
 }
 
@@ -519,17 +498,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])
@@ -556,6 +530,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
@@ -569,15 +548,9 @@ def garageEvent(zValue) {
 		garageValue = 'garage-open'
 	}
 	if (contactValue != null){
-		def linkText = getLinkText(device)
-        if ( contactValue == 'open' ) {
-        	descriptionText: '{{ device.displayName }} was opened'
-            sendEvent(name: 'contact', value: contactValue, descriptionText: '{{ device.displayName }} was opened', displayed:false, translatable: true)
-            sendEvent(name: 'status', value: garageValue, descriptionText: '{{ device.displayName }} status was opened', translatable: true)
-        } else {
-			sendEvent(name: 'contact', value: contactValue, descriptionText: '{{ device.displayName }} was closed', displayed:false, translatable: true)
-            sendEvent(name: 'status', value: garageValue, descriptionText: '{{ device.displayName }} status was closed', translatable: true)
-        }
+		def descriptionText = contactValue == 'open' ? '{{ device.displayName }} was opened' :'{{ device.displayName }} was closed'
+		sendEvent(name: 'contact', value: contactValue, descriptionText: descriptionText, displayed:false, translatable: true)
+		sendEvent(name: 'status', value: garageValue, descriptionText: descriptionText, translatable: true)
 	}
 }
 

smartapps/com-vinli-smartthings/vinli-home-connect.src/vinli-home-connect.groovy

@@ -67,11 +67,11 @@ mappings {
 def listAllDevices() {
    	def resp = []
    	switches.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("switch"), type: "switch", id: it.id, hub: it.hub?.name]
     }
     
     locks.each {
-      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub.name]
+      resp << [name: it.name, label: it.label, value: it.currentValue("lock"), type: "lock", id: it.id, hub: it.hub?.name]
     }
     return resp
 }

smartapps/prune/influxdbshipper.src/influxdbshipper.groovy

@@ -0,0 +1,159 @@
+/**
+ *  InfluxdbShipper
+ *
+ *  Copyright 2016 Prune - prune@lecentre.net
+ *
+ *  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.
+ *
+ * Description : 
+ * This application listen to sensors and send the result metric to an Influxdb 0.9.x or newer server.
+ * It is NOT compatible with Influxdb 0.8.x
+ *
+ * Check Influxdb docs at
+ * https://docs.influxdata.com/influxdb/v0.10/introduction/
+ *
+ * Usage : 
+ * select sensors you want to monitor
+ * enter your InfluxDB URL with full informations :
+ *
+ * <host>:<port>
+ *
+ * Ex : www.myserver.ca:8086/write
+ *
+ * It is strongly encouraged to use HTTPS and a login/password as your Influxdb server need to be open to the world
+ */
+definition(
+    name: "InfluxdbShipper",
+    namespace: "Prune",
+    author: "Prune",
+    description: "stream metrics to Influxdb",
+    category: "My Apps",
+    iconUrl: "http://lkhill.com/wp/wp-content/uploads/2015/10/influxdb-logo.png",
+    iconX2Url: "http://lkhill.com/wp/wp-content/uploads/2015/10/influxdb-logo.png",
+    iconX3Url: "http://lkhill.com/wp/wp-content/uploads/2015/10/influxdb-logo.png")
+
+
+
+preferences {
+    section("Log devices...") {
+        input "temperatures", "capability.temperatureMeasurement", title: "Temperatures", required:false, multiple: true
+        input "humidity", "capability.relativeHumidityMeasurement", title: "Humidity", required:false, multiple: true
+        input "contacts", "capability.contactSensor", title: "Doors open/close", required: false, multiple: true
+        input "motions", "capability.motionSensor", title: "Motions", required: false, multiple: true
+        input "presence", "capability.presenceSensor", title: "Presence", required: false, multiple: true
+        input "switches", "capability.switch", title: "Switches", required: false, multiple: true
+        input "energy", "capability.energyMeter", title: "Energy", required: false, multiple: true
+        input "smoke", "capability.smokeDetector", title: "Smoke", required: false, multiple: true
+    }
+
+    section ("Influxdb URL...") {
+        input "influxdb_url", "text", title: "Influxdb URL"
+        input "influxdb_proto", "enum", title: "Protocol (http or https)", options: ["HTTP", "HTTPS"]
+        input "influxdb_db", "text", title: "Influxdb DB"
+        input "influxdb_login", "text", title: "Influxdb Login"
+        input "influxdb_password", "password", title: "Influxdb Password"
+    }
+}
+
+def installed() {
+    initialize()
+}
+
+def updated() {
+    unsubscribe()
+    initialize()
+}
+
+def initialize() {
+    /*subscribe(temperatures, "temperature", handleTemperatureEvent)
+    subscribe(contacts, "contact", handleContactEvent)
+    subscribe(accelerations, "acceleration", handleAccelerationEvent)
+    subscribe(motions, "motion", handleMotionEvent)
+    subscribe(presence, "presence", handlePresenceEvent)
+    subscribe(switches, "switch", handleSwitchEvent)
+	log.debug "Done subscribing to events"
+    */
+    //log.debug "temperatures: ${temperatures[0].name} = ${temperatures[0].currentState("temperature").value}"
+    // Send data every 5 mins
+    runEvery5Minutes(updateCurrentStats)
+   
+}
+
+
+/*
+  Push data to Influx
+*/
+def updateCurrentStats() {
+
+    //log.debug "Logging to Influxdb ${influxdb_url}"
+    // Builds the URL that will be sent to Influxdb
+    def full_url = "${influxdb_proto}://${influxdb_url}/write?db=${influxdb_db}"
+    if (influxdb_login != "") {
+    	full_url += "&u=${influxdb_login}&p=${influxdb_password}"
+        }
+        
+    def full_body=""
+    temperatures.eachWithIndex{ val, idx -> 
+        def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+    	full_body += "temp,sensor=${sensorName} value=${val.currentState("temperature").value} \n"
+    }
+    contacts.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        // 0=closed, 1=open
+        def contactState = val.currentState("contact").value == "open" ? 1 : 0
+    	full_body += "contact,sensor=${sensorName} value=${contactState} \n"
+    }
+    humidity.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+    	full_body += "humidity,sensor=${sensorName} value=${val.currentState("humidity").value} \n"
+    }
+    motions.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        // 0=no motion, 1=motion detected
+        def motionState = val.currentState("motion").value == "active" ? 1 : 0
+        full_body += "motion,sensor=${sensorName} value=${motionState} \n"
+        }
+    presence.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        // 0=no presence, 1=present
+        def presenceState = val.currentState("presence").value == "present" ? 1 : 0
+        full_body += "presence,sensor=${sensorName} value=${presenceState} \n"
+        }
+    switches.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        // 0=off, 1=on
+        def switchState = val.currentState("switch").value == "on" ? 1 : 0
+        full_body += "switch,sensor=${sensorName} value=${switchState} \n"
+        }
+    energy.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        full_body += "energy,sensor=${sensorName} value=${val.currentState("energy").value} \n"
+        } 
+    smoke.eachWithIndex{ val, idx -> 
+    	def sensorName = val.displayName.replaceAll(" ",'\\\\ ')
+        // 0="clear" 1="detected" 2="tested"
+        def smokeState = val.currentState("smoke").value == "detected" ? 1 : 0
+        full_body += "smoke,sensor=${sensorName} value=${smokeState} \n"
+        }
+    def params = [
+        uri: full_url,
+        body: full_body
+    ]
+    
+    try {
+        // Make the HTTP request using httpGet()
+        log.debug "Calling $params"
+        httpPost(params) { resp -> // This is how we define the "return data". Can also use $it.
+            log.debug "response data: ${resp.data}"
+        }
+    } catch (e) {
+        log.error "something went wrong: $e"
+    }
+}

smartapps/smartthings/speaker-notify-with-sound.src/speaker-notify-with-sound.groovy

@@ -76,7 +76,7 @@ def mainPage() {
 		}
 		section{
 			input "actionType", "enum", title: "Action?", required: true, defaultValue: "Bell 1", options: [
-				//"Custom Message",
+				"Custom Message",
 				"Bell 1",
 				"Bell 2",
 				"Dogs Barking",
@@ -89,7 +89,7 @@ def mainPage() {
 				"Someone is arriving",
 				"Piano",
 				"Lightsaber"]
-			//input "message","text",title:"Play this message", required:false, multiple: false
+			input "message","text",title:"Play this message", required:false, multiple: false
 		}
 		section {
 			input "sonos", "capability.musicPlayer", title: "On this Speaker player", required: true
@@ -408,13 +408,15 @@ private loadText() {
 		case "Lightsaber":
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/lightsaber.mp3", duration: "10"]
 			break;
-		default:
-			/*if (message) {
+		case "Custom Message":
+			if (message) {
 				state.sound = textToSpeech(message instanceof List ? message[0] : message) // not sure why this is (sometimes) needed)
 			}
 			else {
 				state.sound = textToSpeech("You selected the custom message option but did not enter a message in the $app.label Smart App")
-			}*/
+			}
+			break;
+		default:
 			state.sound = [uri: "http://s3.amazonaws.com/smartapp-media/sonos/bell1.mp3", duration: "10"]
 			break;
 	}