MSA-1252: Adding simulator tags to allow Zw Multichannel capability be simulated.

devicetypes/capabilities/zw-multichannel.src/zw-multichannel.groovy

@@ -0,0 +1,47 @@
+/**
+ *  Zw Multichannel
+ *
+ *  Copyright 2016 SmartThings
+ *
+ *  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.
+ *
+ */
+metadata {
+	definition (name: "Zw Multichannel", namespace: "capabilities", author: "SmartThings") {
+		capability "Zw Multichannel"
+	}
+
+	simulator {
+		status "ZWEvent":""
+        status "ZWInfo":""
+	}
+
+	tiles {
+		valueTile("zwEvent", "device.epEvent", label:"${name}", width:2, height:2) {}
+        valueTile("zwInfo", "device.epInfo", label:"${name}", width:2, height:2) {}
+        main("zwEvent")
+        details(["zwEvent","zwInfo"])        
+	}
+}
+
+// parse events into attributes
+def parse(String description) {
+	def pair = description.split(":")
+    createEvent(name: pair[0].trim(), value: pair[1].trim())
+}
+
+// handle commands
+def enableEpEvents(data) {
+	'[enableEpEvents]${data}'
+}
+
+def epCmd(num, str) {
+	'[epCmd]${num}:${str}'
+}

devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy

@@ -12,6 +12,16 @@
  *
  */
  
+ /*
+ *  Purpose: Arrival Sensor HA DTH File
+ *
+ *  Filename: Arrival-Sensor-HA.src/Arrival-Sensor-HA.groovy
+ *
+ *  Change History:
+ *  1. 20160115 TW - Update/Edit to support i18n translations
+ *  2. 20160121 TW - Update to V4 battery calcs, added pref's page title translations
+ */
+ 
 metadata {
     definition (name: "Arrival Sensor HA", namespace: "smartthings", author: "SmartThings") {
         capability "Tone"

devicetypes/smartthings/arrival-sensor-ha.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -11,6 +12,15 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+#==============================================================================
+# Purpose: Arrival Sensor HA i18n Translation File
+#
+# Filename: Arrival-Sensor-HA.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160115 TW Initial release with informal Korean translation.
+#	2. 20160121 TW Added def preference section titles.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 설정

devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy

@@ -1,7 +1,7 @@
 /**
  *  GE Link Bulb
  *
- *  Copyright 2016 SmartThings
+ *  Copyright 2014 SmartThings
  *
  *  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:
@@ -53,8 +53,6 @@ metadata {
         capability "Polling"
 
         fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0019", manufacturer: "GE_Appliances", model: "ZLL Light", deviceJoinName: "GE Link Bulb"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0019", manufacturer: "GE", model: "SoftWhite", deviceJoinName: "GE Link Soft White Bulb"
-        fingerprint profileId: "0104", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0019", manufacturer: "GE", model: "Daylight", deviceJoinName: "GE Link Daylight Bulb"
     }
 
 	// UI tile definitions

devicetypes/smartthings/mobile-presence.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not 
@@ -11,6 +12,15 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
 #  License for the specific language governing permissions and limitations 
 #  under the License.
+#==============================================================================
+# Purpose: Mobile Presence i18n Translation File
+#
+# Filename: mobile-presence.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160205 TW Initial release with informal Korean translation.
+#	2. 20160224 TW Updated with formal Korean translation.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 설정

devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy

@@ -1,4 +1,5 @@
 /*
+===============================================================================
  *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,6 +13,14 @@
  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 
  *  License for the specific language governing permissions and limitations 
  *  under the License.
+===============================================================================
+ *  Purpose: Mobile Presence DTH File
+ *
+ *  Filename: mobile-presence.src/mobile-presence.groovy
+ *
+ *  Change History:
+ *  1. 20160205 TW - Update/Edit to support i18n translations
+===============================================================================
  */
  
 metadata {

devicetypes/smartthings/smartpower-outlet.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -11,6 +12,14 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+#==============================================================================
+# Purpose: SmartPower Outlet i18n Translation File
+#
+# Filename: SmartPower-Outlet.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160116 TW Initial release with informal Korean translation.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Give your device a name'''.ko=기기 이름 설정

devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy

@@ -1,4 +1,5 @@
 /*
+===============================================================================
  *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,8 +13,15 @@
  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  *  License for the specific language governing permissions and limitations
  *  under the License.
+===============================================================================
+ *  Purpose: SmartPower Outlet DTH File
+ *
+ *  Filename: SmartPower-Outlet.src/SmartPower-Outlet.groovy
+ *
+ *  Change History:
+ *  1. 20160117 TW - Update/Edit to support i18n translations
+===============================================================================
  */
-
 metadata {
 	// Automatically generated. Make future change here.
 	definition (name: "SmartPower Outlet", namespace: "smartthings", author: "SmartThings") {
@@ -129,7 +137,6 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 1200, displayed: false)
 	zigbee.onOffConfig() + powerConfig() + refresh()
 }
 

devicetypes/smartthings/smartsense-moisture-sensor.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -11,6 +12,14 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+#==============================================================================
+# Purpose: SmartSense Moisture Sensor i18n Translation File
+#
+# Filename: SmartSense-Moisture-Sensor.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160116 TW Initial release with formal Korean translation.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Dry'''.ko=건조

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

@@ -1,4 +1,5 @@
 /*
+===============================================================================
  *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,6 +13,15 @@
  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  *  License for the specific language governing permissions and limitations
  *  under the License.
+===============================================================================
+ *  Purpose: SmartSense Moisture Sensor DTH File
+ *
+ *  Filename: SmartSense-Moisture-Sensor.src/SmartSense-Moisture-Sensor.groovy
+ *
+ *  Change History:
+ *  1. 20160116 TW - Update/Edit to support i18n translations
+ *  2. 20160125 TW = Incorporated new battery mapping from TM
+===============================================================================
  */
 
 metadata {
@@ -311,8 +321,6 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
-
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 	def configCmds = [

devicetypes/smartthings/smartsense-motion-sensor.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -11,6 +12,15 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+#==============================================================================
+# Purpose: SmartSense Motion Sensor i18n Translation File
+#
+# Filename: SmartSense-Motion-Sensor.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160116 TW Initial release with formal Korean translation.
+#	2. 20160224 TW Updated formal Korean translations from Mike Stoller.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''battery'''.ko=배터리

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

@@ -1,4 +1,5 @@
 /*
+===============================================================================
  *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,6 +13,15 @@
  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  *  License for the specific language governing permissions and limitations
  *  under the License.
+===============================================================================
+ *  Purpose: SmartSense Motion Sensor DTH File
+ *
+ *  Filename: SmartSense-Motion-Sensor.src/SmartSense-Motion-Sensor.groovy
+ *
+ *  Change History:
+ *  1. 20160116 TW - Update/Edit to support i18n translations
+ *  2. 20160125 TW = Incorporated new battery mapping from TM
+===============================================================================
  */
 
 metadata {
@@ -323,8 +333,6 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
-
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."
 

devicetypes/smartthings/smartsense-multi-sensor.src/i18n/messages.properties

@@ -1,3 +1,4 @@
+#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -11,6 +12,14 @@
 #  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #  License for the specific language governing permissions and limitations
 #  under the License.
+#==============================================================================
+# Purpose: SmartSense Multi Sensor i18n Translation File
+#
+# Filename: SmartSense-Multi-Sensor.src/i18n/messages.properties
+#
+# Change History:
+#	1. 20160117 TW Initial release with informal Korean translation.
+#==============================================================================
 # Korean (ko)
 # Device Preferences
 '''Yes'''.ko=예

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

@@ -1,4 +1,5 @@
 /*
+===============================================================================
  *  Copyright 2016 SmartThings
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,6 +13,15 @@
  *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
  *  License for the specific language governing permissions and limitations
  *  under the License.
+===============================================================================
+ *  Purpose: SmartSense Multi Sensor DTH File
+ *
+ *  Filename: SmartSense-Multi-Sensor.src/SmartSense-Multi-Sensor.groovy
+ *
+ *  Change History:
+ *  1. 20160117 TW - Update/Edit to support i18n translations
+ *  2. 20160125 TW = Incorporated new battery mapping from TM
+===============================================================================
  */
 
 metadata {
@@ -441,8 +451,6 @@ def refresh() {
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
-
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting"
 

devicetypes/smartthings/smartsense-open-closed-accelerometer-sensor.src/smartsense-open-closed-accelerometer-sensor.groovy

@@ -300,7 +300,6 @@ def getTemperature(value) {
 	}
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting, IAS CIE, and Bindings."

devicetypes/smartthings/smartsense-temp-humidity-sensor.src/smartsense-temp-humidity-sensor.groovy

@@ -252,7 +252,6 @@ def refresh()
 }
 
 def configure() {
-	sendEvent(name: "checkInterval", value: 7200, displayed: false)
 
 	log.debug "Configuring Reporting and Bindings."
 	def configCmds = [

smartapps/com-gidjit-smartthings-hub/gidjit-hub.src/gidjit-hub.groovy

@@ -1,252 +0,0 @@
-/**
- *  Gidjit Hub
- *
- *  Copyright 2016 Matthew Page
- *
- *  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.
- *
- */
-definition(
-    name: "Gidjit Hub",
-    namespace: "com.gidjit.smartthings.hub",
-    author: "Matthew Page",
-    description: "Act as an endpoint so user's of Gidjit can quickly access and control their devices and execute routines. Users can do this quickly as Gidjit filters these actions  based on their environment",
-    category: "Convenience",
-    iconUrl: "http://www.gidjit.com/appicon.png",
-    iconX2Url: "http://www.gidjit.com/appicon@2x.png",
-    iconX3Url: "http://www.gidjit.com/appicon@3x.png",
-    oauth: [displayName: "Gidjit", displayLink: "www.gidjit.com"])
-
-
-
-preferences {
-  section ("Allow Gidjit to have access, there by allowing you to quickly control and monitor the following devices") {
-    input "switches", "capability.switch", title: "Control/Monitor your switches", multiple: true, required: false
-    input "thermostats", "capability.thermostat", title: "Control/Monitor your thermostats", multiple: true, required: false
-    input "windowShades", "capability.windowShade", title: "Control/Monitor your window shades", multiple: true, required: false //windowShade
-    //input "bulbs", "capability.colorControl", title: "Control your lights", multiple: true, required: false //windowShade
-
-  }
-}
-mappings {
-  path("/structureinfo") {
-    action: [
-      GET: "structureInfo"
-    ]
-  }
-  path("/helloactions") {
-    action: [
-      GET: "helloActions"
-    ]
-  }
-  path("/helloactions/:label") {
-    action: [
-      PUT: "executeAction"
-    ]
-  }
-
-  path("/switch/:id/:command") {
-    action: [
-      PUT: "updateSwitch"
-    ]
-  }
-
-  path("/thermostat/:id/:command") {
-    action: [
-      PUT: "updateThermostat"
-    ]
-  }
-
-  path("/windowshade/:id/:command") {
-    action: [
-      PUT: "updateWindowShade"
-    ]
-  }
-  path("/acquiredata/:id") {
-    action: [
-      GET: "acquiredata"
-    ]
-  }
-}
-
-
-def installed() {
-	log.debug "Installed with settings: ${settings}"
-
-	initialize()
-}
-
-def updated() {
-	log.debug "Updated with settings: ${settings}"
-
-	unsubscribe()
-	initialize()
-}
-
-def initialize() {
-	// subscribe to attributes, devices, locations, etc.
-}
-def helloActions() {
-	def actions = location.helloHome?.getPhrases()*.label
-    if(!actions) {
-    	return []
-    }
-	return actions
-}
-def executeAction() {
-    def actions = location.helloHome?.getPhrases()*.label
-    def a = actions?.find() { it == params.label }
-    if (!a) {
-        httpError(400, "invalid label $params.label")
-        return
-    }
-    location.helloHome?.execute(params.label)
-}
-/*  this is the primary function called to query at the structure and its devices */
-def structureInfo() { //list all devices
-	def list = [:]
-    def currId = location.id
-    list[currId] = [:]
-    list[currId].name = location.name
-    list[currId].id = location.id
-    list[currId].temperatureScale = location.temperatureScale
-    list[currId].devices = [:]
-  
-    def setValues = {
-   		if (params.brief) {
-            return [id: it.id, name: it.displayName]
-        }
-        def newList = [id: it.id, name: it.displayName, suppCapab: it.capabilities.collect {
-            "$it.name"
-        }, suppAttributes: it.supportedAttributes.collect {
-            "$it.name"      
-        }, suppCommands: it.supportedCommands.collect {
-            "$it.name"      
-        }]
-
-        return newList
-    }
-    switches?.each {
-      list[currId].devices[it.id] = setValues(it)
-    }
-    thermostats?.each {
-      list[currId].devices[it.id] = setValues(it)
-    }
-    windowShades?.each {
-      list[currId].devices[it.id] = setValues(it)
-    }
-
-    return list
-
-}
-/*  This function returns all of the current values of the specified Devices attributes */
-def acquiredata() {
-	def resp = [:]
-    if (!params.id) {
-    	httpError(400, "invalid id $params.id")
-        return
-    }
-    def dev = switches.find() { it.id == params.id } ?: windowShades.find() { it.id == params.id } ?:
-    	thermostats.find() { it.id == params.id }    
-   
-    if (!dev) {
-    	httpError(400, "invalid id $params.id")
-        return    
-    }
-    def att = dev.supportedAttributes
-    att.each {
-    	resp[it.name] = dev.currentValue("$it.name")
-    }
-    return resp
-}
-
-void updateSwitch() {
-    // use the built-in request object to get the command parameter
-    def command = params.command
-	def sw = switches.find() { it.id == params.id }
-    if (!sw) {
-    	httpError(400, "invalid id $params.id")
-        return
-    }
-    switch(command) {
-        case "on":
-        	if ( sw.currentSwitch != "on" ) {
-            	sw.on()
-            }
-            break
-        case "off":
-        	if ( sw.currentSwitch != "off" ) {
-            	sw.off()
-            }
-            break
-        default:
-            httpError(400, "$command is not a valid")
-    }
-}
-
-
-void updateThermostat() {
-    // use the built-in request object to get the command parameter
-    def command = params.command
-	def therm = thermostats.find() { it.id == params.id }
-    if (!therm || !command) {
-    	httpError(400, "invalid id $params.id")
-        return
-    }
-    def passComm = [
-        "off",
-        "heat",
-        "emergencyHeat",
-        "cool",
-        "fanOn",
-        "fanAuto",
-        "fanCirculate",
-        "auto"
-
-	]
-    def passNumParamComm = [
-    	"setHeatingSetpoint",
-    	"setCoolingSetpoint",   
-    ]
-    def passStringParamComm = [
-        "setThermostatMode",
-        "setThermostatFanMode",
-	]
-    if (command in passComm) {
-    	therm."$command"()	
-    } else if (command in passNumParamComm && params.p1 && params.p1.isFloat()) {
-    	therm."$command"(Float.parseFloat(params.p1))	
-    } else if (command in passStringParamComm && params.p1) {
-    	therm."$command"(params.p1)	
-    } else {
-    	httpError(400, "$command is not a valid command")
-    }
-}
-
-void updateWindowShade() {
-    // use the built-in request object to get the command parameter
-    def command = params.command
-	def ws = windowShades.find() { it.id == params.id }
-    if (!ws || !command) {
-    	httpError(400, "invalid id $params.id")
-        return
-    }
-    def passComm = [
-		"open",
-        "close",
-        "presetPosition",
-	]
-    if (command in passComm) {
-    	ws."$command"()		
-    } else {
-    	httpError(400, "$command is not a valid command")
-    }
-}
-// TODO: implement event handlers

smartapps/smartthings/ifttt.src/ifttt.groovy

@@ -131,69 +131,19 @@ def update() {
 	def type = params.deviceType
 	def data = request.JSON
 	def devices = settings[type]
-	def device = settings[type]?.find { it.id == params.id }
 	def command = data.command
 
 	log.debug "[PROD] update, params: ${params}, request: ${data}, devices: ${devices*.id}"
-	
-	if (!device) {
-		httpError(404, "Device not found")
-	} 
-	
-	if (validateCommand(device, type, command)) {
-		device."$command"()
-	} else {
-		httpError(403, "Access denied. This command is not supported by current capability.")
+	if (command) {
+		def device = devices?.find { it.id == params.id }
+		if (!device) {
+			httpError(404, "Device not found")
+		} else {
+			device."$command"()
+		}
 	}
 }
 
-/**
- * Validating the command passed by the user based on capability.
- * @return boolean
- */
-def validateCommand(device, deviceType, command) {
-	def capabilityCommands = getDeviceCapabilityCommands(device.capabilities)
-	def currentDeviceCapability = getCapabilityName(deviceType)
-	if (capabilityCommands[currentDeviceCapability]) {
-		return command in capabilityCommands[currentDeviceCapability] ? true : false
-	} else {
-		// Handling other device types here, which don't accept commands
-		httpError(400, "Bad request.")
-	}
-}
-
-/**
- * Need to get the attribute name to do the lookup. Only
- * doing it for the device types which accept commands
- * @return attribute name of the device type
- */
-def getCapabilityName(type) {
-    switch(type) {
-		case "switches":
-			return "Switch"
-		case "alarms":
-			return "Alarm"
-		case "locks":
-			return "Lock"
-		default:
-			return type
-	}
-}
-
-/**
- * Constructing the map over here of
- * supported commands by device capability
- * @return a map of device capability -> supported commands
- */
-def getDeviceCapabilityCommands(deviceCapabilities) {
-	def map = [:]
-	deviceCapabilities.collect {
-		map[it.name] = it.commands.collect{ it.name.toString() }
-	}
-	return map
-}
-
-
 def show() {
 	def type = params.deviceType
 	def devices = settings[type]