Merge pull request #1488 from SmartThingsCommunity/staging

Rolling up to production for deploy

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -120,6 +120,15 @@ def configure() {
 	return cmd
 }
 
+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }

devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy

@@ -109,6 +109,15 @@ def configure() {
 	return cmds
 }
 
+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }

devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy

@@ -183,6 +183,15 @@ def updateState(String name, String value) {
 	device.updateDataValue(name, value)
 }
 
+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 3)
 }

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

@@ -57,6 +57,7 @@ def parse(String description) {
 
 private Map parseBasicMessage(description) {
 	def name = parseName(description)
+	def results = [:]
 	if (name != null) {
 		def value = parseValue(description)
 		def linkText = getLinkText(device)
@@ -64,7 +65,7 @@ private Map parseBasicMessage(description) {
 		def handlerName = value
 		def isStateChange = isStateChange(device, name, value)
 
-		def results = [
+		results = [
 				name           : name,
 				value          : value,
 				linkText       : linkText,
@@ -73,8 +74,6 @@ private Map parseBasicMessage(description) {
 				isStateChange  : isStateChange,
 				displayed      : displayed(description, isStateChange)
 		]
-	} else {
-		results = [:]
 	}
 	log.debug "Parse returned $results.descriptionText"
 	return results

devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy

@@ -126,6 +126,15 @@ private hold(button) {
 	sendEvent(name: "button", value: "held", data: [buttonNumber: button], descriptionText: "$device.displayName button $button was held", isStateChange: true)
 }
 
+
+def installed() {
+	initialize()
+}
+
 def updated() {
+	initialize()
+}
+
+def initialize() {
 	sendEvent(name: "numberOfButtons", value: 4)
 }

smartapps/electricview/switch-sync.src/switch-sync.groovy

@@ -1,91 +0,0 @@
-/**
- *  Switch Sync
- *
- *  Copyright 2016 Kelly Kristek
- *
- *  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.
- *
- */
-definition(
-    name: "Switch Sync",
-    namespace: "Electricview",
-    author: "Kelly Kristek",
-    description: "This is an app that attempts to keep your virtual 3 way switches in sync regardless of where they are iniated from.\r\n",
-    category: "Convenience",
-    iconUrl: "http://i230.photobucket.com/albums/ee70/pickyassgamer/switchsyncsmall.png",
-    iconX2Url: "http://i230.photobucket.com/albums/ee70/pickyassgamer/switchsyncmedium.png",
-    iconX3Url: "http://i230.photobucket.com/albums/ee70/pickyassgamer/switchsync.png")
-
-
-preferences {
-	section("Select Mains Switch") {
-		input "firstswitch", "capability.switch", required: true
-	}
-    section("Select AUX switch") {
-    	input "secondswitch", "capability.switch", required: true
-        }
-}
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	subscribe(firstswitch, "switch.on", firstswitchon)
-    subscribe(firstswitch, "switch.off", firstswitchoff)
-    subscribe(secondswitch,"switch.on", secondswitchon)
-    subscribe(secondswitch,"switch.off", secondswitchoff)
-}
-def firstswitchon(evt){
-	log.debug "FirstSwitchOn called: $evt"
-    
-    // Adding an if statement to verify the switch isn't already in the position we desire, to avoid endless loops
-    if( "off" == secondswitch.currentSwitch) { 
-        secondswitch.on()
-    }
-}
-
-def firstswitchoff(evt){
-	log.debug "FirstSwitchOff called: $evt"
-    
-    // Adding an if statement to verify the switch isn't already in the position we desire, to avoid endless loops
-    if ( "on" == secondswitch.currentSwitch){
-    secondswitch.off()
-    }
-}
-
-def secondswitchon(evt){
-	log.debug "SecondSwitchOn called: $evt"
-    
-    // Adding an if statement to verify the switch isn't already in the position we desire, to avoid endless loops
-    if ( "off" == firstswitch.currentSwitch){
-    firstswitch.on()
-    }
-}
-
-def secondswitchoff(evt){
-	log.debug "SecondSwitchOff called: $evt"
-    
-    // Adding an if statement to verify the switch isn't already in the position we desire, to avoid endless loops
-    if ( "on" == firstswitch.currentSwitch){
-    firstswitch.off()
-    }
-}
-
-// TODO: implement event handlers