Merge pull request SmartThingsCommunity#50822 from SmartThingsCommunity/acceptance

Rolling up acceptance to production for deploy

Author: greens

devicetypes/gs/gatorsystem-homewatcher.src/gatorsystem-homewatcher.groovy

@@ -0,0 +1,127 @@
+import physicalgraph.zigbee.clusters.iaszone.ZoneStatus
+metadata {
+	definition (name: "GatorSystem HomeWatcher", namespace: "GS", author: "GS_coder000") {
+	capability "Motion Sensor"
+	capability "Battery"
+	capability "Contact Sensor"
+	capability "Presence Sensor"   
+		
+	// Raw Description 08 0104 0402 00 02 0000 0500 01 0502
+	fingerprint manufacturer: "GatorSystem", model: "GSHW01", deviceJoinName: "GatorSystem Multipurpose Sensor"
+	}
+}
+
+def parse(String description) {
+	log.debug "${device.displayName} description: $description"
+	Map map = [:]
+	if (description?.startsWith('catchall:')) { //raw commands that smartthings does not or cannot interpret
+		map = zigbee.parseDescriptionAsMap(description)   
+	} else if (description?.startsWith('read attr -')) {
+		map = zigbee.parseDescriptionAsMap(description)
+	} else if (description?.startsWith('zone status')) {
+		map = parseIasMessage(description)
+	}
+	log.debug "Parse returned map $map"
+	if (map != null) {	
+		createEvent(map)
+	}
+}
+
+private Map parseIasMessage(String description) {
+	ZoneStatus zs = zigbee.parseZoneStatus(description)
+	Map resultMap = [:]
+	def oneMinute = 60
+	def twoMinutes = 120
+	def resultOccupied = '0x8000'
+	def resultOpenned = '0x4000'
+	def resultClosed = '0x2000'
+	def resultBatteryNew = '0x1000'
+	def resultBatteryOut = '0x0800'
+	if (zs.isAlarm1Set()) {
+		runIn(twoMinutes, stopMotion) 
+		resultMap = getMotionResult('active')  
+	} else if (zs.isBatterySet()) {
+		resultMap = getBatteryResult(10)
+	} else if (description.contains(resultOccupied)) {
+		runIn(oneMinute, resetOccupancy)	
+		resultMap = getMotionResult('occupied') 
+	} else if (description.contains(resultOpenned)) {
+		resultMap = getMotionResult('openned') 
+	} else if (description.contains(resultClosed)) {	
+		resultMap = getMotionResult('closed')		   
+	} else if (description.contains(resultBatteryNew)) {
+		resultMap = getBatteryResult(100)
+	} else if (description.contains(resultBatteryOut)) {
+		resultMap = getBatteryResult(0)
+	}  
+}
+
+private Map getBatteryResult(rawValue) {
+	log.debug "Battery rawValue = ${rawValue}"
+	createEvent(name:"battery", value:rawValue)
+}
+
+private Map getMotionResult(value) {
+	if (value == 'active') {
+		log.debug 'detected intrusion'
+		String descriptionText = "{{ device.displayName }} detected intrusion"
+		createEvent(
+			name: 'motion',
+			value: value,
+			descriptionText: descriptionText,
+			translatable: false
+		)
+	} else if (value == 'occupied') {
+		log.debug 'detected occupancy'
+		String descriptionText = "{{ device.displayName }} detected occupancy"
+		createEvent(
+			name: 'presence',
+			value: "present",
+			descriptionText: descriptionText,
+			translatable: false
+		)
+	} else if (value == 'openned') {
+		log.debug 'detected window openned'
+		String descriptionText = "{{ device.displayName }} detected window openned"
+		createEvent(
+			name: 'contact',
+			value: "open",
+			descriptionText: descriptionText,
+			translatable: false
+		)
+	} else if (value == 'closed') {
+		log.debug 'detected window closed'
+		String descriptionText = "{{ device.displayName }} detected window closed"
+		createEvent(
+			name: 'contact',
+			value: "closed",
+			descriptionText: descriptionText,
+			translatable: false
+		)
+	}
+}
+
+def installed() {
+	initialize()
+}
+
+def initialize() {
+	sendEvent(name:"motion", value:"inactive")
+	sendEvent(name:"battery", value:"100")
+	sendEvent(name:"presence", value:"not present")
+	sendEvent(name:"contact", value:"closed")
+}
+
+def stopMotion() {
+	if (device.currentState('motion')?.value == "active") {
+		sendEvent(name:"motion", value:"inactive", isStateChange: true)
+		log.debug "${device.displayName} reset to monitoring after 120 seconds"
+	}
+}
+
+def resetOccupancy() {
+	if (device.currentState('presence')?.value == "present") {
+		sendEvent(name:"presence", value:"not present", isStateChange: true)
+		log.debug "${device.displayName} reset to sensing after 60 seconds"
+	}
+}

devicetypes/qubino/qubino-dimmer.src/qubino-dimmer.groovy

@@ -34,6 +34,10 @@ metadata {
 		// Qubino Flush Dimmer 0-10V - ZMNHVD
 		// Raw Description: zw:L type:1100 mfr:0159 prod:0001 model:0053 ver:2.04 zwv:4.34 lib:03 cc:5E,86,5A,72,73,27,25,26,85,8E,59,70 ccOut:20,26 role:05 ff:9C00 ui:9C00
 		fingerprint mfr: "0159", prod: "0001", model: "0053", deviceJoinName: "Qubino Dimmer", mnmn: "SmartThings", vid:"generic-dimmer"
+
+		//Qubino Mini Dimmer
+		// Raw Description: zw:Ls type:1101 mfr:0159 prod:0001 model:0055 ver:20.02 zwv:5.03 lib:03 cc:5E,6C,55,98,9F sec:86,25,26,85,59,72,5A,70,32,71,73
+		fingerprint mfr:"0159", prod:"0001", model:"0055", deviceJoinName: "Qubino Dimmer"
 	}
 
 	tiles(scale: 2) {
@@ -158,6 +162,8 @@ def excludeParameterFromSync(preference){
 		if (isDINDimmer() || isFlushDimmer010V()) {
 			exclude = true
 		}
+	} else if (preference.key == "minimumDimmingValue"){
+		exclude = true
 	}
 
 	if (exclude) {
@@ -232,13 +238,6 @@ def configure() {
 	commands << zwave.associationV1.associationSet(groupingIdentifier:6, nodeId:[zwaveHubNodeId])
 	commands << zwave.multiChannelV3.multiChannelEndPointGet()
 	commands += getRefreshCommands()
-
-	// 1% is default Minimum dimming value for dimmers,
-	// when device is set to 1% - it turns off and device does not send any level reports
-	// Minimum dimming value has to be set to 2%, so the device's internal range would be 2-100%
-	// Still, for users it will relatively be 1-100% on the UI and device will report it.
-	// Parameter no. 60 – Minimum dimming value
-	commands << zwave.configurationV2.configurationSet(scaledConfigurationValue: 2, parameterNumber: 60, size: 1)
 	commands += getReadConfigurationFromTheDeviceCommands()
 
 	encapCommands(commands)
@@ -394,6 +393,14 @@ private dimmerEvents(physicalgraph.zwave.Command cmd, ep = null) {
 	return result
 }
 
+Integer adjustValueToRange(value){
+	if(value == 0){
+		return 0
+	}
+	def minDimmingLvlPref = settings.minimumDimmingValue ?: parameterMap.find({it.key == 'minimumDimmingValue'}).defaultValue
+	return Math.max(value, minDimmingLvlPref)
+}
+
 def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelReport cmd, ep = null) {
 	log.info "SensorMultilevelReport: ${cmd}, endpoint: ${ep}"
 	def result = []
@@ -482,7 +489,9 @@ def setLevel(value, duration = null) {
 		getStatusDelay = duration < 128 ? (duration * 1000) + 2000 : (Math.round(duration / 60) * 60 * 1000) + 2000
 	}
 
-	commands << zwave.switchMultilevelV3.switchMultilevelSet(value: level, dimmingDuration: dimmingDuration)
+	def adjustedLevel = adjustValueToRange(level)
+
+	commands << zwave.switchMultilevelV3.switchMultilevelSet(value: adjustedLevel, dimmingDuration: dimmingDuration)
 	commands << zwave.switchMultilevelV3.switchMultilevelGet()
 
 	encapCommands(commands, getStatusDelay)
@@ -619,6 +628,16 @@ private getParameterMap() {[
 		optionActive: 1, activeDescription: " Flush Dimmer 0-10V module does not save the state after a power failure, it returns to off position",
 		description: "Set whether the device stores or does not store the last output level in the event of a power outage."
 	],
+	[
+		name           : "Minimum dimming value",
+		key            : "minimumDimmingValue",
+		type           : "range",
+		parameterNumber: 60,
+		size           : 1,
+		defaultValue   : 1,
+		range          : "1..98",
+		description    : "Select minimum dimming value for this device. When the switch type is selected as Bi-stable, it is not possible to dim the value between min and max."
+	],
 	[
 		name: "Dimming time (soft on/off)", key: "dimmingTime(SoftOn/Off)", type: "range",
 		parameterNumber: 65, size: 2, defaultValue: 100,

devicetypes/qubino/qubino-flush-2-relay.src/qubino-flush-2-relay.groovy

@@ -132,7 +132,9 @@ def excludeParameterFromSync(preference){
 def addToAssociationGroupIfNeeded() {
 	def cmds = []
 	if (zwaveInfo?.model?.equals("0052")) {
-		cmds += encap(zwave.associationV2.associationSet(groupingIdentifier: 2, nodeId: [zwaveHubNodeId]))
+		//Hub automatically adds device to multiChannelAssosciationGroup and this needs to be removed
+		cmds += encap(zwave.multiChannelAssociationV2.multiChannelAssociationRemove(groupingIdentifier: 1, nodeId:[])) 
+		cmds += encap(zwave.associationV2.associationSet(groupingIdentifier: 1, nodeId: [zwaveHubNodeId]))
 	}
 	cmds
 }
@@ -245,17 +247,6 @@ def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd, ep = null)
 	changeSwitch(ep, cmd)
 }
 
-def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicSet cmd, ep = null) { 
-	log.debug "Basic ${cmd}" + (ep ? " from endpoint $ep" : "")
-	[
-		changeSwitch(ep, cmd), 
-		response([
-			"delay 2000",
-			encap(zwave.meterV3.meterGet(scale: 2), endpoint)
-		])
-	]
-}
-
 def zwaveEvent(physicalgraph.zwave.commands.switchbinaryv1.SwitchBinaryReport cmd, ep = null) {
 	log.debug "Binary ${cmd}" + (ep ? " from endpoint $ep" : "")
 	changeSwitch(ep, cmd)

devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy

@@ -20,6 +20,10 @@ metadata {
 		capability "Actuator"
 		capability "Temperature Measurement"
 		capability "Thermostat"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Cooling Setpoint"
+		capability "Thermostat Mode"
+		capability "Thermostat Fan Mode"
 		capability "Configuration"
 		capability "Refresh"
 		capability "Sensor"

devicetypes/smartthings/ct100-thermostat.src/ct100-thermostat.groovy

@@ -5,6 +5,11 @@ metadata {
 		capability "Temperature Measurement"
 		capability "Relative Humidity Measurement"
 		capability "Thermostat"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Cooling Setpoint"
+		capability "Thermostat Operating State"
+		capability "Thermostat Mode"
+		capability "Thermostat Fan Mode"
 		capability "Battery"
 		capability "Refresh"
 		capability "Sensor"

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

@@ -20,6 +20,7 @@ metadata {
 		capability "Thermostat Heating Setpoint"
 		capability "Health Check"
 		capability "Thermostat"
+		capability "Thermostat Mode"
 		capability "Temperature Measurement"
 
 		command "setThermostatSetpointUp"

devicetypes/smartthings/fidure-thermostat.src/fidure-thermostat.groovy

@@ -12,6 +12,11 @@ metadata {
 		capability "Actuator"
 		capability "Temperature Measurement"
 		capability "Thermostat"
+		capability "Thermostat Heating Setpoint"
+		capability "Thermostat Cooling Setpoint"
+		capability "Thermostat Operating State"
+		capability "Thermostat Mode"
+		capability "Thermostat Fan Mode"
 		capability "Configuration"
 		capability "Refresh"
 		capability "Sensor"
@@ -41,8 +46,6 @@ metadata {
 
 		attribute "lastTimeSync", "string"
 
-		attribute "thermostatOperatingState", "string"
-
 		fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0201,0204,0B05", outClusters: "000A, 0019", deviceJoinName: "Fidure Thermostat"
 		fingerprint manufacturer: "Fidure", model: "A1732R3" , deviceJoinName: "Fidure Thermostat"// same clusters as above
 
@@ -94,9 +97,7 @@ metadata {
 		}
 
 		standardTile("hvacStatus", "thermostatOperatingState", inactiveLabel: false, decoration: "flat") {
-			state "Resting",  label: 'Resting'
-			state "Heating",  icon:"st.thermostat.heating"
-			state "Cooling",  icon:"st.thermostat.cooling"
+			state "thermostatOperatingState", label:'${currentValue}'
 		}
 
 
@@ -496,7 +497,7 @@ def Program() {
 
 
 def getThermostatOperatingState(value) {
-	String[] m = [ "heating", "cooling", "fan", "Heat2", "Cool2", "Fan2", "Fan3"]
+	String[] m = [ "heating", "cooling", "fan only", "heating", "cooling", "fan only", "fan only"]
 	String desc = 'idle'
 	value = Integer.parseInt(''+value, 16)
 

devicetypes/smartthings/smartsense-moisture-sensor.src/smartsense-moisture-sensor.groovy

@@ -34,6 +34,7 @@ metadata {
 		fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "moisturev4", deviceJoinName: "Water Leak Sensor", mnmn: "SmartThings", vid: "smartthings-water-leak-3315S-STSWTR"
 		fingerprint inClusters: "0000,0001,0003,0020,0402,0500", outClusters: "0019", manufacturer: "Samjin", model: "water", deviceJoinName: "Water Leak Sensor", mnmn: "SmartThings", vid: "smartthings-water-leak-IM6001"
 		fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "Sercomm Corp.", model: "SZ-WTD03", deviceJoinName: "Sercomm Water Leak Sensor" //Sercomm Water Leak Detector
+		fingerprint profileId: "0104", deviceId: "0402", inClusters: "0000,0001,0003,000F,0020,0500,0502", outClusters: "000A,0019", manufacturer: "frient A/S", model :"FLSZB-110", deviceJoinName: "frient Water Leak Sensor" // frient Water Leak Detector
 	}
 
 	simulator {
@@ -84,6 +85,9 @@ metadata {
 	}
 }
 
+def getBATTERY_VOLTAGE_ATTR() { 0x0020 }
+def getBATTERY_PERCENT_ATTR() { 0x0021 }
+
 private List<Map> collectAttributes(Map descMap) {
 	List<Map> descMaps = new ArrayList<Map>()
 
@@ -111,13 +115,13 @@ def parse(String description) {
 				List<Map> descMaps = collectAttributes(descMap)
 
 				if (device.getDataValue("manufacturer") == "Samjin") {
-					def battMap = descMaps.find { it.attrInt == 0x0021 }
+					def battMap = descMaps.find { it.attrInt == BATTERY_PERCENT_ATTR }
 
 					if (battMap) {
 						map = getBatteryPercentageResult(Integer.parseInt(battMap.value, 16))
 					}
 				} else {
-					def battMap = descMaps.find { it.attrInt == 0x0020 }
+					def battMap = descMaps.find { it.attrInt == BATTERY_VOLTAGE_ATTR }
 
 					if (battMap) {
 						map = getBatteryResult(Integer.parseInt(battMap.value, 16))
@@ -192,7 +196,7 @@ private Map getBatteryResult(rawValue) {
 			def pct = batteryMap[volts]
 			result.value = pct
 		} else {
-			def minVolts = 2.1
+			def minVolts = isFrientSensor() ? 2.3 : 2.1
 			def maxVolts = 3.0
 			def pct = (volts - minVolts) / (maxVolts - minVolts)
 			def roundedPct = Math.round(pct * 100)
@@ -247,9 +251,9 @@ def refresh() {
 	def refreshCmds = []
 
 	if (device.getDataValue("manufacturer") == "Samjin") {
-		refreshCmds += zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0021)
+		refreshCmds += zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, BATTERY_PERCENT_ATTR)
 	} else {
-		refreshCmds += zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0020)
+		refreshCmds += zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, BATTERY_VOLTAGE_ATTR)
 	}
 	refreshCmds += zigbee.readAttribute(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000) +
 		zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS) +
@@ -269,11 +273,20 @@ def configure() {
 	// temperature minReportTime 30 seconds, maxReportTime 5 min. Reporting interval if no activity
 	// battery minReport 30 seconds, maxReportTime 6 hrs by default
 	if (device.getDataValue("manufacturer") == "Samjin") {
-		configCmds += zigbee.configureReporting(zigbee.POWER_CONFIGURATION_CLUSTER, 0x0021, DataType.UINT8, 30, 21600, 0x10)
+		configCmds += zigbee.configureReporting(zigbee.POWER_CONFIGURATION_CLUSTER, BATTERY_PERCENT_ATTR, DataType.UINT8, 30, 21600, 0x10)
 	} else {
 		configCmds += zigbee.batteryConfig()
 	}
-	configCmds += zigbee.temperatureConfig(30, 300)
+	
+	if (isFrientSensor()) {
+		configCmds += zigbee.configureReporting(zigbee.TEMPERATURE_MEASUREMENT_CLUSTER, 0x0000, DataType.INT16, 60, 600, 0x64, [destEndpoint: 0x26])
+	} else {
+		configCmds += zigbee.temperatureConfig(30, 300)
+	}
 
 	return refresh() + configCmds + refresh() // send refresh cmds as part of config
 }
+
+private Boolean isFrientSensor() {
+	device.getDataValue("manufacturer") == "frient A/S"
+}