Merge pull request #78286 from SmartThingsCommunity/master

Rolling up master to staging

Author: greens

devicetypes/shinasys/sihas-multipurpose-sensor.src/sihas-multipurpose-sensor.groovy

@@ -147,31 +147,13 @@ private Map getBatteryResult(rawValue) {
         def maxVolts = 3.2
 
         if (isDSM300()) maxVolts = 3.1
-
-        // Get the current battery percentage as a multiplier 0 - 1
-        def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
-        // Find the corresponding voltage from our range
-        curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
-        // Round to the nearest 10th of a volt
-        curValVolts = Math.round(10 * curValVolts) / 10.0
-
-        // Only update the battery reading if we don't have a last reading,
-        // OR we have received the same reading twice in a row
-        // OR we don't currently have a battery reading
-        // OR the value we just received is at least 2 steps off from the last reported value
-        if (state?.lastVolts == null || state?.lastVolts == volts || device.currentState("battery")?.value == null || Math.abs(curValVolts - volts) > 0.1) {
-            def pct = (volts - minVolts) / (maxVolts - minVolts)
-            def roundedPct = Math.round(pct * 100)
-            if (roundedPct <= 0)
-                roundedPct = 1
-            result.value = Math.min(100, roundedPct)
-        } else {
-            // Don't update as we want to smooth the battery values, but do report the last battery state for record keeping purposes
-            result.value = device.currentState("battery").value
-        }
-
-        result.descriptionText = "${device.displayName} battery was ${result.value}%"
-        state.lastVolts = volts
+		
+        def pct = (volts - minVolts) / (maxVolts - minVolts)
+        def roundedPct = Math.round(pct * 100)
+        if (roundedPct <= 0)
+            roundedPct = 1
+        result.value = Math.min(100, roundedPct)
+        result.descriptionText = "${device.displayName} battery was ${result.value}%"        
     }
     return result
 }
@@ -254,7 +236,6 @@ def refresh() {
     }
 
     if (isDSM300()) {
-        refreshCmds += zigbee.readAttribute(zigbee.POWER_CONFIGURATION_CLUSTER, POWER_CONFIGURATION_BATTERY_VOLTAGE_ATTRIBUTE)
         refreshCmds += zigbee.readAttribute(zigbee.IAS_ZONE_CLUSTER, zigbee.ATTRIBUTE_IAS_ZONE_STATUS)        
         refreshCmds += zigbee.enrollResponse()
     }
@@ -325,4 +306,4 @@ private Boolean isDSM300() {
 
 private Boolean isCSM300() {
     device.getDataValue("model") == "CSM-300Z"
-}
+}

devicetypes/smartthings/zigbee-multi-button.src/zigbee-multi-button.groovy

@@ -157,6 +157,9 @@ def getBatteryPercentageResult(rawValue) {
 		def minVolts = 2.1
 		def maxVolts = 3.0
 		def pct = (volts - minVolts) / (maxVolts - minVolts)
+		if(pct <= 0) {
+			pct = 0.01
+		}
 		result.value = Math.min(100, (int)(pct * 100))
 		def linkText = getLinkText(device)
 		result.descriptionText = "${linkText} battery was ${result.value}%"

devicetypes/smartthings/zigbee-window-shade.src/zigbee-window-shade.groovy

@@ -27,11 +27,11 @@ metadata {
 		capability "Switch Level"
 
 		command "pause"
-        
+
  		// NodOn
-		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0102", outClusters: "0019", manufacturer: "NodOn", model: "SIN-4-RS-20", deviceJoinName: "NodOn Window Treatment" 
+		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0102", outClusters: "0019", manufacturer: "NodOn", model: "SIN-4-RS-20", deviceJoinName: "NodOn Window Treatment"
 		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0102", outClusters: "0019", manufacturer: "NodOn", model: "SIN-4-RS-20_PRO", deviceJoinName: "NodOn Window Treatment"
-        
+
 		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0102", outClusters: "0019", model: "E2B0-KR000Z0-HA", deviceJoinName: "eZEX Window Treatment" // SY-IoT201-BD //SOMFY Blind Controller/eZEX
 		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0102", outClusters: "000A", manufacturer: "Feibit Co.Ltd", model: "FTB56-ZT218AK1.6", deviceJoinName: "Wistar Window Treatment" //Wistar Curtain Motor(CMJ)
 		fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0102", outClusters: "000A", manufacturer: "Feibit Co.Ltd", model: "FTB56-ZT218AK1.8", deviceJoinName: "Wistar Window Treatment" //Wistar Curtain Motor(CMJ)
@@ -149,10 +149,10 @@ def levelEventHandler(currentLevel) {
 		sendEvent(name: "level", value: currentLevel, unit: "%", displayed: false)
 
 		if (currentLevel == 0 || currentLevel == 100) {
-		        if (device.getDataValue("manufacturer") == "Third Reality, Inc"){
-			        sendEvent(name: "windowShade", value: currentLevel == 0 ? "open" : "closed")
+			if (device.getDataValue("manufacturer") == "Third Reality, Inc"){
+				sendEvent(name: "windowShade", value: currentLevel == 0 ? "open" : "closed")
 			} else {
-			        sendEvent(name: "windowShade", value: currentLevel == 0 ? "closed" : "open")
+				sendEvent(name: "windowShade", value: currentLevel == 0 ? "closed" : "open")
 			}
 		} else {
 			if (priorLevel < currentLevel) {
@@ -222,14 +222,10 @@ def pause() {
 	log.info "pause()"
 	def currentShadeStatus = device.currentValue("windowShade")
 
-        if (device.getDataValue("manufacturer") == "Third Reality, Inc") {
-	        zigbee.command(CLUSTER_WINDOW_COVERING, COMMAND_PAUSE)
+	if (isSomfy() && (currentShadeStatus == "open" || currentShadeStatus == "closed")) {
+		sendEvent(name: "windowShade", value: currentShadeStatus)
 	} else {
-	        if (currentShadeStatus == "open" || currentShadeStatus == "closed") {
-		        sendEvent(name: "windowShade", value: currentShadeStatus)
-	        } else {
-		        zigbee.command(CLUSTER_WINDOW_COVERING, COMMAND_PAUSE)
-	        }
+		zigbee.command(CLUSTER_WINDOW_COVERING, COMMAND_PAUSE)
 	}
 }