From 6448a5bc7cd9f03853e8591b07a884befcf96d03 Mon Sep 17 00:00:00 2001 From: Vinay Rao Date: Wed, 12 Apr 2017 16:51:44 -0700 Subject: [PATCH 1/5] adding centralite zigbee button fingerprint number of button handling --- .../zigbee-button.src/zigbee-button.groovy | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy b/devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy index f3e04f1..f7e2064 100644 --- a/devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy +++ b/devicetypes/smartthings/zigbee-button.src/zigbee-button.groovy @@ -28,6 +28,7 @@ metadata { command "enrollResponse" fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "OSRAM", model: "LIGHTIFY Dimming Switch", deviceJoinName: "OSRAM LIGHTIFY Dimming Switch" + fingerprint inClusters: "0000, 0001, 0003, 0020, 0402, 0B05", outClusters: "0003, 0006, 0008, 0019", manufacturer: "CentraLite", model: "3130", deviceJoinName: "Centralite Zigbee Smart Switch" //fingerprint inClusters: "0000, 0001, 0003, 0020, 0500", outClusters: "0003,0019", manufacturer: "CentraLite", model: "3455-L", deviceJoinName: "Iris Care Pendant" fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0402, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model: "3460-L", deviceJoinName: "Iris Smart Button" fingerprint inClusters: "0000, 0001, 0003, 0007, 0020, 0B05", outClusters: "0003, 0006, 0019", manufacturer: "CentraLite", model:"3450-L", deviceJoinName: "Iris KeyFob" @@ -251,12 +252,19 @@ def initialize() { if ((device.getDataValue("manufacturer") == "OSRAM") && (device.getDataValue("model") == "LIGHTIFY Dimming Switch")) { sendEvent(name: "numberOfButtons", value: 2) } - else if ((device.getDataValue("manufacturer") == "CentraLite") && - ((device.getDataValue("model") == "3455-L") || (device.getDataValue("model") == "3460-L"))) { - sendEvent(name: "numberOfButtons", value: 1) - } - else if ((device.getDataValue("manufacturer") == "CentraLite") && (device.getDataValue("model") == "3450-L")) { - sendEvent(name: "numberOfButtons", value: 4) + else if (device.getDataValue("manufacturer") == "CentraLite") { + if (device.getDataValue("model") == "3130") { + sendEvent(name: "numberOfButtons", value: 2) + } + else if ((device.getDataValue("model") == "3455-L") || (device.getDataValue("model") == "3460-L")) { + sendEvent(name: "numberOfButtons", value: 1) + } + else if (device.getDataValue("model") == "3450-L") { + sendEvent(name: "numberOfButtons", value: 4) + } + else { + sendEvent(name: "numberOfButtons", value: 4) //default case. can be changed later. + } } else { //default. can be changed From fc320315552d10237cfa15e9ebabef20f455094a Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Wed, 19 Apr 2017 18:25:21 -0700 Subject: [PATCH 2/5] Move revision history to README.md --- devicetypes/drzwave/ezmultipli.src/.st-ignore | 2 + devicetypes/drzwave/ezmultipli.src/README.md | 45 +++++++++++++++++++ .../drzwave/ezmultipli.src/ezmultipli.groovy | 21 --------- 3 files changed, 47 insertions(+), 21 deletions(-) create mode 100644 devicetypes/drzwave/ezmultipli.src/.st-ignore create mode 100644 devicetypes/drzwave/ezmultipli.src/README.md diff --git a/devicetypes/drzwave/ezmultipli.src/.st-ignore b/devicetypes/drzwave/ezmultipli.src/.st-ignore new file mode 100644 index 0000000..f78b46e --- /dev/null +++ b/devicetypes/drzwave/ezmultipli.src/.st-ignore @@ -0,0 +1,2 @@ +.st-ignore +README.md diff --git a/devicetypes/drzwave/ezmultipli.src/README.md b/devicetypes/drzwave/ezmultipli.src/README.md new file mode 100644 index 0000000..f7fc0da --- /dev/null +++ b/devicetypes/drzwave/ezmultipli.src/README.md @@ -0,0 +1,45 @@ +# Express Controls EZMultiPli + +Cloud Execution + +Works with: + +* [Express Controls EZMultiPli](https://www.smartthings.com/works-with-smartthings/) + +## Table of contents + +* [Release Notes](#releasenotes) +* [Capabilities](#capabilities) +* [Troubleshooting](#troubleshooting) + +## Release Notes + +* 2017-04-10 - DrZwave (with help from Donald Kirker) - changed fingerprint to the new format, lowered the OnTime and other parameters to be "more in line with ST user expectations", get the luminance in LUX so it reports in lux all the time. +* 2016-10-06 - erocm1231 - Added "updated" method to run when configuration options are changed. Depending on model of unit, luminance is being reported as a relative percentace or as a lux value. Added the option to configure this in the handler. +* 2016-01-28 - erocm1231 - Changed the configuration method to use scaledConfiguration so that it properly formatted negative numbers. Also, added configurationGet and a configurationReport method so that config values can be verified. +* 2015-12-04 - erocm1231 - added range value to preferences as suggested by @Dela-Rick. +* 2015-11-26 - erocm1231 - Fixed null condition error when adding as a new device. +* 2015-11-24 - erocm1231 - Added refresh command. Made a few changes to how the handler maps colors to the LEDs. Fixed the device not having its on/off status updated when colors are changed. +* 2015-11-23 - erocm1231 - Changed the look to match SmartThings v2 devices. +* 2015-11-21 - erocm1231 - Made code much more efficient. Also made it compatible when setColor is passed a hex value. Mapping of special colors: Soft White - Default - Yellow, White - Concentrate - White, Daylight - Energize - Teal, Warm White - Relax - Yellow +* 2015-11-19 - erocm1231 - Fixed a couple incorrect colors, changed setColor to be more compatible with other apps +* 2015-11-18 - erocm1231 - Added to setColor for compatibility with Smart Lighting +* v0.1.0 - DrZWave - chose better icons, Got color LED to work - first fully functional version +* v0.0.9 - jrs - got the temp and luminance to work. Motion works. Debugging the color wheel. +* v0.0.8 - DrZWave 2/25/2015 - change the color control to be tiles since there are only 8 colors. +* v0.0.7 - jrs - 02/23/2015 - Jim Sulin + +## Capabilities + +* **Actuator** - represents that a Device has commands +* **Sensor** - detects sensor events +* **Motion Sensor** - can detect motion +* **Temperature Measurement** - defines device measures current temperature +* **Illuminance Measurement** - gives the illuminance reading from devices that support it +* **Switch** - can detect state (possible values: on/off) +* **Color Control** - represents that the color attributes of a device can be controlled (hue, saturation, color value +* **Configuration** - configure() command called when device is installed or device preferences updated +* **Refresh** - refresh() command for status updates + +## Troubleshooting + diff --git a/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy b/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy index f86774d..cd034cf 100644 --- a/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy +++ b/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy @@ -2,27 +2,6 @@ // Motion Sensor - Temperature - Light level - 8 Color Indicator LED - Z-Wave Range Extender - Wall Powered // driver for SmartThings // The EZMultiPli is also known as the HSM200 from HomeSeer.com -// -// 2017-04-10 - DrZwave (with help from Don Kirker) - changed fingerprint to the new format, lowered the OnTime -// and other parameters to be "more in line with ST user expectations", get the luminance in LUX so it reports in lux all the time. -// 2016-10-06 - erocm1231 - Added "updated" method to run when configuration options are changed. Depending on model of unit, luminance is being -// reported as a relative percentace or as a lux value. Added the option to configure this in the handler. -// 2016-01-28 - erocm1231 - Changed the configuration method to use scaledConfiguration so that it properly formatted negative numbers. -// Also, added configurationGet and a configurationReport method so that config values can be verified. -// 2015-12-04 - erocm1231 - added range value to preferences as suggested by @Dela-Rick. -// 2015-11-26 - erocm1231 - Fixed null condition error when adding as a new device. -// 2015-11-24 - erocm1231 - Added refresh command. Made a few changes to how the handler maps colors to the LEDs. Fixed -// the device not having its on/off status updated when colors are changed. -// 2015-11-23 - erocm1231 - Changed the look to match SmartThings v2 devices. -// 2015-11-21 - erocm1231 - Made code much more efficient. Also made it compatible when setColor is passed a hex value. -// Mapping of special colors: Soft White - Default - Yellow, White - Concentrate - White, -// Daylight - Energize - Teal, Warm White - Relax - Yellow -// 2015-11-19 - erocm1231 - Fixed a couple incorrect colors, changed setColor to be more compatible with other apps -// 2015-11-18 - erocm1231 - Added to setColor for compatibility with Smart Lighting -// v0.1.0 - DrZWave - chose better icons, Got color LED to work - first fully functional version -// v0.0.9 - jrs - got the temp and luminance to work. Motion works. Debugging the color wheel. -// v0.0.8 - DrZWave 2/25/2015 - change the color control to be tiles since there are only 8 colors. -// v0.0.7 - jrs - 02/23/2015 - Jim Sulin metadata { definition (name: "EZmultiPli", namespace: "DrZWave", author: "Eric Ryherd", oauth: true) { From c864fc521e648f07cb9a9edda8d95f3735142525 Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Wed, 19 Apr 2017 19:48:48 -0700 Subject: [PATCH 3/5] DVCSMP-2585 Fix NullPointerException when pairing because color is unset Also tweak default config values in config value range checking (affects initial pairing of device) --- devicetypes/drzwave/ezmultipli.src/README.md | 33 +++++++++---------- .../drzwave/ezmultipli.src/ezmultipli.groovy | 16 ++++----- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/devicetypes/drzwave/ezmultipli.src/README.md b/devicetypes/drzwave/ezmultipli.src/README.md index f7fc0da..fa28c7c 100644 --- a/devicetypes/drzwave/ezmultipli.src/README.md +++ b/devicetypes/drzwave/ezmultipli.src/README.md @@ -1,33 +1,32 @@ # Express Controls EZMultiPli -Cloud Execution - Works with: * [Express Controls EZMultiPli](https://www.smartthings.com/works-with-smartthings/) ## Table of contents -* [Release Notes](#releasenotes) +* [Release Notes](#release-notes) * [Capabilities](#capabilities) * [Troubleshooting](#troubleshooting) ## Release Notes -* 2017-04-10 - DrZwave (with help from Donald Kirker) - changed fingerprint to the new format, lowered the OnTime and other parameters to be "more in line with ST user expectations", get the luminance in LUX so it reports in lux all the time. -* 2016-10-06 - erocm1231 - Added "updated" method to run when configuration options are changed. Depending on model of unit, luminance is being reported as a relative percentace or as a lux value. Added the option to configure this in the handler. -* 2016-01-28 - erocm1231 - Changed the configuration method to use scaledConfiguration so that it properly formatted negative numbers. Also, added configurationGet and a configurationReport method so that config values can be verified. -* 2015-12-04 - erocm1231 - added range value to preferences as suggested by @Dela-Rick. -* 2015-11-26 - erocm1231 - Fixed null condition error when adding as a new device. -* 2015-11-24 - erocm1231 - Added refresh command. Made a few changes to how the handler maps colors to the LEDs. Fixed the device not having its on/off status updated when colors are changed. -* 2015-11-23 - erocm1231 - Changed the look to match SmartThings v2 devices. -* 2015-11-21 - erocm1231 - Made code much more efficient. Also made it compatible when setColor is passed a hex value. Mapping of special colors: Soft White - Default - Yellow, White - Concentrate - White, Daylight - Energize - Teal, Warm White - Relax - Yellow -* 2015-11-19 - erocm1231 - Fixed a couple incorrect colors, changed setColor to be more compatible with other apps -* 2015-11-18 - erocm1231 - Added to setColor for compatibility with Smart Lighting -* v0.1.0 - DrZWave - chose better icons, Got color LED to work - first fully functional version -* v0.0.9 - jrs - got the temp and luminance to work. Motion works. Debugging the color wheel. -* v0.0.8 - DrZWave 2/25/2015 - change the color control to be tiles since there are only 8 colors. -* v0.0.7 - jrs - 02/23/2015 - Jim Sulin +* **2017-04-19** - _dkirker_ - Update default config values in config value range check functions, use lux if lum option is null, fix NullPointerException on initial pairing when color data has not been set (and set the default color data!) +* **2017-04-10** - _DrZwave_ (with help from Donald Kirker) - changed fingerprint to the new format, lowered the OnTime and other parameters to be "more in line with ST user expectations", get the luminance in LUX so it reports in lux all the time. +* **2016-10-06** - _erocm1231_ - Added "updated" method to run when configuration options are changed. Depending on model of unit, luminance is being reported as a relative percentace or as a lux value. Added the option to configure this in the handler. +* **2016-01-28** - _erocm1231_ - Changed the configuration method to use scaledConfiguration so that it properly formatted negative numbers. Also, added configurationGet and a configurationReport method so that config values can be verified. +* **2015-12-04** - _erocm1231_ - added range value to preferences as suggested by @Dela-Rick. +* **2015-11-26** - _erocm1231_ - Fixed null condition error when adding as a new device. +* **2015-11-24** - _erocm1231_ - Added refresh command. Made a few changes to how the handler maps colors to the LEDs. Fixed the device not having its on/off status updated when colors are changed. +* **2015-11-23** - _erocm1231_ - Changed the look to match SmartThings v2 devices. +* **2015-11-21** - _erocm1231_ - Made code much more efficient. Also made it compatible when setColor is passed a hex value. Mapping of special colors: Soft White - Default - Yellow, White - Concentrate - White, Daylight - Energize - Teal, Warm White - Relax - Yellow +* **2015-11-19** - _erocm1231_ - Fixed a couple incorrect colors, changed setColor to be more compatible with other apps +* **2015-11-18** - _erocm1231_ - Added to setColor for compatibility with Smart Lighting +* **v0.1.0** - _DrZWave_ - chose better icons, Got color LED to work - first fully functional version +* **v0.0.9** - _jrs_ - got the temp and luminance to work. Motion works. Debugging the color wheel. +* **v0.0.8** - _DrZWave_ 2/25/2015 - change the color control to be tiles since there are only 8 colors. +* **v0.0.7** - _jrs_ - 02/23/2015 - Jim Sulin ## Capabilities diff --git a/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy b/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy index cd034cf..879580a 100644 --- a/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy +++ b/devicetypes/drzwave/ezmultipli.src/ezmultipli.groovy @@ -110,7 +110,6 @@ metadata { } // end metadata - // Parse incoming device messages from device to generate events def parse(String description){ //log.debug "==> New Zwave Event: ${description}" @@ -124,7 +123,7 @@ def parse(String description){ def statusTextmsg = "" if (device.currentState('temperature') != null && device.currentState('illuminance') != null) { - statusTextmsg = "${device.currentState('temperature').value} ° - ${device.currentState('illuminance').value} ${(lum == "" || lum == null || lum == 1) ? "%" : "LUX"}" + statusTextmsg = "${device.currentState('temperature').value} ° - ${device.currentState('illuminance').value} ${(lum == 1) ? "%" : "LUX"}" sendEvent("name":"statusText", "value":statusTextmsg, displayed:false) } if (result != [null] && result != []) log.debug "Parse returned ${result}" @@ -147,7 +146,7 @@ def zwaveEvent(physicalgraph.zwave.commands.sensormultilevelv5.SensorMultilevelR break; case 0x03 : // SENSOR_TYPE_LUMINANCE_VERSION_1 map.value = cmd.scaledSensorValue.toInteger().toString() - if(lum == "" || lum == null || lum == 1) map.unit = "%" + if(lum == 1) map.unit = "%" else map.unit = "lux" map.name = "illuminance" log.debug "Luminance report" @@ -182,7 +181,8 @@ def zwaveEvent(physicalgraph.zwave.commands.notificationv3.NotificationReport cm } def zwaveEvent(physicalgraph.zwave.commands.basicv1.BasicReport cmd) { - if (cmd.value == 0 && device.latestState("color").value != "#ffffff") { + // The EZMultiPli sets the color back to #ffffff on "off" or at init, so update the ST device to reflect this. + if (device.latestState("color") == null || (cmd.value == 0 && device.latestState("color").value != "#ffffff")) { sendEvent(name: "color", value: "#ffffff", displayed: true) } [name: "switch", value: cmd.value ? "on" : "off", type: "digital"] @@ -275,12 +275,12 @@ def zwaveEvent(physicalgraph.zwave.Command cmd) { // ensure we are passing acceptable param values for LiteMin & TempMin configs def checkLiteTempInput(value) { if (value == null) { - value=60 + value=6 } def liteTempVal = value.toInteger() switch (liteTempVal) { case { it < 0 }: - return 60 // bad value, set to default + return 6 // bad value, set to default break case { it > 127 }: return 127 // bad value, greater then MAX, set to MAX @@ -293,12 +293,12 @@ def checkLiteTempInput(value) { // ensure we are passing acceptable param value for OnTime config def checkOnTimeInput(value) { if (value == null) { - value=10 + value=2 } def onTimeVal = value.toInteger() switch (onTimeVal) { case { it < 0 }: - return 10 // bad value set to default + return 2 // bad value set to default break case { it > 127 }: return 127 // bad value, greater then MAX, set to MAX From 6a76a8ee39085089d273086477e0ba91090ae286 Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Mon, 24 Apr 2017 11:07:51 -0700 Subject: [PATCH 4/5] DVCSMP-2598 Fix start_time and end_time date range Add descriptive error for Wattvision API errors --- .../wattvision-manager.groovy | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy b/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy index ad81049..fbb8034 100644 --- a/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy +++ b/smartapps/smartthings/wattvision-manager.src/wattvision-manager.groovy @@ -136,10 +136,20 @@ def getDataForChild(child, startDate, endDate) { def wattvisionURL = wattvisionURL(child.deviceNetworkId, startDate, endDate) if (wattvisionURL) { - httpGet(uri: wattvisionURL) { response -> - def json = new org.json.JSONObject(response.data.toString()) - child.addWattvisionData(json) - return "success" + try { + httpGet(uri: wattvisionURL) { response -> + def json = new org.json.JSONObject(response.data.toString()) + child.addWattvisionData(json) + return "success" + } + } catch (groovyx.net.http.HttpResponseException httpE) { + log.error "Wattvision getDataForChild HttpResponseException: ${httpE} -> ${httpE.response.data}" + //log.debug "wattvisionURL = ${wattvisionURL}" + return "fail" + } catch (e) { + log.error "Wattvision getDataForChild General Exception: ${e}" + //log.debug "wattvisionURL = ${wattvisionURL}" + return "fail" } } } @@ -164,9 +174,14 @@ def wattvisionURL(senorId, startDate, endDate) { if (diff > 259200000) { // 3 days in milliseconds // Wattvision only allows pulling 3 hours of data at a time startDate = new Date(hours: endDate.hours - 3) + } else if (diff < 10000) { // 10 seconds in milliseconds + // Wattvision throws errors when the difference between start_time and end_time is 5 seconds or less + // So we are going to make sure that we have a few more seconds of breathing room + use (groovy.time.TimeCategory) { + startDate = endDate - 10.seconds + } } - def params = [ "sensor_id" : senorId, "api_id" : wattvisionApiAccess.id, @@ -480,4 +495,3 @@ def connectionSuccessful(deviceName, iconSrc) { render contentType: 'text/html', data: html } - From 7820b39b2b49e92be0182296fa5ff142cf4d49b6 Mon Sep 17 00:00:00 2001 From: Donald Kirker Date: Tue, 25 Apr 2017 03:18:54 -0700 Subject: [PATCH 5/5] DVCSMP-2579 Move Centralite Door/Window sensor from multi-sensor DTH to open-closed-sensor DTH. --- .../smartsense-multi-sensor.src/smartsense-multi-sensor.groovy | 1 - .../smartsense-open-closed-sensor.groovy | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy index 62a7fc3..8229414 100644 --- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy +++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy @@ -33,7 +33,6 @@ metadata { fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3320" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05,FC02", outClusters: "0019", manufacturer: "CentraLite", model: "3321-S", deviceJoinName: "Multipurpose Sensor" - fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3323-G", deviceJoinName: "Centralite Micro Door Sensor" fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500,FC02", outClusters: "0019", manufacturer: "SmartThings", model: "multiv4", deviceJoinName: "Multipurpose Sensor" attribute "status", "string" diff --git a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy index fc08a0a..45ea1c0 100644 --- a/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy +++ b/devicetypes/smartthings/smartsense-open-closed-sensor.src/smartsense-open-closed-sensor.groovy @@ -31,6 +31,7 @@ metadata { fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300-S" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3300" fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3320-L", deviceJoinName: "Iris Contact Sensor" + fingerprint inClusters: "0000,0001,0003,0020,0402,0500,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3323-G", deviceJoinName: "Centralite Micro Door Sensor" } simulator {