Merge latest upstream

.githooks/pre-commit

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+ERROR_COUNT=0
+while IFS= read -r DTH; do
+  echo "Verifying $DTH"
+  ERRORS=$(groovyc $DTH 2>&1 | grep ".groovy:")
+  # echo $ERRORS
+  IMPORTANT_ERRORS=$(echo $ERRORS | grep -v "unable")
+  if [[ ${#IMPORTANT_ERRORS} -eq 0 ]]; then
+    echo "No disqualifying compilation errors found"
+  else
+    echo "$DTH failed to compile, run groovyc on your source file for the full error: $ERRORS"
+    ERROR_COUNT=$((ERROR_COUNT + 1))
+  fi
+  echo "======================================================================="
+done < <(git diff --cached --name-only | grep .*.groovy)
+
+if [[ $ERROR_COUNT -gt 0 ]]; then
+  echo "rejected" && exit 1
+else
+  exit 0
+fi

build.gradle

@@ -138,3 +138,17 @@ slackSendMessage {
         text: messageText
     )
 }
+
+task configure(type: Exec) {
+    description "Configures automatic spaces->tabs conversion on merge and a commit hook to detect syntax errors"
+    File attributeFile = new File("${projectDir}/.git/info/attributes")
+    attributeFile.write("*.groovy filter=tabspace\n")
+    commandLine "git", "config", "filter.tabspace.clean", "unexpand -t 2"
+    commandLine "git", "config", "core.hooksPath", ".githooks"
+}
+
+task unconfigure(type: Exec) {
+    description "Undoes configuration put in place by configure"
+    commandLine "git", "config", "--unset-all", "filter.tabspace.clean"
+    commandLine "git", "config", "core.hooksPath", "${projectDir}/.git/hooks"
+}

devicetypes/axis/axis-gear-st.src/axis-gear-st.groovy

@@ -1,5 +1,7 @@
+import groovy.json.JsonOutput
+
 metadata {
-	definition (name: "AXIS Gear ST", namespace: "axis", author: "AXIS Labs", ocfDeviceType: "oic.d.blind", vid: "generic-shade-2") {  
+	definition (name: "AXIS Gear ST", namespace: "axis", author: "AXIS Labs", ocfDeviceType: "oic.d.blind", vid: "generic-shade-3") {  
 		capability "Window Shade"
 		capability "Window Shade Preset"
 		capability "Switch Level"
@@ -20,9 +22,9 @@ metadata {
 		command "stop"
 		command "getversion"
 
-		fingerprint profileID: "0104", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Gear"
-		fingerprint profileId: "0104", deviceId: "0202", inClusters: "0000, 0003, 0006, 0008, 0102, 0020, 0001", outClusters: "0019", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Gear"
-		fingerprint endpointID: "01, C4", profileId: "0104, C25D", deviceId: "0202", inClusters: "0000, 0003, 0006, 0008, 0102, 0020, 0001", outClusters: "0019", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Gear"
+		fingerprint profileID: "0104", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Window Treatment" //AXIS Gear
+		fingerprint profileId: "0104", deviceId: "0202", inClusters: "0000, 0003, 0006, 0008, 0102, 0020, 0001", outClusters: "0019", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Window Treatment" //AXIS Gear
+		fingerprint endpointID: "01, C4", profileId: "0104, C25D", deviceId: "0202", inClusters: "0000, 0003, 0006, 0008, 0102, 0020, 0001", outClusters: "0019", manufacturer: "AXIS", model: "Gear", deviceJoinName: "AXIS Window Treatment" //AXIS Gear
 
 		//ClusterIDs: 0000 - Basic; 0006 - On/Off; 0008 - Level Control; 0102 - Window Covering;
 		//Updated 2017-06-21
@@ -32,6 +34,7 @@ metadata {
 		//Updated 2018-11-01 - added in configure reporting for refresh button, close when press on partial shade icon, update handler to parse between 0-254 as a percentage
 		//Updated 2019-06-03 - modified to use Window Covering Cluster Commands and versioning tile and backwards compatibility (firmware and app), fingerprinting enabled
 		//Updated 2019-08-09 - minor changes and improvements, onoff state reporting fixed
+		//Updated 2019-11-11 - minor changes
 	}
 
 	tiles(scale: 2) {
@@ -81,7 +84,7 @@ metadata {
 			state "default", label: "Preset", action:"presetPosition", icon:"st.Home.home2"
 		}
 		preferences {
-			input "preset", "number", title: "Preset percentage (1-100) [Default - 50%]", defaultValue: 50, required: false, displayDuringSetup: true, range:"(1..100)"
+			input "preset", "number", title: "Preset position", description: "Set the window shade preset position", defaultValue: 50, required: false, displayDuringSetup: true, range:"1..100"
 		}
 
 		main(["main"])
@@ -166,6 +169,10 @@ def stop() {
 	}
 }
 
+def pause() {
+	stop()
+}
+
 //Send Command through setLevel()
 def on() {
 	log.info "on()"
@@ -302,6 +309,7 @@ def configure() {
 	sendEvent(name: "windowShade", value: "unknown")
 	log.debug "Configuring Reporting and Bindings."
 	sendEvent(name: "checkInterval", value: (2 * 60 * 60 + 10 * 60), displayed: true, data: [protocol: "zigbee", hubHardwareId: device.hub.hardwareID])
+	sendEvent(name: "supportedWindowShadeCommands", value: JsonOutput.toJson(["open", "close", "pause"]), displayed: false)
 
 	def attrs_refresh = zigbee.readAttribute(CLUSTER_BASIC, BASIC_ATTR_SWBUILDID) +
 						zigbee.readAttribute(CLUSTER_WINDOWCOVERING, WINDOWCOVERING_ATTR_LIFTPERCENTAGE) +
@@ -408,4 +416,4 @@ private Map parseReportAttributeMessage(String description) {
 		log.debug "parseReportAttributeMessage() --- ignoring attribute"
 	}
 	return resultMap
-}
+}

devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy

@@ -18,7 +18,7 @@ metadata {
 		capability "Refresh"
 		capability "Health Check"
 
-		fingerprint mfr: "001E", prod: "0004", model: "0001"
+		fingerprint mfr: "001E", prod: "0004", model: "0001", deviceJoinName: "EZmultiPli Multipurpose Sensor"
 	}
 
 	simulator {
@@ -135,6 +135,8 @@ def setupHealthCheck() {
 def installed() {
 	sendEvent(name: "motion", value: "inactive", displayed: false)
 	state.colorReceived = [red: null, green: null, blue: null]
+	state.setColor = [red: null, green: null, blue: null]
+	state.colorQueryFailures = 0
 	setupHealthCheck()
 }
 
@@ -247,15 +249,30 @@ def zwaveEvent(switchcolorv3.SwitchColorReport cmd) {
 		result << createEvent(name: "color", value: hexColor)
 		// Send the color as hue and saturation
 		def hsv = rgbToHSV(*colors)
-		result << createEvent(name: "hue", value: hsv.hue)
-		result << createEvent(name: "saturation", value: hsv.saturation)
-		// Reset the values
-		RGB_NAMES.collect { state.colorReceived[it] = null}
+		if (state.setColor.red == state.colorReceived.red && state.setColor.green == state.colorReceived.green && state.setColor.blue == state.colorReceived.blue) {
+			unschedule()
+			result << createEvent(name: "hue", value: hsv.hue)
+			result << createEvent(name: "saturation", value: hsv.saturation)
+			state.colorQueryFailures = 0
+		} else {
+			if (++state.colorQueryFailures >= 6) {
+				sendHubCommand(commands([
+						zwave.switchColorV3.switchColorSet(red: state.setColor.red, green: state.setColor.green, blue: state.setColor.blue),
+						queryAllColors()
+				]))
+			} else {
+				runIn(2, "sendColorQueryCommands", [overwrite: true])
+			}
+		}
 	}
 
 	result
 }
 
+private sendColorQueryCommands() {
+	sendHubCommand(commands(queryAllColors()))
+}
+
 def zwaveEvent(physicalgraph.zwave.Command cmd) {
 	// Handles all Z-Wave commands we aren't interested in
 	log.debug "Unhandled $cmd"
@@ -324,6 +341,7 @@ def setColor(value) {
 		return
 	}
 
+	state.setColor = [red: myred, green: mygreen, blue: myblue]
 	cmds << zwave.switchColorV3.switchColorSet(red: myred, green: mygreen, blue: myblue)
 	cmds << zwave.basicV1.basicGet()
 
@@ -391,7 +409,7 @@ private crcEncap(physicalgraph.zwave.Command cmd) {
 private command(physicalgraph.zwave.Command cmd) {
 	if (zwaveInfo.zw.contains("s")) {
 		secEncap(cmd)
-	} else if (zwaveInfo.cc.contains("56")) {
+	} else if (zwaveInfo?.cc?.contains("56")) {
 		crcEncap(cmd)
 	} else {
 		cmd.format()