Merge pull request #903 from SmartThingsCommunity/staging

Rolling up staging to production Deploy May 17
Merge pull request #901 from dsainteclaire/DVCSMP-1739-revert-untested-code
2026-04-26 14:16:20 +01:00 · 2016-05-17 09:58:29 -07:00 · 2016-05-16 17:28:04 -07:00 · 2016-05-16 17:20:43 -07:00 · 2016-05-16 14:59:22 -07:00 · 2016-05-16 14:54:09 -07:00
20 changed files with 78 additions and 129 deletions
@@ -12,16 +12,6 @@
 *
 */
 
- /*
- *  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"
@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,15 +11,6 @@
 #  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=기기 이름 설정
@@ -14,7 +14,6 @@
 *
 */

-//@Deprecated: Moved to ZLL Dimmer Bulb
 metadata {
    definition (name: "Cree Bulb", namespace: "smartthings", author: "SmartThings") {

@@ -25,7 +24,7 @@ metadata {
        capability "Switch"
        capability "Switch Level"

-        //fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
+        fingerprint profileId: "C05E", inClusters: "0000,0003,0004,0005,0006,0008,1000", outClusters: "0000,0019"
    }

    // simulator metadata
@@ -1,7 +1,7 @@
 /**
 *  GE Link Bulb
 *
- *  Copyright 2014 SmartThings
+ *  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:
@@ -53,6 +53,8 @@ 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
@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not 
@@ -12,15 +11,6 @@
 #  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=기기 이름 설정
@@ -1,5 +1,4 @@
 /*
-===============================================================================
 *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -13,14 +12,6 @@
 *  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 {
@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,14 +11,6 @@
 #  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=기기 이름 설정
@@ -1,5 +1,4 @@
 /*
-===============================================================================
 *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -13,15 +12,8 @@
 *  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") {
@@ -137,6 +129,7 @@ def refresh() {
 }

 def configure() {
+	sendEvent(name: "checkInterval", value: 1200, displayed: false)
 	zigbee.onOffConfig() + powerConfig() + refresh()
 }

@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,14 +11,6 @@
 #  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=건조
@@ -1,5 +1,4 @@
 /*
-===============================================================================
 *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -13,15 +12,6 @@
 *  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 {
@@ -321,6 +311,8 @@ 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 = [
@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,15 +11,6 @@
 #  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=배터리
@@ -1,5 +1,4 @@
 /*
-===============================================================================
 *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -13,15 +12,6 @@
 *  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 {
@@ -333,6 +323,8 @@ 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."

@@ -1,4 +1,3 @@
-#==============================================================================
 #  Copyright 2016 SmartThings
 #
 #  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -12,14 +11,6 @@
 #  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=예
@@ -1,5 +1,4 @@
 /*
-===============================================================================
 *  Copyright 2016 SmartThings
 *
 *  Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -13,15 +12,6 @@
 *  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 {
@@ -451,6 +441,8 @@ def refresh() {
 }

 def configure() {
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)
+
 	String zigbeeEui = swapEndianHex(device.hub.zigbeeEui)
 	log.debug "Configuring Reporting"

@@ -300,6 +300,7 @@ 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."
@@ -252,6 +252,7 @@ def refresh()
 }

 def configure() {
+	sendEvent(name: "checkInterval", value: 7200, displayed: false)

 	log.debug "Configuring Reporting and Bindings."
 	def configCmds = [
@@ -110,7 +110,7 @@ def installed() {
 	sendEvent(name: "multilineText", value: "Line 1 YES\nLine 2 YES\nLine 3 NO")
 }

-def parse() {
+def parse(String description) {
 	// This is a simulated device. No incoming data to parse.
 }

@@ -22,9 +22,12 @@ metadata {
        capability "Switch"
        capability "Switch Level"

-        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019"
-        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019", manufacturer: "CREE", model: "Connected A-19 60W Equivalent", deviceJoinName: "Cree Connected Bulb"
+        //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019"
+        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019"
+        //fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0000,0019", manufacturer: "CREE", model: "Connected A-19 60W Equivalent", deviceJoinName: "Cree Connected Bulb"
        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
+        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "Classic A60 W clear - LIGHTIFY", deviceJoinName: "OSRAM LIGHTIFY LED Smart Connected Light"
+        fingerprint profileId: "C05E", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 1000", outClusters: "0019", manufacturer: "Philips", model: "LWB006", deviceJoinName: "Philips Hue White"
    }

    // simulator metadata
@@ -131,18 +131,68 @@ 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 (command) {
-		def device = devices?.find { it.id == params.id }
+	
 	if (!device) {
 		httpError(404, "Device not found")
-		} else {
+	} 
+	
+	if (validateCommand(device, type, command)) {
 		device."$command"()
+	} else {
+		httpError(403, "Access denied. This command is not supported by current capability.")
 	}
 }
+
+/**
+ * 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
@@ -273,7 +273,7 @@ def scheduleCheck(evt) {
    else {
    	if(people){
        	//don't turn off lights if anyone is home
-        	if(someoneIsHome()){
+        	if(someoneIsHome){
        	    log.debug("Stopping Check for Light")
        	    unschedule()
        	}
Author	SHA1	Message	Date
Vinay Rao	bd0ccd0c21	Merge pull request #903 from SmartThingsCommunity/staging Rolling up staging to production Deploy May 17	2016-05-17 09:58:29 -07:00
Vinay Rao	d34508c19d	Merge pull request #901 from dsainteclaire/DVCSMP-1739-revert-untested-code Undo DVCSMP-1739 Revert "make sure reformat the storeGraphData"	2016-05-16 17:28:04 -07:00
David Sainte-Claire	a8e118fe83	Revert "make sure reformat the storeGraphData" This reverts commit `e1de599668`. Revert "make descriptive comment and add space in else condition" This reverts commit `0e01cbed06`. Revert "null zwave event check in storeGraphData" This reverts commit `8821c68e9c`.	2016-05-16 17:20:43 -07:00
Vinay Rao	072cc066b6	Merge pull request #900 from workingmonk/bug/cree_remove_fingerprint DPROT-94 removing cree fingerprint from zll dimmer until the fix in trim	2016-05-16 14:59:22 -07:00
Vinay Rao	17562c96ae	removing cree fingerprint from zll dimmer until the fix in trim for deviceJoinName	2016-05-16 14:54:09 -07:00
Vinay Rao	3b56fb4a2f	Merge pull request #891 from workingmonk/bug/hotfix_cree_fingerprint DPROT-94 moving the cree specific generic fingerprint back to cree dth	2016-05-16 11:30:50 -07:00
Vinay Rao	cca1eccce6	moving the cree specific generic fingerprint back to cree dth because of cree manufacturerInfo spacing issue	2016-05-12 16:10:05 -07:00
tslagle13	f1e54c8a5c	Merge pull request #872 from tslagle13/fix-vacation-lighting-director-exception fix exception caused by typo	2016-05-11 18:59:00 -07:00
tslagle13	a4a48fddd2	fix exception caused by typo added paren to end of "someoneIsHome" check on accident.	2016-05-11 12:07:03 -07:00
Vinay Rao	2bd18859b9	Merge pull request #870 from SmartThingsCommunity/master Rolling up master to staging for next week's release	2016-05-10 15:44:41 -07:00
Dwight Liu	32f8d2d944	Merge pull request #863 from dwightatsmartthings/DVCSMP-1719-aeon-home-energy-meter-c3-npe-fix null zwave event check in storeGraphData	2016-05-10 14:29:02 -07:00
Dwight Liu	e1de599668	make sure reformat the storeGraphData	2016-05-10 14:23:46 -07:00
Dwight Liu	0e01cbed06	make descriptive comment and add space in else condition	2016-05-10 13:40:52 -07:00
Vinay Rao	566425c531	Merge pull request #869 from SmartThingsCommunity/staging Rolling up staging to production 05-10	2016-05-10 13:40:49 -07:00
Jim Anderson	bf476940e9	Merge pull request #857 from jimmyjames/fix-generic-tile fix parse signature for generic multiattribute example tile	2016-05-09 12:28:27 -05:00
Jack Chi	a219f37035	Merge pull request #835 from jackchi/add-healthcheck-smartsense [CHF-131] Add checkInterval values to SmartSense DTHs	2016-05-07 20:29:55 +08:00
Dwight Liu	8821c68e9c	null zwave event check in storeGraphData	2016-05-06 12:50:02 -07:00
Tom Manley	7571c1b980	Merge pull request #858 from tpmanley/feature/ge_fingerprints DVCSMP-1370: Added fingerprints for GE Link Daylight and SoftWhite bulbs	2016-05-05 23:01:52 -05:00
Tom Manley	bb65c4ce14	Added fingerprints for GE Link Daylight and SoftWhite bulbs Resolves: https://smartthings.atlassian.net/browse/DVCSMP-1370	2016-05-05 22:54:30 -05:00
Jim Anderson	69ae9973da	fix parse signature for generic multiattribute example tile	2016-05-05 15:36:08 -05:00
rohandesai	36c0af82fe	Merge pull request #843 from rohandesai/rohan/PENG-157 Fixing the security issue in the IFTTT SmartApp	2016-05-04 16:52:47 -07:00
Rohan Desai	eba1f16ee1	added changes to address security loophole in the IFTTT app addressed comments PENG-157 IFTTT should not allow undefined commands - added changes to address security loophole in the IFTTT app - addressed comments - removed an extra whitespace	2016-05-04 11:54:08 -07:00
Vinay Rao	f397691fdb	Merge pull request #856 from workingmonk/bug/unnecessary_logs DVCSMP-1748 Remove unncessary changelog from the file header	2016-05-04 11:52:51 -07:00
Vinay Rao	9a5be2c5db	remove unncessary changelog from the file header	2016-05-04 11:49:59 -07:00
Vinay Rao	39ac9f9a8c	Merge pull request #854 from workingmonk/feature/osram_fingerprint INTL-532 Adding additional osram fingerprint	2016-05-04 10:19:03 -07:00
Vinay Rao	c353eeae17	adding additional osram fingerprint	2016-05-04 09:52:07 -07:00
Vinay Rao	e7448e7908	Merge pull request #848 from SmartThingsCommunity/master Rolling up master to staging	2016-05-03 10:59:58 -07:00
Vinay Rao	973c16f088	Merge pull request #842 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-05-03 Release	2016-05-03 10:20:53 -07:00
Vinay Rao	e278a3b57d	Merge pull request #838 from SmartThingsCommunity/master Rolling up master to staging	2016-04-26 11:34:03 -07:00
Vinay Rao	b05d956d95	Merge pull request #830 from SmartThingsCommunity/staging Rolling up changes to production from staging 2016-04-26 Release	2016-04-26 10:59:05 -07:00
jackchi	d9f224fa6e	[CHF-131] Add checkInterval values to SmartSense DTHs	2016-04-25 13:21:28 -07:00