Merge pull request #2088 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy

@@ -300,21 +300,15 @@ def setColor(value) {
         value.hex = "#${hex(value.red)}${hex(value.green)}${hex(value.blue)}"
     }
 
-    if(value.hue) {
+	sendEvent(name: "hue", value: value.hue, displayed: false)
-        sendEvent(name: "hue", value: value.hue, displayed: false)
+	sendEvent(name: "saturation", value: value.saturation, displayed: false)
-    }
+	sendEvent(name: "color", value: value.hex, displayed: false)
-    if(value.saturation) {
+	if (value.level) {
-        sendEvent(name: "saturation", value: value.saturation, displayed: false)
+		sendEvent(name: "level", value: value.level)
-    }
+	}
-    if(value.hex?.trim()) {
+	if (value.switch) {
-        sendEvent(name: "color", value: value.hex, displayed: false)
+		sendEvent(name: "switch", value: value.switch)
-    }
+	}
-    if (value.level) {
-        sendEvent(name: "level", value: value.level)
-    }
-    if (value.switch?.trim()) {
-        sendEvent(name: "switch", value: value.switch)
-    }
 
     sendRGB(value.rh, value.gh, value.bh)
 }

devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy

@@ -56,8 +56,6 @@ metadata {
 def installed(){
 // Device-Watch simply pings if no device events received for 32min(checkInterval)
 	sendEvent(name: "checkInterval", value: 2 * 15 * 60 + 2 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
-	response(refresh())
 }
 
 def updated(){
@@ -87,17 +85,11 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) {
 }
 
 def open() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0x00).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 def close() {
-	delayBetween([
+	zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format()
-		zwave.switchBinaryV1.switchBinarySet(switchValue: 0xFF).format(),
-		zwave.switchBinaryV1.switchBinaryGet().format()
-	], 500)
 }
 
 /**
@@ -113,6 +105,6 @@ def refresh() {
 
 def createEventWithDebug(eventMap) {
 	def event = createEvent(eventMap)
-	log.debug "Event created with ${event?.name}:${event?.value} - ${event?.descriptionText}"
+	log.debug "Event created with ${event?.descriptionText}"
 	return event
 }

devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy

@@ -49,6 +49,6 @@ def arrived() {
 
 
 def departed() {
-	log.trace "Executing 'departed'"
+	log.trace "Executing 'arrived'"
 	sendEvent(name: "presence", value: "not present")
 }

smartapps/smartthings/left-it-open-set-switch.src/left-it-open-set-switch.groovy

@@ -1,97 +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.
- *
- *  Left It Open
- *
- *  Author: SmartThings
- *  Date: 2013-05-09
- */
-definition(
-    name: "Left It Open (Set switch)",
-    namespace: "smartthings",
-    author: "SmartThings",
-    description: "Turns on a switch if you have left a door or window open longer that a specified amount of time. Turns if off when closed",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/bon-voyage.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/ModeMagic/bon-voyage%402x.png"
-)
-
-preferences {
-
-	section("Monitor this door or window") {
-		input "contact", "capability.contactSensor"
-	}
-	section("And notify me if it's open for more than this many minutes (default 10)") {
-		input "openThreshold", "number", description: "Number of minutes", required: false
-	}
-	section("Turn on/off a switch... (usually a simulated one)") {
-		input "switch1", "capability.switch"
-	}
-}
-
-def installed() {
-	log.trace "installed()"
-	subscribe()
-}
-
-def updated() {
-	log.trace "updated()"
-	unsubscribe()
-	subscribe()
-}
-
-def subscribe() {
-	subscribe(contact, "contact.open", doorOpen)
-	subscribe(contact, "contact.closed", doorClosed)
-}
-
-def doorOpen(evt)
-{
-	log.trace "doorOpen($evt.name: $evt.value)"
-	def t0 = now()
-	def delay = (openThreshold != null && openThreshold != "") ? openThreshold * 60 : 600
-	runIn(delay, doorOpenTooLong, [overwrite: false])
-	log.debug "scheduled doorOpenTooLong in ${now() - t0} msec"
-}
-
-def doorClosed(evt)
-{
-	log.trace "doorClosed($evt.name: $evt.value)"
-        switch1.off()
-}
-
-def doorOpenTooLong() {
-	def contactState = contact.currentState("contact")
-    def freq = (frequency != null && frequency != "") ? frequency * 60 : 600
-
-	if (contactState.value == "open") {
-		def elapsed = now() - contactState.rawDateCreated.time
-		def threshold = ((openThreshold != null && openThreshold != "") ? openThreshold * 60000 : 60000) - 1000
-		if (elapsed >= threshold) {
-			log.debug "Contact has stayed open long enough since last check ($elapsed ms):  calling sendMessage()"
-			sendMessage()
-            runIn(freq, doorOpenTooLong, [overwrite: false])
-		} else {
-			log.debug "Contact has not stayed open long enough since last check ($elapsed ms):  doing nothing"
-		}
-	} else {
-		log.warn "doorOpenTooLong() called but contact is closed:  doing nothing"
-	}
-}
-
-void sendMessage()
-{
-	def minutes = (openThreshold != null && openThreshold != "") ? openThreshold : 10
-	def msg = "${contact.displayName} has been left open for ${minutes} minutes."
-	log.info msg
-        switch1.on()
-}