MSA-1677: Not sure what to put here...

Merge pull request #1545 from pchomal/dimmerswitch_generic
[CHF-477] Health Check for Z-Wave Dimmer Switch Generic
2026-03-09 05:11:52 +00:00 · 2016-12-28 08:54:33 -08:00 · 2016-12-27 11:36:51 -08:00 · 2016-12-20 10:39:08 +05:30 · 2016-12-07 14:15:16 -08:00 · 2016-12-07 12:10:01 -08:00
19 changed files with 696 additions and 31 deletions
--- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy
+++ b/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)
 }
--- a/devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy
+++ b/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)
 }
--- a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy
+++ b/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)
 }
--- a/devicetypes/smartthings/life360-user.src/life360-user.groovy
+++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy
@@ -39,7 +39,7 @@ metadata {
 }

 def generatePresenceEvent(boolean present) {
-	log.debug "Here in generatePresenceEvent!"
+	log.info "Life360 generatePresenceEvent($present)"
 	def value = formatValue(present)
 	def linkText = getLinkText(device)
 	def descriptionText = formatDescriptionText(linkText, present)
--- a/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy
@@ -128,7 +128,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy
@@ -132,7 +132,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-motion.src/smartsense-motion.groovy
+++ b/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
--- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy
@@ -161,7 +161,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if(cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
@@ -339,7 +339,7 @@ private Map getContactResult(value) {
 	log.debug "Contact: ${device.displayName} value = ${value}"
 	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)
+	return [name: 'status', value: value, descriptionText: descriptionText, translatable: true]
 }

 private getAccelerationResult(numValue) {
--- 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
@@ -119,7 +119,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07){
 					if (cluster.data[0] == 0x00) {
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
+++ b/devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy
@@ -103,7 +103,7 @@ private Map parseCatchAllMessage(String description) {
 				if (cluster.command == 0x07) {
 					if (cluster.data[0] == 0x00){
 						log.debug "TEMP REPORTING CONFIG RESPONSE" + cluster
-						sendEvent(name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+						resultMap = [name: "checkInterval", value: 60 * 12, displayed: false, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID]]
 					}
 					else {
 						log.warn "TEMP REPORTING CONFIG FAILED- error code:${cluster.data[0]}"
--- a/devicetypes/smartthings/testing/simulated-minimote.src/simulated-minimote.groovy
+++ b/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)
 }
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -23,9 +23,11 @@ metadata {


        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart BR30 Soft White"
    }

    tiles(scale: 2) {
--- a/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy
@@ -28,8 +28,8 @@ metadata {
 		capability "Switch Level"
 		capability "Health Check"

-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
-		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "OSRAM LIGHTIFY Gardenspot mini RGB"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
+		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Gardenspot RGB", deviceJoinName: "SYLVANIA Smart Gardenspot mini RGB"
 	}

 	// UI tile definitions
--- a/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-rgbw-bulb.src/zigbee-rgbw-bulb.groovy
@@ -32,11 +32,12 @@ metadata {
        attribute "colorName", "string"
        command "setGenericName"

-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY LED FLEXIBLE STRIP RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "OSRAM LIGHTIFY LED A19 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "OSRAM LIGHTIFY LED BR30 RGBW"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "OSRAM LIGHTIFY LED RT 5/6 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY Flex RGBW", deviceJoinName: "SYLVANIA Smart Flex RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Flex RGBW", deviceJoinName: "OSRAM LIGHTIFY Flex RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 RGBW", deviceJoinName: "SYLVANIA Smart A19 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR RGBW", deviceJoinName: "SYLVANIA Smart BR30 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT RGBW", deviceJoinName: "SYLVANIA Smart RT5/6 RGBW"
+        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,0300,0B04,FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY FLEX OUTDOOR RGBW", deviceJoinName: "SYLVANIA Smart Outdoor RGBW Flex"
    }

    // UI tile definitions
--- a/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
+++ b/devicetypes/smartthings/zigbee-white-color-temperature-bulb.src/zigbee-white-color-temperature-bulb.groovy
@@ -32,10 +32,10 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300", outClusters: "0019"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04", outClusters: "0019"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Flood BR30 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Recessed Kit RT 5/6 Tunable White"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
-        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "OSRAM LIGHTIFY LED Tunable White 60W"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY BR Tunable White", deviceJoinName: "SYLVANIA Smart BR30 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY RT Tunable White", deviceJoinName: "SYLVANIA Smart RT5/6 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 TW", deviceJoinName: "OSRAM LIGHTIFY LED Classic A60 Tunable White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 Tunable White", deviceJoinName: "SYLVANIA Smart A19 Tunable White"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic B40 TW - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY Classic B40 Tunable White"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0300, 0702, 0B05", outClusters: "0019", manufacturer: "sengled", model: "Z01-A19NAE26", deviceJoinName: "Sengled Element plus"
    }
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -127,8 +127,8 @@ def configureHealthCheck() {

 def configure() {
    log.debug "configure()"
-    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
    configureHealthCheck()
+    zigbee.onOffConfig() + zigbee.levelConfig() + zigbee.onOffRefresh() + zigbee.levelRefresh()
 }

 def updated() {
--- a/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
+++ b/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy
@@ -24,6 +24,10 @@ 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 {
--- a/smartapps/bravenel/rule-machine.src/rule-machine.groovy
+++ b/smartapps/bravenel/rule-machine.src/rule-machine.groovy
@@ -0,0 +1,623 @@
+/**
+ *  Rule Machine
+ *
+ *  Copyright 2015 Bruce Ravenel and Mike Maxwell
+ *
+ *  Version 1.6.5   1 Jan 2016
+ *
+ *	Version History
+ *
+ *	1.6.5	1 Jan 2016		Added version numbers to main page
+ *	1.6.4	30 Dec 2015		Multi-commands
+ *	1.6.3	26 Dec 2015		UI improvements and icon per Michael Struck
+ *	1.6.2	25 Dec 2015		null parameter value patch in expert, maxwell
+ *	1.6.1	24 Dec 2015		UI improvement
+ *	1.6	23 Dec 2015		Added expert commands per Mike Maxwell
+ *
+ *  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: "Rule Machine",
+	singleInstance: true,
+	namespace: "bravenel",
+	author: "Bruce Ravenel and Mike Maxwell",
+	description: "Rule Machine",
+	category: "My Apps",
+	iconUrl: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine.png",
+	iconX2Url: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine%402x.png",
+	iconX3Url: "https://raw.githubusercontent.com/bravenel/Rule-Trigger/master/smartapps/bravenel/RuleMachine%402x.png"
+)
+
+preferences {
+	page(name: "mainPage")
+	page(name: "removePage")
+	//expert pages
+	page(name: "expert")
+	page(name: "generalApprovalPAGE")
+	page(name: "customCommandsPAGE")
+	page(name: "addCustomCommandPAGE")
+	page(name: "customParamsPAGE")
+}
+
+def mainPage() {
+    dynamicPage(name: "mainPage", title: "Installed Rules", install: true, uninstall: false, submitOnChange: true) {
+    	if(!state.setup) initialize(true)
+        section {
+            app(name: "childRules", appName: "Rule", namespace: "bravenel", title: "Create New Rule...", multiple: true)
+        }
+	section ("Expert Features") {
+		href( "expert", title: "", description: "Tap to create custom commands", state: "")
+        }
+        section ("Remove Rule Machine"){
+        	href "removePage", description: "Tap to remove Rule Machine ", title: ""
+        }
+        if(state.ver) section ("Version 1.6.5/" + state.ver) { }
+    }
+}
+
+def removePage() {
+	dynamicPage(name: "removePage", title: "Remove Rule Machine And All Rules", install: false, uninstall: true) {
+    	section ("WARNING!\n\nRemoving Rule Machine also removes all Rules\n") {
+        }
+    }
+}
+
+def installed() {
+    if(!state.setup) initialize(true) else initialize(false)
+}
+
+def updated() {
+    initialize(false)
+}
+
+def initialize(first) {
+	if(first) {
+		state.ruleState = [:]
+    		state.ruleSubscribers = [:]
+	}
+	childApps.each {child ->
+		if(child.name == "Rule") {
+			log.info "Installed Rules and Triggers: ${child.label}"
+			if(first) {
+				state.ruleState[child.label] = null
+				state.ruleSubscribers[child.label] = [:]
+			}
+		} 
+	}
+	state.setup = true
+}
+
+def ruleList(appLabel) {
+	def result = []
+	childApps.each { child ->
+		if(child.name == "Rule" && child.label != appLabel && state.ruleState[child.label] != null) result << child.label
+	}
+	return result
+}
+
+def subscribeRule(appLabel, ruleName, ruleTruth, childMethod) {
+//	log.debug "subscribe: $appLabel, $ruleName, $ruleTruth, $childMethod"
+	ruleName.each {name ->
+    	state.ruleSubscribers[name].each {if(it == appLabel) return}
+        if(state.ruleSubscribers[name] == null) state.ruleSubscribers[name] = ["$appLabel":ruleTruth]
+    	else state.ruleSubscribers[name] << ["$appLabel":ruleTruth]
+    }
+}
+
+def setRuleTruth(appLabel, ruleTruth) {
+//	log.debug "setRuleTruth1: $appLabel, $ruleTruth"
+	state.ruleState[appLabel] = ruleTruth
+	def thisList = state.ruleSubscribers[appLabel]
+	thisList.each {
+		if(it.value == null || "$it.value" == "$ruleTruth") {
+			childApps.each { child ->
+				if(child.label == it.key) child.ruleHandler(appLabel, ruleTruth)
+			}
+		}
+	}
+}
+
+def currentRule(appLabel) {
+//	log.debug "currentRule: $appLabel, ${state.ruleState[appLabel]}"
+	def result = state.ruleState[appLabel]
+}
+
+def childUninstalled() {
+//	log.debug "childUninstalled called"
+}
+
+def removeChild(appLabel) {
+//	log.debug "removeChild: $appLabel"
+	unSubscribeRule(appLabel)
+	if(state.ruleState[appLabel] != null) state.ruleState.remove(appLabel)
+	if(state.ruleSubscribers[appLabel] != null) state.ruleSubscribers.remove(appLabel)
+}
+
+def unSubscribeRule(appLabel) {
+//	log.debug "unSubscribeRule: $appLabel"
+	state.ruleSubscribers.each { rule ->
+        def newList = [:]
+        rule.value.each {list ->
+        	if(list.key != appLabel) newList << list
+        }
+        rule.value = newList
+    }
+}
+
+def runRule(rule, appLabel) {
+//	log.debug "runRule: $rule, $appLabel"
+	childApps.each { child ->
+		rule.each {
+			if(child.label == it) child.ruleEvaluator(appLabel)
+		}
+	}
+}
+
+/*****custom command specific pages	*****/
+def expert(){
+	dynamicPage(name: "expert", title: "Expert Features", uninstall: false, install: false) {
+		section(){
+			paragraph "${expertText()}"
+			//expert hrefs...
+			href( "customCommandsPAGE"
+				,title		: "Configure Custom Commands..."
+				,description: ""
+				,state		: anyCustom()
+			)
+		}
+	}
+}
+
+def generalApprovalPAGE(params){
+	def title = params.title
+	def method = params.method
+	def result
+	dynamicPage(name: "generalApprovalPAGE", title: title ){
+		section() {
+			if (method) {
+				result = app."${method}"()
+				paragraph "${result}"
+			}
+		}
+	}
+}
+
+def customCommandsPAGE() {
+	if (!state.lastCmdIDX) state.lastCmdIDX = 0
+	def savedCommands = getCommands()
+	dynamicPage(name: "customCommandsPAGE", title: "Custom Commands", uninstall: false, install: false) {
+		section(){
+			input(
+				name			: "devices"
+				,title			: "Test device"
+				,multiple		: false
+				,required		: false
+				,type			: "capability.actuator"
+				,submitOnChange	: true
+			)
+			if (settings.devices && savedCommands.size() != 0){
+				input(
+					name			: "testCmd"
+					,title			: "Select saved command to test"
+					,multiple		: false
+					,required		: false
+					,type			: "enum"
+					,options		: savedCommands
+					,submitOnChange	: true
+				)
+			}
+		}
+		def result = execCommand(settings.testCmd)
+		if (result) {
+			section("${result}"){
+			}
+		}
+		section(){
+		if (devices){
+				href( "addCustomCommandPAGE"
+					,title		: "New custom command..."
+					,description: ""
+					,state		: null
+				)
+			}
+        }
+		if (getCommands()){
+			section(){
+				input(
+					name			: "deleteCmds"
+					,title			: "Delete custom commands..."
+					,multiple		: true
+					,required		: false
+                    ,description	: ""
+					,type			: "enum"
+					,options		: getCommands()
+					,submitOnChange	: true
+				)
+				if (isValidCommand(deleteCmds)){
+					href( "generalApprovalPAGE"
+						,title			: "Delete command(s) now"
+						,description	: ""
+						,state			: null
+						,params			: [method:"deleteCommands",title:"Delete Command"]
+						,submitOnChange	: true
+					)
+				}
+			}
+		}
+	}
+}
+
+def addCustomCommandPAGE(){
+	def cmdLabel = getCmdLabel()
+	def complete = "" 
+	def test = false
+	def pageTitle = "Create new custom command for:\n${devices}" 
+	if (cmdLabel){
+		complete = "complete"
+		test = true
+	}
+	dynamicPage(name: "addCustomCommandPAGE", title: pageTitle, uninstall: false, install: false) {
+		section(){
+			input(
+		   		name			: "cCmd"
+				,title			: "Available device commands"
+				,multiple		: false
+				,required		: false
+				,type			: "enum"
+				,options		: getDeviceCommands()
+				,submitOnChange	: true
+			)
+			href( "customParamsPAGE"
+				,title: "Parameters"
+				,description: parameterLabel()
+				,state: null
+			)
+		}
+		if (test){
+			def result = execTestCommand()
+			section("Configured command: ${cmdLabel}\n${result}"){
+				if (result == "succeeded"){
+					if (!commandExists(cmdLabel)){
+						href( "generalApprovalPAGE"
+							,title		: "Save command now"
+							,description: ""
+							,state		: null
+							,params		: [method:"addCommand",title:"Add Command"]
+						)
+					}
+				} 
+			}
+		}
+	}
+}
+
+def customParamsPAGE(p){
+	def ct = settings.findAll{it.key.startsWith("cpType_")}
+	state.howManyP = ct.size() + 1
+	def howMany = state.howManyP
+	dynamicPage(name: "customParamsPAGE", title: "Select parameters", uninstall: false) {
+		if(howMany) {
+			for (int i = 1; i <= howMany; i++) {
+				def thisParam = "cpType_" + i
+				def myParam = ct.find {it.key == thisParam}
+				section("Parameter #${i}") {
+					getParamType(thisParam, i != howMany)
+					if(myParam) {
+						def pType = myParam.value
+						getPvalue(pType, i)
+					}
+				}
+			}
+		}
+	}
+}
+
+/***** child specific methods *****/
+
+def getCommandMap(cmdID){
+	return state.customCommands["${cmdID}"]
+}
+
+
+/***** local custom command specific methods *****/
+def anyCustom(){
+	def result = null
+	if (getCommands()) result = "complete"
+	return result
+}
+
+def getParamType(myParam,isLast){  
+	def myOptions = ["string", "number", "decimal"]
+	def result = input (
+					name			: myParam
+					,type			: "enum"
+					,title			: "parameter type"
+					,required		: isLast
+					,options		: myOptions
+					,submitOnChange	: true
+				)
+	return result
+}
+
+def getPvalue(myPtype, n){
+	def myVal = "cpVal_" + n
+	def result = null
+	if (myPtype == "string"){
+		result = input(
+					name		: myVal
+					,title		: "string value"
+					,type		: "text"
+					,required	: false
+				)
+	} else if (myPtype == "number"){
+		result = input(
+					name		: myVal
+					,title		: "integer value"
+					,type		: "number"
+					,required	: false
+				)
+	} else if (myPtype == "decimal"){
+		result = input(
+					name		: myVal
+					,title		: "decimal value"
+					,type		: "decimal"
+					,required	: false
+				)
+	}
+	return result
+}
+
+def getCmdLabel(){
+	def cmd
+	if (settings.cCmd) cmd = settings.cCmd.value
+	def cpTypes = settings.findAll{it.key.startsWith("cpType_")}.sort()
+	def result = null
+	if (cmd) {
+		result = "${cmd}("
+		if (cpTypes.size() == 0){
+			result = result + ")"
+		} else {
+        	def r = getParams(cpTypes)
+            if (r == "") result = r
+            else result = "${result}${r})"
+		}
+	}
+	return result
+}
+
+def getParams(cpTypes){
+	def result = ""
+	def cpValue
+	def badParam = false
+	cpTypes.each{ cpType ->
+		def i = cpType.key.replaceAll("cpType_","")
+		def cpVal = settings.find{it.key == "cpVal_${i}"}
+		if (cpVal){
+			cpValue = cpVal.value
+			if (cpType.value == "string"){
+				result = result + "'${cpValue}'," 
+			} else {
+				if (cpValue.isNumber()){
+					result = result + "${cpValue}," 
+				} else {
+					result = result + "[${cpValue}]: is not a number,"
+				}
+			}
+		} else {
+			badParam = true
+		}
+	}
+	if (badParam) result = ""
+	else result = result[0..-2]   
+	return result
+}
+
+def parameterLabel(){
+	def howMany = (state.howManyP ?: 1) - 1
+	def result = ""
+	if (howMany) {
+		for (int i = 1; i <= howMany; i++) {
+			result = result + parameterLabelN(i) + "\n"
+		}
+		result = result[0..-2]
+	}
+	return result
+}
+
+def parameterLabelN(i){
+	def result = ""
+	def cpType = settings.find{it.key == "cpType_${i}"}
+	def cpVal = settings.find{it.key == "cpVal_${i}"}
+	def cpValue
+	if (cpVal) cpValue = cpVal.value
+	else cpValue = "missing value"
+	if (cpType){
+		result = "p${i} - type:${cpType.value}, value:${cpValue}"
+	} 
+	return result
+}
+
+def getParamsAsList(cpTypes){
+	def result = []
+	cpTypes.each{ cpType ->
+		def i = cpType.key.replaceAll("cpType_","")
+		def cpVal = settings.find{it.key == "cpVal_${i}"}
+		if (cpVal){
+			if (cpType.value == "string"){
+				result << "${cpVal.value}" 
+			} else if (cpType.value == "decimal"){
+				result << cpVal.value.toBigDecimal()
+			} else {
+				result << cpVal.value.toInteger() 
+			}
+		} else {
+        	result << "missing value"
+        }
+	}
+	return result
+}
+
+def getCommands(){
+	def result = [] 
+	def cmdMaps = state.customCommands ?: []
+	cmdMaps.each{ cmd ->
+		def option = [(cmd.key):(cmd.value.text)]
+		result.push(option)
+	}
+	return result
+}
+
+def isValidCommand(cmdIDS){
+	def result = false
+	cmdIDS.each{ cmdID ->
+		def cmd = state.customCommands["${cmdID}"]
+		if (cmd) result = true
+	}
+	return result
+}
+
+def deleteCommands(){
+	def result
+	def cmdMaps = state.customCommands
+	if (deleteCmds.size == 1) result = "Command removed"
+	else result = "Commands removed"
+	deleteCmds.each{ it -> 
+		cmdMaps.remove(it)
+	}
+	return result
+}
+def commandExists(cmd){
+	def result = false
+	if (state.customCommands){
+		result = state.customCommands.find{ it.value.text == "${cmd}" }
+	}
+	return result
+}
+def addCommand(){
+	def result
+	def newCmd = getCmdLabel()
+	def found = commandExists(newCmd)
+	def cmdMaps = state.customCommands
+	//only update if not found...
+	if (!found) {
+		state.lastCmdIDX = state.lastCmdIDX + 1
+		def nextIDX = state.lastCmdIDX
+		def cmd = [text:"${newCmd}",cmd:"${cCmd}"]
+		def params = [:]
+		def cpTypes = settings.findAll{it.key.startsWith("cpType_")}.sort()
+		cpTypes.each{ cpType ->
+			def i = cpType.key.replaceAll("cpType_","")
+			def cpVal = settings.find{it.key == "cpVal_${i}"}
+			def param = ["type":"${cpType.value}","value":"${cpVal.value}"]
+			params.put(i, param)
+		}	
+		cmd.put("params",params)
+		if (cmdMaps) cmdMaps.put((nextIDX),cmd)
+		else state.customCommands = [(nextIDX):cmd]
+		result = "command: ${newCmd} was added"
+	} else {
+		result = "command: ${newCmd} was not added, it already exists."
+	}
+	return result
+}
+
+def execTestCommand(){
+	def result
+	def cTypes = settings.findAll{it.key.startsWith("cpType_")}
+	def p = getParamsAsList(cTypes.sort()) as Object[]
+	devices.each { device ->
+		try {
+			device."${cCmd}"(p)
+			result = "succeeded"
+		}
+		catch (IllegalArgumentException e){
+			def em = e as String
+			def ems = em.split(":")
+			ems = ems[2].replace(" [","").replace("]","")
+			ems = ems.replaceAll(", ","\n")
+			result = "failed, valid commands:\n${ems}"
+		}
+		catch (e){
+			result = "failed with:\n${e}"
+		}
+	}
+	return result
+}
+
+def execCommand(cmdID){
+	def result = ""
+	def pList = []
+	if (cmdID){
+		def cmdMap = state.customCommands["${cmdID}"] 
+		if (testCmd && cmdMap) {
+        	def params = cmdMap.params.sort()
+			params.each{ p ->
+				if (p.value.type == "string"){
+					pList << "${p.value.value}"
+       			} else if (p.value.type == "decimal"){
+		   			pList << p.value.value.toBigDecimal()
+				} else {
+					pList << p.value.value.toInteger()
+				}
+			}
+			def p = pList as Object[]
+			devices.each { device ->
+				try {
+					device."${cmdMap.cmd}"(p)
+					result = "Command succeeded"
+				}
+				catch (IllegalArgumentException e){
+					def em = e as String
+					def ems = em.split(":")
+					ems = ems[2].replace(" [","").replace("]","")
+					ems = ems.replaceAll(", ","\n")
+					result = "Command failed, valid commands:\n${ems}"
+				}
+				catch (e){
+					result = "failed with:\n${e}"
+				}
+			}
+			return result
+		}
+	}
+}
+
+def getDeviceCommands(){
+	def result = ""
+	devices.each { device ->
+		try {
+			device."xxx"()
+			result = "Command succeeded"
+		}
+		catch (IllegalArgumentException e){
+			def em = e as String
+			def ems = em.split(":")
+			ems = ems[2].replace(" [","").replace("]","")
+			result = ems.split(", ").collect{it as String}
+		}
+	}
+	return result
+}
+
+def isExpert(ver){
+	state.ver = ver
+	return getCommands().size() > 0
+}
+
+def expertText() {
+	def text = 
+		"Custom commands allows Rule Machine to control devices with custom capabilities. " +
+		"This includes dual dimmers and switches, ThingShields, FGBW controllers or any device you might build a " +
+		"custom SmartApp to utilize.\n\nCustom commands that are created and saved here will become available for use " +
+		"in any new or existing rules.\n\nAfter saving at least one command, look for 'Run custom device command' in your " + 
+		"'Select Actions' sections."
+}
--- a/smartapps/smartthings/life360-connect.src/life360-connect.groovy
+++ b/smartapps/smartthings/life360-connect.src/life360-connect.groovy
@@ -289,12 +289,12 @@ def initializeLife360Connection() {
       		state.life360AccessToken = result.data.access_token
            return true;
   		}
-		log.debug "Response=${result.data}"
+		log.info "Life360 initializeLife360Connection, response=${result.data}"
        return false;
        
    }
    catch (e) {
-       log.debug e
+       log.error "Life360 initializeLife360Connection, error: $e"
       return false;
    }

@@ -656,7 +656,7 @@ def generateInitialEvent (member, childDevice) {
    
    try { // we are going to just ignore any errors
    
-    	log.debug "Generate Initial Event for New Device for Member = ${member.id}"
+    	log.info "Life360 generateInitialEvent($member, $childDevice)"
        
        def place = state.places.find{it.id==settings.place}
        
@@ -677,6 +677,8 @@ def generateInitialEvent (member, childDevice) {
        	// log.debug "Distance Away = ${distanceAway}"
  
  			boolean isPresent = (distanceAway <= placeRadius)
+
+			log.info "Life360 generateInitialEvent, member: ($memberLatitude, $memberLongitude), place: ($placeLatitude, $placeLongitude), radius: $placeRadius, dist: $distanceAway, present: $isPresent"
                
        	// log.debug "External Id=${app.id}:${member.id}"
        
@@ -718,7 +720,7 @@ def haversine(lat1, lon1, lat2, lon2) {

 def placeEventHandler() {

-	log.debug "In placeEventHandler method."
+	log.info "Life360 placeEventHandler: params=$params, settings.place=$settings.place"

 	// the POST to this end-point will look like:
    // POST http://test.com/webhook?circleId=XXXX&placeId=XXXX&userId=XXXX&direction=arrive
@@ -729,8 +731,6 @@ def placeEventHandler() {
    def direction = params?.direction
    def timestamp = params?.timestamp
    
-    log.debug "Life360 Event: Circle: ${circleId}, Place: ${placeId}, User: ${userId}, Direction: ${direction}"
-
    if (placeId == settings.place) {

 		def presenceState = (direction=="in")
@@ -745,10 +745,10 @@ def placeEventHandler() {

 		if (deviceWrapper) {
 			deviceWrapper.generatePresenceEvent(presenceState)
-    		log.debug "Event raised on child device: ${externalId}"
+    		log.debug "Life360 event raised on child device: ${externalId}"
 		}
   		else {
-    		log.debug "Couldn't find child device associated with inbound Life360 event."
+    		log.warn "Life360 couldn't find child device associated with inbound Life360 event."
    	}
    }
Author	SHA1	Message	Date
Matt Miskinnis	c1f91f42db	MSA-1677: Not sure what to put here...	2016-12-28 08:54:33 -08:00
Jack Chi	5b874e8f3a	Merge pull request #1545 from pchomal/dimmerswitch_generic [CHF-477] Health Check for Z-Wave Dimmer Switch Generic	2016-12-27 11:36:51 -08:00
piyush.c	5b1da30a47	[CHF-477] Health Check implementation for Z-Wave Dimmer Switch Generic with checkinterval of 32min	2016-12-20 10:39:08 +05:30
Vinay Rao	0a82077b24	Merge pull request #1519 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-12-07 14:15:16 -08:00
Vinay Rao	38ef9e5c77	Merge pull request #1517 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-12-07 12:10:01 -08:00
Vinay Rao	6a71615ca5	Merge pull request #1505 from varzac/sendevent-appengine-fix DPROT-215 Don't use sendEvent for AppEngine parse events	2016-12-02 11:39:24 -08:00
Zach Varberg	9939591005	Don't use sendEvent for AppEngine parse events With the changes made for https://smartthings.atlassian.net/browse/DPROT-200 there were a few DTHs that were using sendEvent to directly send events generated during parse. However, because using sendEvent didn't result in parse returning an event AppEngine would send the description up to the cloud DTH to be handled. In some cases this resulted in multiple events for the same device trigger. This resolves: https://smartthings.atlassian.net/browse/DPROT-215	2016-12-01 14:52:24 -06:00
Vinay Rao	d7f2bc1d79	Merge pull request #1502 from bflorian/PROB-1426-life360-logging PROB-1426 adding logging to Life360	2016-11-28 13:20:16 -08:00
bflorian	3c5d727d4c	PROB-1426 adding logging to Life360	2016-11-28 16:00:42 -05:00
Vinay Rao	bbad6dfa7a	Merge pull request #1501 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-11-28 10:35:24 -08:00
Vinay Rao	df6c815aa4	Merge pull request #1500 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-11-28 10:34:01 -08:00
Tom Manley	d16ac00eb6	Merge pull request #1493 from tpmanley/hotfix/zll-dimmer-join-failure zll-dimmer-bulb: Fix bug in configure preventing devices from joining	2016-11-23 23:30:08 -06:00
Tom Manley	1941f56007	zll-dimmer-bulb: Fix bug in configure preventing devices from joining The configureHealthCheck method and therefore the configure method was returning a boolean which was causing an exception during the initial join that would prevent the device from showing up to the user. https://smartthings.atlassian.net/browse/PROB-1428	2016-11-23 23:01:05 -06:00
Vinay Rao	f34df19a65	Merge pull request #1490 from SmartThingsCommunity/master Rolling up master to staging	2016-11-22 13:00:00 -08:00
Vinay Rao	af40246655	Merge pull request #1489 from SmartThingsCommunity/staging Rolling down staging hotfix to master	2016-11-22 12:59:05 -08:00
Vinay Rao	20239ca982	Merge pull request #1488 from SmartThingsCommunity/staging Rolling up to production for deploy	2016-11-22 12:43:20 -08:00
Vinay Rao	b20c0e371f	Merge pull request #1487 from SmartThingsCommunity/production Rolling down production hotfix to staging	2016-11-22 12:42:25 -08:00
Vinay Rao	60756e6dc6	Merge pull request #1478 from yafenzhang/MSA-1591-15 MSA-1591: New Device Handle for Osram Lightify Light(ZHA)	2016-11-21 09:26:08 -08:00
bflorian	ee2e1ee04f	Merge pull request #1483 from juano2310/staging DVCSMP-2211 - Update Button Number	2016-11-18 14:55:18 -08:00
juano2310	e443cb641c	DVCSMP-2211 - Update Button Number	2016-11-18 11:28:30 -05:00
Vinay Rao	b9993a9bf2	Merge pull request #1480 from SmartThingsCommunity/master Rolling up master to staging	2016-11-16 13:38:01 -08:00
Vinay Rao	a8ee927893	Merge pull request #1479 from varzac/fix-motion-sensor [DPROT-200] Fix broken generation of smartsense-motion events	2016-11-16 08:55:13 -08:00
Zach Varberg	51979f0030	Fix broken generation of smartsense-motion events When the change went out to allow messages to be passed up to the cloud the smartsense-motion DTH was broken with the changes for https://smartthings.atlassian.net/browse/DPROT-200	2016-11-16 10:44:48 -06:00
Zhang Yafen	61d1205e7d	MSA-1591: 1.New Device Handle for Osram Lightify Light(ZHA) (1) SYLVANIA Smart BR30 Softw White (2) SYLVANIA Smart PAR38 Softw White (3) SYLVANIA Smart Outdoor RGBW Flex 2. Modify deviceJoinName of NAFTA Lightify product, all the lightify product which use ZHA protocol will be named using "SYLVANIA Smart XXXX".	2016-11-16 19:57:46 +08:00
Vinay Rao	1dfd1818b4	Merge pull request #1471 from SmartThingsCommunity/master Rolling up master to staging	2016-11-15 14:05:57 -08:00
Vinay Rao	e5c21ef720	Merge pull request #1469 from SmartThingsCommunity/staging Rolling up staging for production deploy	2016-11-15 13:18:56 -08:00