Merge pull request #1518 from SmartThingsCommunity/staging

Rolling up staging to prod for deploy

devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy

@@ -22,10 +22,9 @@ metadata {
 		capability "Sensor"
 		capability "Health Check"
 
-		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "GE In-Wall Smart Dimmer "
-		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "GE Plug-In Smart Dimmer "
-		fingerprint mfr:"0063", prod:"4944", model:"3034", deviceJoinName: "GE In-Wall Smart Fan Control"
+		fingerprint mfr:"0063", prod:"4457", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"4944", deviceJoinName: "Z-Wave Wall Dimmer"
+		fingerprint mfr:"0063", prod:"5044", deviceJoinName: "Z-Wave Plug-In Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy

@@ -24,10 +24,6 @@ metadata {
 		fingerprint inClusters: "0x26", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1902", deviceJoinName: "Z-Wave Dimmer"
 		fingerprint mfr:"001D", prod:"1B03", model:"0334", deviceJoinName: "Leviton Universal Dimmer"
-		fingerprint mfr:"011A", prod:"0102", model:"0201", deviceJoinName: "Enerwave In-Wall Dimmer"
-		fingerprint mfr:"001D", prod:"1001", model:"0334", deviceJoinName: "Leviton 3-Speed Fan Controller"
-		fingerprint mfr:"001D", prod:"0602", model:"0334", deviceJoinName: "Leviton Magnetic Low Voltage Dimmer"
-		fingerprint mfr:"001D", prod:"0401", model:"0334", deviceJoinName: "Leviton 600W Incandescent Dimmer"
 	}
 
 	simulator {

devicetypes/smartthings/zwave-switch-generic.src/zwave-switch-generic.groovy

@@ -25,9 +25,6 @@ metadata {
 		fingerprint mfr:"0063", prod:"4F50", model:"3031", deviceJoinName: "GE Plug-in Outdoor Switch"
 		fingerprint mfr:"001D", prod:"1D04", model:"0334", deviceJoinName: "Leviton Outlet"
 		fingerprint mfr:"001D", prod:"1C02", model:"0334", deviceJoinName: "Leviton Switch"
-		fingerprint mfr:"001D", prod:"0301", model:"0334", deviceJoinName: "Leviton 15A Switch"
-		fingerprint mfr:"011A", prod:"0101", model:"0102", deviceJoinName: "Enerwave On/Off Switch"
-		fingerprint mfr:"011A", prod:"0101", model:"0603", deviceJoinName: "Enerwave Duplex Receptacle"
 	}
 
 	// simulator metadata

smartapps/ehrhardt/chime-when-open.src/chime-when-open.groovy

@@ -1,71 +0,0 @@
-/**
- *  Chime When Open
- *
- */
-definition(
-    name: "Chime When Open",
-    namespace: "ehrhardt",
-    author: "John Ehrhardt",
-    description: "Play a tone when some sensors being open",
-    category: "Convenience",
-    iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png",
-    iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png"
-    )
-
-
-preferences {
-	section("When any of these are open...") {
-		input "doorSensor", "capability.contactSensor", title: "Door Sensor", required: true, multiple: true
-	}
-	section("Play a tone on this device:") {
-		input "toneDevice", "capability.audioNotification", title: "Audio Playback Device", required: true
-		input "toneTrack", "number", title: "Tone Track (1-100)"
-	}
-    section("Play Tones During this timeframe")
-	{
-		input "starting", "time", title: "Start time", required: true
-		input "ending", "time", title: "End time", required: true
-    }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	subscribe(doorSensor, "contact", contactHandler)
-}
-
-def contactHandler(evt) {
-	log.trace "contactHandler: $evt ${evt.value}"
-
-    def openSensor = doorSensor.find{it.currentValue("contact") == "open"}
-    if (openSensor != null) {
-    	def result = true
-   		if (starting && ending) {
-   			def currTime = now()
-   			def start = timeToday(starting).time
-   			def stop = timeToday(ending).time
-   			result = start < stop ? currTime >= start && currTime <= stop : currTime <= stop || currTime >= start
-   		}
- 		log.trace "timeOk = $result"
-    	if ( result ) { 
-			log.debug "At least one sensor (${openSensor.label}) is open, play track $toneTrack"
-    	    toneDevice.playTrack(toneTrack)
-			log.debug( "OnHandler: timeOK and dimSetting: $dimSetting" )
-	    } else {
-    		log.debug( "OnHandler: !timeOK" )
-		}
-    } else {
-    	log.debug "No sensors are open."
-    }
-}