From da42ee63fbce9c9bdba1e2ad7f9936f6db14ff7c Mon Sep 17 00:00:00 2001 From: Christopher Curti Date: Fri, 5 May 2017 09:31:44 -0700 Subject: [PATCH 1/3] 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} --- .../aeon-multisensor-6.src/aeon-multisensor-6.groovy | 4 ++-- .../aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy | 5 ++--- .../smartthings/aeon-multisensor.src/aeon-multisensor.groovy | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy b/devicetypes/smartthings/aeon-multisensor-6.src/aeon-multisensor-6.groovy index 4b194db..4a66773 100644 --- 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) -} +} \ No newline at end of file diff --git a/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy b/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy index 04888d3..43ab4b4 100644 --- a/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy +++ b/devicetypes/smartthings/aeon-multisensor-gen5.src/aeon-multisensor-gen5.groovy @@ -84,7 +84,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:"" @@ -263,5 +263,4 @@ private secure(physicalgraph.zwave.Command cmd) { private secureSequence(commands, delay=200) { delayBetween(commands.collect{ secure(it) }, delay) -} - +} \ No newline at end of file diff --git a/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy b/devicetypes/smartthings/aeon-multisensor.src/aeon-multisensor.groovy index 5d6de58..d54b44c 100644 --- 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() ]) -} +} \ No newline at end of file From c6c4b09fbb7679b2f9e784c12b036e8aaf450106 Mon Sep 17 00:00:00 2001 From: tslagle13 Date: Thu, 11 May 2017 11:06:44 -0700 Subject: [PATCH 2/3] [MSA-1968] - Publish gideon smarthome changes small change to sensor readings --- .../gideon-smart-home.src/gideon-smart-home.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy b/smartapps/gideon-api/gideon-smart-home.src/gideon-smart-home.groovy index a198d72..bea5f9f 100644 --- 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 } - } \ No newline at end of file + } From d4fd778a644c4247745b5910b292cfbf84818116 Mon Sep 17 00:00:00 2001 From: Lars Finander Date: Mon, 15 May 2017 13:25:44 -0600 Subject: [PATCH 3/3] DVCSMP-2656 OpenT2T: Update to 5/15 submission --- .../opent2t-smartapp-test.groovy | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy b/smartapps/opent2t/opent2t-smartapp-test.src/opent2t-smartapp-test.groovy index 24d829c..c1e6bff 100644 --- 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