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-03-09 13:21:53 +00: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
4 changed files with 9 additions and 9 deletions
--- a/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy
+++ b/devicetypes/smartthings/aeon-home-energy-meter-c3.src/aeon-home-energy-meter-c3.groovy
@@ -94,11 +94,11 @@ def parse(String description) {
 	def cmd = zwave.parse(description, [0x31: 1, 0x32: 1, 0x60: 3])
 	if (cmd) {
 		result = createEvent(zwaveEvent(cmd))
-		log.debug "Parse returned ${result?.descriptionText}"
-		storeGraphData(result.name, result.value)
-	} else {
-		log.debug "zwave.parse returned null command. Cannot create event"
 	}
+	log.debug "Parse returned ${result?.descriptionText}"
+
+	storeGraphData(result.name, result.value)
+
 	return result
 }

--- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
+++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy
@@ -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
--- a/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
+++ b/devicetypes/smartthings/zll-dimmer-bulb.src/zll-dimmer-bulb.groovy
@@ -22,8 +22,9 @@ 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"
--- a/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy
+++ b/smartapps/tslagle13/vacation-lighting-director.src/vacation-lighting-director.groovy
@@ -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
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
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