Merge pull request #1774 from SmartThingsCommunity/staging

Rolling up staging to production
2026-03-09 13:21:53 +00:00 · 2017-03-14 11:40:39 -07:00
13 changed files with 16 additions and 130 deletions
--- a/devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
+++ b/devicetypes/smartthings/fibaro-flood-sensor.src/fibaro-flood-sensor.groovy
@@ -40,8 +40,7 @@ metadata {
 		capability "Configuration"
 		capability "Battery"
 		capability "Health Check"
-    capability "Sensor"
-    
+
 		command    "resetParams2StDefaults"
 		command    "listCurrentParams"
 		command    "updateZwaveParam"
--- a/devicetypes/smartthings/homeseer-multisensor.src/homeseer-multisensor.groovy
+++ b/devicetypes/smartthings/homeseer-multisensor.src/homeseer-multisensor.groovy
@@ -39,8 +39,8 @@ metadata {

 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC"
-			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc"
+			state "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0"
+			state "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff"
 		}
 		valueTile("temperature", "device.temperature", inactiveLabel: false) {
 			state "temperature", label:'${currentValue}°',
--- a/devicetypes/smartthings/nyce-motion-sensor.src/nyce-motion-sensor.groovy
+++ b/devicetypes/smartthings/nyce-motion-sensor.src/nyce-motion-sensor.groovy
@@ -21,7 +21,6 @@ metadata {
 		capability "Configuration"
 		capability "Battery"
 		capability "Refresh"
-		capability "Sensor"
        
        command "enrollResponse"

@@ -32,8 +31,8 @@ metadata {

 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
 		}
        
         valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false) {
--- a/devicetypes/smartthings/nyce-open-closed-sensor.src/nyce-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/nyce-open-closed-sensor.src/nyce-open-closed-sensor.groovy
@@ -24,7 +24,6 @@ metadata {
 		capability "Contact Sensor"
 		capability "Refresh"
 		capability "Health Check"
-		capability "Sensor"

 		command "enrollResponse"

--- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy
@@ -45,8 +45,8 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name: "contact", type: "generic", width: 6, height: 4) {
 			tileAttribute("device.contact", key: "PRIMARY_CONTROL") {
-				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13"
-				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC"
+				attributeState "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e"
+				attributeState "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821"
 			}
 		}

--- a/devicetypes/smartthings/zwave-device.src/zwave-device.groovy
+++ b/devicetypes/smartthings/zwave-device.src/zwave-device.groovy
@@ -33,7 +33,7 @@ metadata {

 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.unknown.zwave.device", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.unknown.zwave.device", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.unknown.zwave.device", backgroundColor: "#ffffff"
 		}
 		standardTile("switchOn", "device.switch", inactiveLabel: false, decoration: "flat") {
--- a/devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy
+++ b/devicetypes/smartthings/zwave-metering-switch.src/zwave-metering-switch.groovy
@@ -51,7 +51,7 @@ metadata {
 	// tile definitions
 	tiles {
 		standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
-			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+			state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 			state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 		}
 		valueTile("power", "device.power") {
--- a/devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy
+++ b/devicetypes/smartthings/zwave-motion-sensor.src/zwave-motion-sensor.groovy
@@ -38,8 +38,8 @@ metadata {
 	
 	tiles {
 		standardTile("motion", "device.motion", width: 2, height: 2) {
-			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
-			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc")
+			state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
+			state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state("battery", label:'${currentValue}% battery', unit:"")
--- a/devicetypes/smartthings/zwave-sensor.src/zwave-sensor.groovy
+++ b/devicetypes/smartthings/zwave-sensor.src/zwave-sensor.groovy
@@ -32,8 +32,8 @@ metadata {

 	tiles {
 		standardTile("sensor", "device.sensor", width: 2, height: 2) {
-			state("inactive", label:'inactive', icon:"st.unknown.zwave.sensor", backgroundColor:"#cccccc")
-			state("active", label:'active', icon:"st.unknown.zwave.sensor", backgroundColor:"#00A0DC")
+			state("inactive", label:'inactive', icon:"st.unknown.zwave.sensor", backgroundColor:"#ffffff")
+			state("active", label:'active', icon:"st.unknown.zwave.sensor", backgroundColor:"#53a7c0")
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state "battery", label:'${currentValue}% battery', unit:""
--- a/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy
@@ -47,7 +47,7 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}
 		}
--- a/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
+++ b/devicetypes/smartthings/zwave-switch.src/zwave-switch.groovy
@@ -46,7 +46,7 @@ metadata {
 	tiles(scale: 2) {
 		multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){
 			tileAttribute ("device.switch", key: "PRIMARY_CONTROL") {
-				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
+				attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
 				attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
 			}
 		}
--- a/devicetypes/smartthings/zwave-water-sensor.src/zwave-water-sensor.groovy
+++ b/devicetypes/smartthings/zwave-water-sensor.src/zwave-water-sensor.groovy
@@ -33,7 +33,7 @@ metadata {
 	tiles {
 		standardTile("water", "device.water", width: 2, height: 2) {
 			state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
-			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC"
+			state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") {
 			state "battery", label:'${currentValue}% battery', unit:""
--- a/smartapps/smartelligynt/smartelligynt-smartthings-event-collector.src/smartelligynt-smartthings-event-collector.groovy
+++ b/smartapps/smartelligynt/smartelligynt-smartthings-event-collector.src/smartelligynt-smartthings-event-collector.groovy
@@ -1,111 +0,0 @@
-/**
- *  smartelligynt smartthings event collector
- *
- *  Copyright 2017 Rahul
- *
- */
-definition(
-    name: "smartelligynt smartthings event collector",
-    namespace: "smartelligynt",
-    author: "Rahul",
-    description: "samsung smartthings event collector",
-    category: "SmartThings Labs",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png",
-    oauth: [displayName: "smartelligynt", displayLink: "http://www.smartelligynt.com"])
-
-import groovy.json.JsonSlurper
-
-preferences {
-	section("Select your devices to monitor with smartelligynt") {
-		        input "switches", "capability.switch", title: "Switches", multiple: true, required: false
-                input "contacts", "capability.contactSensor", title: "Contact Sensors", multiple: true, required: false
-                input "accelerometers", "capability.accelerationSensor", title: "Accelerometers", multiple: true, required: false
-
-
-
-	}
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// TODO: subscribe to attributes, devices, locations, etc.
-    log.debug "Updated with settings: ${settings}"
-
-    subscribeToDeviceEvents()
-}
-
-def subscribeToDeviceEvents() {
-	log.debug "Updated with settings: ${switches}"
-	if (null  != accelerometers) {
-		subscribe(accelerometers, "acceleration", handleEvents)
-	}
-    if (null  != switches) {
-		subscribe(switches, "switches", handleEvents)
-	}
-    if (null  != contacts) {
-		subscribe(contacts, "contacts", handleEvents)
-	}
-    
-
-}
-
-
-def handleEvents(evt) {
-	log.debug "$evt.displayName($evt.name:$evt.unit) $evt.value"
-
-	if (evt.unit != null) {
-		eventName = "$evt.displayName(${evt.name}_$evt.unit)"
-	}
-	def eventValue = "$evt.value"
-
-	postEvents(eventName, eventValue)
-}
-
-def postEvents(eventName, eventValue)
-{
-	def epoch = now() / 1000
-
-	def jsonSlurper = new JsonSlurper()
-    def txt = "{ \"en\": \"$eventName\", \"ev\" : \"$eventValue\", \"et\" : $epoch }"
-	def object = jsonSlurper.parseText(txt)
-
-	def params = [
-    	uri: "http://collect.smartelligynt.com/api/events/",
-    	body: 
-       		object
-    
-	]
-
-	try {
-    	httpPostJson(params) { resp ->
-        resp.headers.each {
-            log.debug "${it.name} : ${it.value}"
-        }
-        log.debug  "response status code: ${resp.status}"
-        log.debug "response data: ${resp.data}"
-
-    }
-	} catch (e) {
-    	log.debug "something went wrong: $e"
-	}
-
-
-
-}
-
-// TODO : Implement mappings
-// TODO: implement event handlers