Merge pull request #2192 from SmartThingsCommunity/staging

Rolling up staging to production

devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy

@@ -133,8 +133,8 @@ def updated() {
 }
 
 def initialize() {
-	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
 
 	def zwMap = getZwaveInfo()
 	def buttons = 4 // Default for Key Fob

devicetypes/smartthings/aeon-minimote.src/aeon-minimote.groovy

@@ -111,6 +111,7 @@ def configure() {
 	return cmds
 }
 
+
 def installed() {
 	initialize()
 }
@@ -120,7 +121,7 @@ def updated() {
 }
 
 def initialize() {
-	// Device only goes OFFLINE when Hub is off
-	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zwave", scheme:"untracked"]), displayed: false)
+	// Arrival sensors only goes OFFLINE when Hub is off
+	sendEvent(name: "DeviceWatch-Enroll", value: JsonOutput.toJson([protocol: "zigbee", scheme:"untracked"]), displayed: false)
 	sendEvent(name: "numberOfButtons", value: 4)
 }

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

@@ -72,7 +72,7 @@ def createEvents(physicalgraph.zwave.commands.batteryv1.BatteryReport cmd) {
 
 def poll() {
 	if (secondsPast(state.lastbatt, 36*60*60)) {
-		return zwave.batteryV1.batteryGet().format()
+		return zwave.batteryV1.batteryGet().format
 	} else {
 		return null
 	}

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

@@ -1,108 +0,0 @@
-/**
- *  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
-}