MSA-2140: MQTT Bridge to Home Assistant

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

@@ -173,27 +173,11 @@ private Map getBatteryResult(rawValue) {
 		} else {
 			def minVolts = 2.4
 			def maxVolts = 2.7
-			// Get the current battery percentage as a multiplier 0 - 1
+			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
+			def roundedPct = Math.round(pct * 100)
-			// Find the corresponding voltage from our range
+			if (roundedPct <= 0)
-			curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
+				roundedPct = 1
-			// Round to the nearest 10th of a volt
+			result.value = Math.min(100, roundedPct)
-			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
-				result = null
-			}
-			state.lastVolts = volts
 		}
 	}
 

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

@@ -275,27 +275,11 @@ private Map getBatteryResult(rawValue) {
 		} else {
 			def minVolts = 2.1
 			def maxVolts = 2.7
-			// Get the current battery percentage as a multiplier 0 - 1
+			def pct = (volts - minVolts) / (maxVolts - minVolts)
-			def curValVolts = Integer.parseInt(device.currentState("battery")?.value ?: "100") / 100.0
+			def roundedPct = Math.round(pct * 100)
-			// Find the corresponding voltage from our range
+			if (roundedPct <= 0)
-			curValVolts = curValVolts * (maxVolts - minVolts) + minVolts
+				roundedPct = 1
-			// Round to the nearest 10th of a volt
+			result.value = Math.min(100, roundedPct)
-			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
-				result = null
-			}
-			state.lastVolts = volts
 		}
 	}
 

devicetypes/smartthings/zwave-lock.src/zwave-lock.groovy

@@ -88,21 +88,19 @@ import physicalgraph.zwave.commands.usercodev1.*
 def installed() {
 	// Device-Watch pings if no device events received for 1 hour (checkInterval)
 	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
-
-	try {
-		if (!state.init) {
-			state.init = true
-			// Wait long enough for behind-the-scenes z-wave magic to finish, but be quick enough before hub goes back into inclusion and blocks us
-			response(["delay 2000"] + secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()], 2200))
-		}
-	} catch (e) {
-		log.warn "installed() threw $e"
-	}
 }
 
 def updated() {
 	// Device-Watch pings if no device events received for 1 hour (checkInterval)
 	sendEvent(name: "checkInterval", value: 1 * 60 * 60, displayed: false, data: [protocol: "zwave", hubHardwareId: device.hub.hardwareID])
+	try {
+		if (!state.init) {
+			state.init = true
+			response(secureSequence([zwave.doorLockV1.doorLockOperationGet(), zwave.batteryV1.batteryGet()]))
+		}
+	} catch (e) {
+		log.warn "updated() threw $e"
+	}
 }
 
 def parse(String description) {

devicetypes/stj/mqtt-bridge.src/mqtt-bridge.groovy

@@ -0,0 +1,108 @@
+/**
+ *  MQTT Bridge
+ *
+ * 	Authors
+ *   - st.john.johnson@gmail.com
+ *   - jeremiah.wuenschel@gmail.com
+ *
+ *  Copyright 2016
+ *
+ *  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.
+ */
+
+import groovy.json.JsonSlurper
+import groovy.json.JsonOutput
+
+metadata {
+    definition (name: "MQTT Bridge", namespace: "stj", author: "St. John Johnson and Jeremiah Wuenschel") {
+        capability "Notification"
+    }
+
+    preferences {
+        input("ip", "string",
+            title: "MQTT Bridge IP Address",
+            description: "MQTT Bridge IP Address",
+            required: true,
+            displayDuringSetup: true
+        )
+        input("port", "string",
+            title: "MQTT Bridge Port",
+            description: "MQTT Bridge Port",
+            required: true,
+            displayDuringSetup: true
+        )
+        input("mac", "string",
+            title: "MQTT Bridge MAC Address",
+            description: "MQTT Bridge MAC Address",
+            required: true,
+            displayDuringSetup: true
+        )
+    }
+
+    simulator {}
+
+    tiles {
+        valueTile("basic", "device.ip", width: 3, height: 2) {
+            state("basic", label:'OK')
+        }
+        main "basic"
+    }
+}
+
+// Store the MAC address as the device ID so that it can talk to SmartThings
+def setNetworkAddress() {
+    // Setting Network Device Id
+    def hex = "$settings.mac".toUpperCase().replaceAll(':', '')
+    if (device.deviceNetworkId != "$hex") {
+        device.deviceNetworkId = "$hex"
+        log.debug "Device Network Id set to ${device.deviceNetworkId}"
+    }
+}
+
+// Parse events from the Bridge
+def parse(String description) {
+    setNetworkAddress()
+
+    log.debug "Parsing '${description}'"
+    def msg = parseLanMessage(description)
+
+    return createEvent(name: "message", value: new JsonOutput().toJson(msg.data))
+}
+
+// Send message to the Bridge
+def deviceNotification(message) {
+    if (device.hub == null)
+    {
+        log.error "Hub is null, must set the hub in the device settings so we can get local hub IP and port"
+        return
+    }
+    
+    log.debug "Sending '${message}' to device"
+    setNetworkAddress()
+
+    def slurper = new JsonSlurper()
+    def parsed = slurper.parseText(message)
+    
+    if (parsed.path == '/subscribe') {
+        parsed.body.callback = device.hub.getDataValue("localIP") + ":" + device.hub.getDataValue("localSrvPortTCP")
+    }
+
+    def headers = [:]
+    headers.put("HOST", "$ip:$port")
+    headers.put("Content-Type", "application/json")
+
+    def hubAction = new physicalgraph.device.HubAction(
+        method: "POST",
+        path: parsed.path,
+        headers: headers,
+        body: parsed.body
+    )
+    hubAction
+}