Merge pull request #2005 from SmartThingsCommunity/staging

Rolling up staging to production
Merge pull request #2004 from SmartThingsCommunity/production
2026-03-09 21:03:00 +00:00 · 2017-05-16 14:37:45 -07:00 · 2017-05-16 14:37:15 -07:00 · 2017-05-15 12:31:34 -07:00 · 2017-05-15 13:25:44 -06:00 · 2017-05-11 15:08:13 -07:00
6 changed files with 21 additions and 10 deletions
--- a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy
@@ -103,7 +103,7 @@ metadata {
 		}

 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "illuminance", label:'${currentValue} ${unit}', unit:"lux"
+			state "illuminance", label:'${currentValue} lux', unit:""
 		}

 		valueTile("ultravioletIndex", "device.ultravioletIndex", inactiveLabel: false, width: 2, height: 2) {
@@ -410,4 +410,4 @@ private command(physicalgraph.zwave.Command cmd) {
 private commands(commands, delay=200) {
 	log.info "sending commands: ${commands}"
 	delayBetween(commands.collect{ command(it) }, delay)
-}
+}
--- a/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy
+++ b/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy
@@ -86,7 +86,7 @@ metadata {
 			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
+			state "luminosity", label:'${currentValue} lux', unit:""
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
@@ -282,5 +282,4 @@ private secure(physicalgraph.zwave.Command cmd) {

 private secureSequence(commands, delay=200) {
 	delayBetween(commands.collect{ secure(it) }, delay)
-}
-
+}
--- a/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy
+++ b/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy
@@ -79,7 +79,7 @@ metadata {
 			state "humidity", label:'${currentValue}% humidity', unit:""
 		}
 		valueTile("illuminance", "device.illuminance", inactiveLabel: false, width: 2, height: 2) {
-			state "luminosity", label:'${currentValue} ${unit}', unit:"lux"
+			state "luminosity", label:'${currentValue} lux', unit:""
 		}
 		valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat", width: 2, height: 2) {
 			state "battery", label:'${currentValue}% battery', unit:""
@@ -193,4 +193,4 @@ def configure() {
 		// set data reporting period to 5 minutes
 		zwave.configurationV1.configurationSet(parameterNumber: 111, size: 4, scaledConfigurationValue: 300).format()
 	])
-}
+}
--- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
+++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy
@@ -25,6 +25,7 @@ metadata {

        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B04, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart A19 Soft White"
+        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY A19 ON/OFF/DIM 10 Year", deviceJoinName: "SYLVANIA Smart 10-Year A19"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FF00", outClusters: "0019", manufacturer: "MRVL", model: "MZ100", deviceJoinName: "Wemo Bulb"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, 0B05", outClusters: "0019", manufacturer: "OSRAM SYLVANIA", model: "iQBR30", deviceJoinName: "Sylvania Ultra iQ"
        fingerprint profileId: "0104", inClusters: "0000, 0003, 0004, 0005, 0006, 0008, FC0F", outClusters: "0019", manufacturer: "OSRAM", model: "LIGHTIFY PAR38 ON/OFF/DIM", deviceJoinName: "SYLVANIA Smart PAR38 Soft White"
--- a/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy
+++ b/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy
@@ -765,7 +765,6 @@ def turnOffSwitch() {
        } else {
            
            device.off();
-                  
            return [Device_id: params.id, result_action: "200"]
        }
 }
@@ -789,6 +788,7 @@ def getTempSensorsStatus(id) {
            return []
        } else {
        	def bat = getBatteryStatus(device.id)
-        	return [temperature: device.currentValue('temperature')] + bat
+            def scale = [Scale: location.temperatureScale]
+        	return [temperature: device.currentValue('temperature')] + bat + scale
   		}
-   }
+   }
--- a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
+++ b/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy
@@ -162,6 +162,17 @@ def registerAllDeviceSubscriptions() {
 	registerChangeHandler(inputs)
 }

+//Subscribe to events from a list of devices
+def registerChangeHandler(myList) {
+	myList.each { myDevice ->
+		def theAtts = myDevice.supportedAttributes
+		theAtts.each { att ->
+			subscribe(myDevice, att.name, deviceEventHandler)
+			log.info "Registering for ${myDevice.displayName}.${att.name}"
+		}
+	}
+}
+
 //Endpoints function: Subscribe to events from a specific device
 def registerDeviceChange() {
 	def subscriptionEndpt = params.subscriptionURL
Author	SHA1	Message	Date
Vinay Rao	a4d9cd51a3	Merge pull request #2005 from SmartThingsCommunity/staging Rolling up staging to production	2017-05-16 14:37:45 -07:00
Vinay Rao	9b01a7d8be	Merge pull request #2004 from SmartThingsCommunity/production Rolling down production to staging	2017-05-16 14:37:15 -07:00
Vinay Rao	7cf8bb1917	Merge pull request #1998 from larsfinander/DVCSMP-2656_OpenT2T_Update_to_5_5_submission_staging DVCSMP-2656 OpenT2T: Update to 5/15 submission	2017-05-15 12:31:34 -07:00
Lars Finander	d4fd778a64	DVCSMP-2656 OpenT2T: Update to 5/15 submission	2017-05-15 13:25:44 -06:00
Vinay Rao	d60657e466	Merge pull request #1992 from dkirker/production PROB-1615: Add SYLVANIA Smart 10-Year A19 bulb fingerprint	2017-05-11 15:08:13 -07:00
Donald Kirker	d8dc70ae9e	PROB-1615 Add SYLVANIA Smart 10-Year A19 bulb fingerprint	2017-05-11 14:03:24 -07:00
Vinay Rao	3457bbad42	Merge pull request #1991 from tslagle13/gideon-change [MSA-1968] - Publish gideon smarthome changes	2017-05-11 11:12:30 -07:00
tslagle13	c6c4b09fbb	[MSA-1968] - Publish gideon smarthome changes small change to sensor readings	2017-05-11 11:06:44 -07:00
Vinay Rao	7e25d32c70	Merge pull request #1990 from SmartThingsCommunity/master Rolling up master to staging	2017-05-09 16:04:19 -05:00
Vinay Rao	dd4da29bcd	Merge pull request #1989 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-09 16:03:53 -05:00
Vinay Rao	68f5cda945	Merge pull request #1977 from ccurtiST/PROB-1347 PROB-1347 Lux values showing as ${unit} in recently tab of Aeon Multipurpose	2017-05-05 11:06:46 -07:00
Christopher Curti	da42ee63fb	Replaced `${unit}', unit:"lux"` with `lux', unit: ""` to fix issue with seeing ${unit} in the recently tab of Aeon multisensor illuminance values. Tested all three DTHs and lux was displayed rather then ${unit}	2017-05-05 09:31:44 -07:00
Vinay Rao	c58132a69e	Merge pull request #1974 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-03 11:54:21 -07:00
Vinay Rao	f069ea3087	Merge pull request #1965 from SmartThingsCommunity/staging Rolling down staging to master	2017-05-02 16:14:39 -07:00