Skip to content

Commit

Permalink
test merge (#1)
Browse files Browse the repository at this point in the history
* [ICP-6467] Fixing bug with no added child devices (SmartThingsCommunity#3570)

* Fixing bug with no added child devices.

* Send endPointGet instead of manufacturerSpecific on updated()

* More specific fingerprint.

* Re-commit, only changes new fingerprint for "RealitySwitch" and "RealitySwitch Plus".

* WWST-1508 Add Philio Multi-sound Siren (SmartThingsCommunity#3580)

* WWST-1508 Add Philio Multi-sound Siren

* Add some improvements for event handling. Support Sensor Binary Report

* Make some checks explicit
Only 1 health check command

* ICP-6205 Fix RGB<->HSV converion for Z-Wave color bulbs (SmartThingsCommunity#3583)

This has been broken. Seemingly due to assuming that computer modulo and mathematical modulo are the same wrt negative numbers. They're not. Also we get to use some nice utility functons that someone wrote but never used.

* Zigbee Lock: Removed extra cluster from Schlage BE468 fingerprint

The FC57 cluster is not in the production firmware.

https://smartthings.atlassian.net/browse/WWST-1644

* ICP-6205 Fix RGB<->HSV converion for Z-Wave color bulbs (SmartThingsCommunity#3587)

fixes build

* Zigbee Multi Switch: Make sure child device is not a component

Using componentName when creating child devices causes it to be a component.
Multi-component devices aren't fully supported right now so we need it to
just be a regular child device.

https://smartthings.atlassian.net/browse/ICP-6317

* ICP-6497 Neo Coolcam Dual Switch: added refresh support to second endpoint (SmartThingsCommunity#3582)

* ICP-6497 added refresh support to second endpoint

* WWST-1641 August Smart Lock Pro fingerprint

This device has contact sensor functionality that we will add support for at a later date.

* WWST-1402 Add discrete Thermostat capabilties to have Zen work with u… (SmartThingsCommunity#3556)

* WWST-1402 Add discrete Thermostat capabilties to have Zen work with ui metadata

* WWST-1402 Zen Thermostat adjustments to work with OneApp

Shortens the timeout before collecting UI events to change setpoints
Automatically sends updated setpoint event when we send the zigbee command, since we never waited for confirmation previously

* ICP-6497 Neo Coolcam Dual Switch: added refresh support to second endpoint (SmartThingsCommunity#3582)

* ICP-6497 added refresh support to second endpoint

* Fix Pabal parameter name

* Revert "ICP-6497 Neo Coolcam Dual Switch: added refresh support to second endpoint (SmartThingsCommunity#3582)"

This reverts commit 2b63e3c.

* [WWST-1611] New fingerprint for Zigbee Thermostat - KONOz Lux Thermostat. (SmartThingsCommunity#3584)

* New fingerprint for Zigbee Thermostat - KONOz Lux Thermostat.

* Implemented Battery handler and other suggested changes.

* Improved gathering information about power source.

* ICP-6497 Initial status for Neo Coolcam dual switch endpoint 2

* ICP-6497 Initial status for Neo Coolcam dual switch endpoint 2 (SmartThingsCommunity#3610)

* ICP-6497 Initial status for Neo Coolcam dual switch endpoint 2 (SmartThingsCommunity#3604)

* ICP-6497 Initial status for Neo Coolcam dual switch endpoint 2

* Update zwave-dual-switch.groovy

* Adding a fingerprint for a RGBgenie ZW-1001 Z-Wave Dimmer controller

Adding a fingerprint for a RGBgenie ZW-1001 Z-Wave Dimmer controller.   http://www.rgbgenie.com/ 

Raw Description 	zw:Ls type:1101 mfr:0330 prod:0201 model:D002 ver:1.03 zwv:4.61 lib:03 cc:5E,55,6C,98,9F role:05 ff:8600 ui:8600

* [WWST-1632; WWST-1642; WWST-1515] Fingerprint for Trane Thermostat (SmartThingsCommunity#3600)

* Added fingerprint for Trane Thermostat

* Removed 'emergency heat' from supported modes.

* Added fingerprint for Trane XR524 and American Standard 624

* Add fingerprint for BeSense door window sensor (SmartThingsCommunity#3612)

* WWST-1618 added fingerprint for Satco 86-100 Plug-In Appliance Module (SmartThingsCommunity#3575)

* Add device type for samsung smart doorlock

* WWST-1618 added fingerprint for Satco 86-100 Plug-In Appliance Module (SmartThingsCommunity#3575) (SmartThingsCommunity#3616)

* ICP-6841 Edited configuration for Ecolink Zigbee Water/Freeze Sensor (SmartThingsCommunity#3613)

Aim is to reduce strange battery drain we were seeing. Arrived at these changes after consultation with Ecolink.

* WWST-1624 Add Sengled Element bulb with motion sensor

* [ICP-6819] GoControl - watts update automatically every 15 mins. ICP-6819 fix. (SmartThingsCommunity#3602)

* Watts update automatically every 15 mins. ICP-6819 fix.

* Adjusted parameter 13 to refresh kWh every 15 mins.

* ICP-6760 Add offlinePingable to parent and child dual switch (SmartThingsCommunity#3621)

* [WWST-1751] Adding fingerprint Centralite 4-Series Smart Outlet - 4200-C (SmartThingsCommunity#3622)

* Replace spaces to tabs

*  Add Centralite Smart Outlet fingerprint

* ONEAPP-8001 Fan controller returns floats instead of ints (SmartThingsCommunity#3624)

* ONEAPP-8001 Fan controller returns floats instead of ints

* ICP-6760 Add offlinePingable to parent and child dual switch (SmartThingsCommunity#3621)

* ICP-6886 Set checkInterval for Lux Konoz thermostat (SmartThingsCommunity#3627)

* [ICP-5930] Fix for Ecolink Door/Window Sensor battery report (SmartThingsCommunity#3603)

* Fix for Ecolink Door/Window Sensor correct battery report

* Better looking binding

* WWST-1822 added fingerprint for Aurora Smart Dimmable A1GSZ9E/27 (SmartThingsCommunity#3630)

* WWST-1828 WWST-1829 WWST-1830 WWST-1831

Fingerprints for various rgb(w) bulbs

* ICP-6798 Add Tamper Alert to Zwave Motion Sensor (SmartThingsCommunity#3619)

* ICP-6798 Add Tamper Alert to Zwave Motion Sensor

Most devices don't even send this so they'll always remain clear, but the BeSense does.

* Clear tamper after 10s to work around gap in local execution handling.

* WWST-1731 Zigbee Valve power source strings (SmartThingsCommunity#3634)

* WWST-1731 Zigbee Valve power source strings

I don't think OneApp handles capital letters

* this is still capitalized in appengine, so this fix is necessary for the time being.

* ICP-6885 Fixes error setting color when hue is 0 (SmartThingsCommunity#3633)

* ICP-6885 Fixes error setting color when hue is 0

Issue arises because null and 0 are both treated as false

* remove null checks

* WWST-1594 Fix 'pressed' => 'pushed'

* ICP-6903 Update Aeon LED bulb legacy DTH (SmartThingsCommunity#3642)

Modernizes device tiles. Switches color temperature to use Kelvin instead of %

* WWST-1624 Add enrollResponse() to configure()

While it isn't necessary to handle the "enroll request" message in parse(), we do need to send an enrollResponse() to the bulb in order to receive the motion events.

* WWST-1886 WWST-1884 Add Yale Lever Door Lock Fingerprints

* remove orvibo vendor name

* WWST-1885 Add Yale Zigbee Lock fingerprint

* WWST-1633 - Yale Siren (with Tamper Alert capability) in generic zwave-siren DTH (SmartThingsCommunity#3594)

* WWST-1633 - 

* Yale Siren (with Tamper Alert capability) moved to generic zwave-siren DTH

* tamper clear workaround

* WWST-1826 added fingerprint for Aurora Smart Tunable GLS Lamp (SmartThingsCommunity#3645)

* WWST-1807 Generic DTH for Z-Wave Motion/Temp/Light Sensor (SmartThingsCommunity#3658)

Adds fingerprint for Aeotec Tri-sensor

* WWST-1825 added fingerprint for Aurora Smart Dimmable GU10 (SmartThingsCommunity#3646)

* WWST-1825 added fingerprint for Aurora Smart Dimmable GU10

* WWST-1825 deleted fingerprint from wrong DTH and add to correct DTH for Aurora Smart Tunable GLS Lamp

* [WWST-1820 WWST-1821 WWST-1823 WWST-1824] Fingerprints for AOne bulbs (SmartThingsCommunity#3657)

* Added fingerprints for couple of Aurora's AOne light bulbs.

* WWST-1877 Add fingerprint to Yale Assure Lock - YRD-ZWM-1 (SmartThingsCommunity#3663)

* WWST-1878 Add fingerprint to Yale Assure Lock - YRD-ZWM-1 (SmartThingsCommunity#3664)

* WWST-1619 Add fingerprint to Satco 81-101 Plugin dimmer (SmartThingsCommunity#3665)

* WWST-1878 Add fingerprint to Yale Assure Lock - YRD-ZWM-1 (SmartThingsCommunity#3664)

* WWST-1619 Add fingerprint to Satco 81-101 Plugin dimmer (SmartThingsCommunity#3665)

* WWST-1877 Add fingerprint to Yale Assure Lock - YRD-ZWM-1 (SmartThingsCommunity#3663)

* [WWST-1820 WWST-1821 WWST-1823 WWST-1824] Fingerprints for AOne bulbs (SmartThingsCommunity#3657)

* Added fingerprints for couple of Aurora's AOne light bulbs.

* Fix to fingerprint. (SmartThingsCommunity#3672)

* Wwst-989 Add Ikea TRADFRI bulb E14 W op/ch 400lm fingerprint (SmartThingsCommunity#3673)

* WWST-989 add ikea TRADFRI bulb E14 W op/ch 400lm fingerprint

* Fingerprints for Aeotec Door/Window Sensor and LED Bulbs. (SmartThingsCommunity#3677)

Only Fingerprint change. Look ok.

* WWST-1807 Changing configuration for Aeotec TriSensor to update motion detection status in 30 seconds. (SmartThingsCommunity#3678)

* WWST-1595 Add buttonNumber to button events (SmartThingsCommunity#3680)

* [WWST-1613] Including fingerprint for Ozom Smart Plug (SmartThingsCommunity#3681)

* [WWST-1613] Including fingerprint for Ozom Smart Plug

* ICP-6568 Fix exception in Aeon Home Energy Meter gen5 (SmartThingsCommunity#3679)

* ICP-6568 Fix exception in Aeon Home Energy Meter gen5

* ICP-6568 Fix exception in Aeon Home Energy Meter gen5 (SmartThingsCommunity#3679) (SmartThingsCommunity#3683)

* ICP-6568 Fix exception in Aeon Home Energy Meter gen5

* WWST-1510 Add Stelpro Ki Zigbee Thermostat

* WWST-1511 Add Stelpro Maestro thermostat

* [Zigbee Dimmer/Switch Power] Fix loss of manual control over GE/Jasco switches (SmartThingsCommunity#3685)

https://smartthings.atlassian.net/browse/PROB-2187

* ICP-7041 Remove false isStateChange from Zigbee Accessory Dimmer initial events (SmartThingsCommunity#3686)

* Added Mobile Presence Occupancy DTH

* [ICP-7144] Zigbee Valve checkinterval fix (SmartThingsCommunity#3684)

* Fix for lack of check-in interval.

* ping()

* Changing ping to contain only onOffRefresh()

* WWST-1997 Schlage fingerprints (SmartThingsCommunity#3695)

* Modified description about Mobile Presence Occupancy  (SmartThingsCommunity#3697)

* Modified description about OccupancySensor

* Applied translate sense and modified indent

* [WWST-1616] Added fingerprint for Ozom RGBW bulb (SmartThingsCommunity#3698)

* Feature/selectableenergyreadings (SmartThingsCommunity#3592)

* Added curb bridge to smartthingspublic

* untabified, appsettings used

* switched to 1 minute interval

* took out historical data

* took out a rouge }

* Added Energy Monitor with load controller and thermostat controls

* added historical again, added refresh tokens, added better state restore logic

* switches intelligently generate default values

* syntax error

* typo

* it works!

* fixed the error messages popping up in the live logging window

* added 1m resolution, got rid of erraneous error messages

* took out unnecessary debug messages

* added all the different energy timeintervals

* finishing touches on the curb app

* Took out a debug statement

* reduced api endpoints to only have single power/energy values

* tabs to spaces

* fixed atomicstate looping

* initial commit

* wrong app :) -- fixed

* it's done!

* removed unnecessary logs and options

* changed some copy

* controller state was being reset even if the previous state wasn't throttling

* added consumption fallback to mains arithmetic

* gracefully handle has production and has mains

* changed atomicstate to state. Added fallback device creation

* fixing issues of having no mains and line-side production

* cleanup all applications for submission

* cleaned up error handling with notifications

* Fixing Ingvar's code review issues

* Ignoring Net and Consumption in the manager push notifications

* fixes for smartapp

* cleanup and mains handling

* kwh for production and consumption totals

* fixes from review

* refresh token issue

* made serverUrl settable

* casting to float twice for kwh

* sync token callbacks to async

* Select Energy Interval

* defaults to Hour

* Added Fifteen Minutes

* Add Third Reality Light to zigbee-white-color-temperature-bulb.

* [WWST-1617] Including figerprint to Ozom Bulb GU10 White (SmartThingsCommunity#3704)

* WWST-1981 Add fingerprint for Leedarson A19 Dimmable White Smart LED Bulb (SmartThingsCommunity#3705)

* WWST-1883 Add YRL-216 fingerprints

* [ICP-7259] Fix for energy/power not showing for Aeotec Home Energy Meter (SmartThingsCommunity#3708)

* Unified CC versions for every device in this DTH.

* Added OCF Device Type.

* ICP-6462 Added device specific handler for KeyWe DoorLockOperationReport. (SmartThingsCommunity#3563)

* [ICP-7227] Fibaro Smoke Sensor is pairing as flood sensor. (SmartThingsCommunity#3713)

Add fingerprint for Chile

* ICP-6895 Add Vid that point to new metadata with power source support (SmartThingsCommunity#3715)

for zigbee-thermostat

* "fixes" fibaro mis-identifications

* Wwst-989 Add Ikea TRADFRI bulb E14 W op/ch 400lm fingerprint (SmartThingsCommunity#3673)

* WWST-989 add ikea TRADFRI bulb E14 W op/ch 400lm fingerprint

* WWST-1883 Add YRL-216 fingerprints

* WWST-1997 Schlage fingerprints (SmartThingsCommunity#3695)

* WWST-2004 Update Stelpro Maestro DTH with deviceJoinNames from mfg
Update for Stelpro Orleans Fan-Heater and Stelpro Sonoma Fan-Heater

* ICP-7202 - disarming tamper

* ICP-7202 - rename

* WWST-1980 Add fingerprint for Leedarson Tunable Bulb A19 (SmartThingsCommunity#3706)

* [WWST-2009] Corrected Fibaro Dimmer 2 fingerprint for Chile. (SmartThingsCommunity#3718)

* [WWST-2010] Adding fingerprint for Fibaro Single Switch 2 model 3000 (Chile) (SmartThingsCommunity#3723)

* WWST-1938 add fingerprint for Innr E27 White Bulb (SmartThingsCommunity#3722)

* Remove tamper capability

* ICP-7220 Fingerprint fix. (SmartThingsCommunity#3727)

* [WWST-1617] Including figerprint to Ozom Bulb GU10 White (SmartThingsCommunity#3704) (SmartThingsCommunity#3709)

* ONEAPP-7319 Send an initial button event to appease OCF (SmartThingsCommunity#3724)

Button capability is momentary, so initial event is "pushed"

* ICP-7202 Yale Siren doesn't report Tamper Correctly (SmartThingsCommunity#3725)

* Remove tamper capability

* WWST-1941 Innr RB285C RGBW Bulb fingerprint (SmartThingsCommunity#3728)

* WWST-1944 DTH - INNR E14 Candle tunable white - RB248T (SmartThingsCommunity#3729)

WWST-1944 innr RB248T Smart candle fingerprint

* ICP-7220 Aurora Smart Dimmable Bulb Fingerprint fix. (SmartThingsCommunity#3727) (SmartThingsCommunity#3730)

* ICP-7382 Add fingerprint for newest Iris Contact sensor (SmartThingsCommunity#3731)

Add fingerprint for newest Iris Contact sensor

Added fingerprint for new Iris Contact sensor
Raw Description	01 0104 0402 00 09 0000 0001 0003 0020 0402 0500 0B05 FC01 FC02 02 0003 0019
Data	
application: 00
endpointId: 01
manufacturer: iMagic by GreatStar
model: 1116-S

* add new version orvibo smoke sensor fingerprint.

* Add new version ORVIBO gas sensor fingerprint.

* WWST-1481 update Leedarson bulb model ID

* WWST-1614 creating new DTH for zigbee siren (SmartThingsCommunity#3721)

* ICP-7369 ONEAPP-8773 add new version orvibo smoke sensor fingerprint. (SmartThingsCommunity#3740)

* ONEAPP-8778 ICP-7395 Add new version ORVIBO gas sensor fingerprint. (SmartThingsCommunity#3742)

* Ecolink Zigbee Water/Freeze Sensor: Set initial state for temperatureAlarm

By default the Temperature Alarm will be set to 'cleared'.

https://smartthings.atlassian.net/browse/ONEAPP-8927

* Fix the smoke sensor status don't changed in ST app after trigger a smoke event.

* Fix the smoke sensor status don't changed in ST app after trigger a smoke event.

* Fix the gas sensor status don't changed in ST app after trigger a gas event.

* Initial commit for DTH Z-Wave Button

* Added missed Battery capability.

* Included support for Aeotec Panic Button.

* ICP-7184 Query locks for battery level when power is restored (SmartThingsCommunity#3738)

After consultation with Yale, they informed us that this notification is sent when power is restored. We'll use it to trigger a battery poll in the case that batteries were changed.

* Aeon Siren: Add health check polling every 15 minutes

Previously the Aeon Siren was relying on the ping initiated by Device Watch
to keep it online and would get marked offline if the ping response wasn't
received by Device Watch for any reason. Now the DTH pings itself twice
in every check interval period which should help keep it online.

https://smartthings.atlassian.net/browse/ONEAPP-8925

* ICP-7433 [CN][Orvibo][Gas sensor] After claim to the hub, the gas… (SmartThingsCommunity#3752)

Fix ICP-7433 [CN][Orvibo][Gas sensor] After claim to the hub, the gas status is not right

* checkInterval - change back to 122 min

* Couple of improvements and fixes.

* ICP-7184 Query locks for battery level when power is restored (SmartThingsCommunity#3738) (SmartThingsCommunity#3757)

After consultation with Yale, they informed us that this notification is sent when power is restored. We'll use it to trigger a battery poll in the case that batteries were changed.

* [WWST-2109] Add fingerprint to Aurora MPro Smart. (SmartThingsCommunity#3759)

* ICP-7022 Re-enable emergency heat as a supported mode

* [WWST-2115] Add fingerprint to Aurora GU10 Tuneable Smart Lamp - AU-A1GUZBCX5 (SmartThingsCommunity#3760)

* [WWST-2111] Add fingerprint to Aurora Dimmable Strip. (SmartThingsCommunity#3767)

* [WWST-2113] Add fingerprint to Aurora Tunable Strip. (SmartThingsCommunity#3769)

* [WWST-1943] Add fingerprint for innr candle white RB 245 (SmartThingsCommunity#3770)

* WWST-1940, WWST-1946 Fingerprints for RB 278 T and RS 228 T

* Zigbee Multi Switch: Fix child device naming

The Chinese translation for the join name is "智能墙面开关 三星智家(T21W2Z) 1"
which wasn't working because of the "1" in the join name. I changed it to
just replace the last character with the switch number. This obviously
won't work if the switch number is not at the end or if there are more
than 9 switches.

https://smartthings.atlassian.net/browse/WWST-1485

* ICP-7312 Fibaro Fingerprinting changes

Corrects/expands fingerprints for Fibaro wall plugs

* ICP-7312 Fibaro Fingerprinting changes

Corrects/expands fingerprints for Fibaro door/window sensor 2

* ICP-7022

* Update ecolink-zigbee-water-freeze-sensor.groovy

change wet/dry background colors to standard for Classic app

* [WWST-1945] Add fingerprint to innr RS 225 bulb (SmartThingsCommunity#3774)

* ICP-7489 change vid for ozom smart siren as it doesn't support stroboscope

Change-Id: Iee34c9893dd1787b91096487aab3c74a00a75a33

* ICP-7550,ICP-7551 Update Leaksmart tile color and VID (SmartThingsCommunity#3780)

Leaksmart Water Sensor: Update background colors and UI metadata

Change wet/dry background colors to standard for Classic app
Fixed VID since this device does not support tamper alerts

* ONEAPP-8775 add a new fingerprint for Orvibo water lake sensor.

* Moved Aeotec Panic Button back to its previous DTH.

* SmartSense Temp/Humidity Sensor: New Orvibo fingerprint

* WWST-1804 EZmultiPli updates (SmartThingsCommunity#3758)

* WWST-1804 EZmultiPli updates

* Update setting validation logic

* Fix ping() typo 🍺 

* Bring over logic from Aeon Z-Wave Bulb device handlers

* Formatting standardization

* Illuminance Measurement only supports lux unit

* Clean up parse()

* Update temperature colors

* Cleanup preferences section

* Update temperature tile

* Adjust checkInterval to configured reporting intervals

* Move around variable declaration

* ICP-7550,ICP-7551 Update Leaksmart tile color and VID (SmartThingsCommunity#3780) (SmartThingsCommunity#3787)

Leaksmart Water Sensor: Update background colors and UI metadata

Change wet/dry background colors to standard for Classic app
Fixed VID since this device does not support tamper alerts

* ICP-7022 Re-enable emergency heat as a supported mode (SmartThingsCommunity#3789)

* ICP-7489 change vid for ozom smart siren as it doesn't support stroboscope (SmartThingsCommunity#3788)

Change-Id: Iee34c9893dd1787b91096487aab3c74a00a75a33

* fix [ICP-7454] Device status can not change after returning hub from offline to online state. (SmartThingsCommunity#3797)

* ICP-7455 change the name of orvibo gas sensor and orvibo smoke sensor to chinese. (SmartThingsCommunity#3798)

* ICP-7454 Zigbee Smoke Sensor: Remove handling of 'zone report' (SmartThingsCommunity#3801)

Fix when plug in the battery, the sensor status changed from clear to smoke.

* [WWST-2182] Add fingerprint for Sengled Element Color Plus B22 - E11-U3E (SmartThingsCommunity#3809)

* WWST-2182 Add fingerprint for Sengled Element Color Plus B22 - E11-U3E

* Add spaces

* ICP-6917 Applied new vid of UI metadata (SmartThingsCommunity#3807)

* [WWST-1626] Add fingerprint for Sengled E27 Element Color Plus (SmartThingsCommunity#3812)

[WWST-1626] Add fingerprint for Sengled E27 Element Color Plus (SmartThingsCommunity#3812)

* WWST-2091 Converted SmartWeather Station to TWC APIs (SmartThingsCommunity#3802)

* WWST-2088 - WWST-2089 - WWST-2090 - New weather API (SmartThingsCommunity#3813)

* WWST-2091 SmartWeather Station tile updates (SmartThingsCommunity#3815)

* WWST-2092 - WWST-2093 - WWST-2095 - Weather API update (SmartThingsCommunity#3816)

* WWST-2093 - Typo fix

* SmartSense Open/Closed Sensor: Add Sylvania Contact Sensor fingerprint

Fingerprint copied from:
 SmartThingsCommunity#3824

Join fingerprint:

Endpoint 1:
- application:
- manufacturer:CentraLite
- model:Contact Sensor-A
- simple:01 0104 0402 00 07 0000 0001 0003 0020 0402 0500 0B05 01 0019

Endpoint 2:
- application:
- manufacturer:
- model:
- simple:02 C2DF 000C 00 05 0000 0001 0003 0B05 FC0F 01 0003

https://smartthings.atlassian.net/browse/ICP-7664

* Zigbee Switch: Ikea control outlet fingerprint

https://smartthings.atlassian.net/browse/DVCSMP-3179

* WWST-2094 - Convert Spruce Scheduler to TWC (SmartThingsCommunity#3820)

* Fix for SimpleDateFormat error (SmartThingsCommunity#3836)

* WWST-2091 Converted SmartWeather Station to TWC APIs (SmartThingsCommunity#3802)

* WWST-2091 SmartWeather Station tile updates (SmartThingsCommunity#3815)

* WWST-2088 - WWST-2089 - WWST-2090 - New weather API (SmartThingsCommunity#3813)

* WWST-2092 - WWST-2093 - WWST-2095 - Weather API update (SmartThingsCommunity#3816)

* WWST-2093 - Typo fix

* WWST-2094 - Convert Spruce Scheduler to TWC (SmartThingsCommunity#3820)

* Fix for SimpleDateFormat error (SmartThingsCommunity#3836)

* Fingerprint fix for Leedarson bulb (SmartThingsCommunity#3842)

Fingerprint change only (replace incorrect one).

* ICP-7621 Zigbee Motion/Temp/Humidity Sensor: New DTH for the Iris IL071 (SmartThingsCommunity#3786)

Create new Zigbee Motion/Temp/Humidity Sensor DTH for the Iris IL071 motion sensor

https://smartthings.atlassian.net/browse/ICP-7621

* ONEAPP-8762  Zigbee Motion Detector: Change motion stopped timer to 20s (SmartThingsCommunity#3848)

Modify interval to 20s since Orvibo motion sensor detect period is 20s
  • Loading branch information
mplando authored Jan 6, 2019
1 parent c028515 commit 0834761
Show file tree
Hide file tree
Showing 919 changed files with 69,051 additions and 15,733 deletions.
47 changes: 47 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
defaults: &defaults
working_directory: ~/SmartThingsCommunity/SmartThingsPublic
docker:
- image: smartthings-docker-build.jfrog.io/releng/build-common:latest
command: /sbin/init
auth:
username: $ARTIFACTORY_USERNAME
password: $ARTIFACTORY_PASSWORD
shell: /bin/bash --login
parallelism: 1
version: 2
jobs:
build:
<<: *defaults
steps:
- checkout
- run: ./gradlew check -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
- run: ./gradlew compileSmartappsGroovy compileDevicetypesGroovy -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD"
deploy-dev:
<<: *defaults
steps:
- checkout
- run: ./gradlew deployArchives -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Ps3Buckets="$S3_BUCKETS_DEV"
- run: ./gradlew slackSendMessage -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Pbranch="$CIRCLE_BRANCH" -PslackToken="$SLACK_TOKEN" -PslackWebhookUrl="$SLACK_WEBHOOK_URL" -PslackChannel="$SLACK_CHANNEL" --stacktrace
deploy-stage:
<<: *defaults
steps:
- checkout
- run: ./gradlew deployArchives -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Ps3Buckets="$S3_BUCKETS_STAGE"
- run: ./gradlew slackSendMessage -PsmartThingsArtifactoryUserName="$ARTIFACTORY_USERNAME" -PsmartThingsArtifactoryPassword="$ARTIFACTORY_PASSWORD" -Pbranch="$CIRCLE_BRANCH" -PslackToken="$SLACK_TOKEN" -PslackWebhookUrl="$SLACK_WEBHOOK_URL" -PslackChannel="$SLACK_CHANNEL" --stacktrace
workflows:
version: 2
deploy:
jobs:
- build
- deploy-dev:
requires:
- build
filters:
branches:
only: master
- deploy-stage:
requires:
- build
filters:
branches:
only: staging
18 changes: 9 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apply plugin: 'smartthings-slack'

buildscript {
dependencies {
classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.8"
classpath "com.smartthings.deployment:executable-deployment-scripts:1.0.12"
}
repositories {
mavenLocal()
Expand All @@ -19,7 +19,7 @@ buildscript {
username smartThingsArtifactoryUserName
password smartThingsArtifactoryPassword
}
url "https://artifactory.smartthings.com/libs-release-local"
url "https://smartthings.jfrog.io/smartthings/libs-release-local"
}
}
}
Expand All @@ -32,7 +32,7 @@ repositories {
username smartThingsArtifactoryUserName
password smartThingsArtifactoryPassword
}
url "https://artifactory.smartthings.com/libs-release-local"
url "https://smartthings.jfrog.io/smartthings/libs-release-local"
}
}

Expand All @@ -51,10 +51,10 @@ sourceSets {

dependencies {
devicetypesCompile 'org.codehaus.groovy:groovy-all:2.4.7'
devicetypesCompile 'smartthings:appengine-z-wave:0.1.2'
devicetypesCompile 'smartthings:appengine-zigbee:0.1.11'
devicetypesCompile 'smartthings:appengine-z-wave:0.1.3'
devicetypesCompile 'smartthings:appengine-zigbee:0.1.12'
smartappsCompile 'org.codehaus.groovy:groovy-all:2.4.7'
smartappsCompile 'smartthings:appengine-common:0.1.8'
smartappsCompile 'smartthings:appengine-common:0.1.9'
smartappsCompile 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.1'
smartappsCompile 'org.grails:grails-web:2.3.11'
smartappsCompile 'org.json:json:20140107'
Expand All @@ -74,19 +74,19 @@ slackSendMessage {
String username
switch (branch) {
case 'master':
username = 'Hickory'
username = 'DEV'
iconUrl = wolverine
color = '#35D0F2'
messageText = 'Began deployment of _SmartThingsPublic[master]_ branch to the _Dev_ environments.'
break
case 'staging':
username = 'Dickory'
username = 'STG'
iconUrl = beach
color = '#FFDE20'
messageText = 'Began deployment of _SmartThingsPublic[staging]_ branch to the _Staging_ environments.'
break
case 'production':
username = 'Dock'
username = 'PRD'
iconUrl = drinks
color = '#FF1D23'
messageText = 'Began deployment of _SmartThingsPublic[production]_ branch to the _Prod_ environments.'
Expand Down
27 changes: 0 additions & 27 deletions circle.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ metadata {

tiles {
standardTile("acceleration", "device.acceleration", width: 2, height: 2) {
state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff")
state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0")
state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc")
state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC")
}

main "acceleration"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ metadata {

tiles {
standardTile("contact", "device.contact", width: 2, height: 2) {
state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821")
state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e")
state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC")
state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13")
}
main "contact"
details "contact"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ metadata {
tiles {
standardTile("toggle", "device.lock", width: 2, height: 2) {
state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff"
state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821"
state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00A0DC"
}
standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") {
state "default", label:'lock', action:"lock.lock", icon:"st.locks.lock.locked"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ metadata {
tiles {
standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on"
state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
}
main "switch"
details "switch"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata {
tiles {
standardTile("motion", "device.motion", width: 2, height: 2) {
state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff")
state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0")
state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC")
}
main "motion"
details "motion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata {
tiles {
standardTile("presence", "device.presence", width: 2, height: 2) {
state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0")
state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#00A0DC")
}
main "presence"
details "presence"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ metadata {
tiles {
standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) {
state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff"
state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821"
state "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC"
}
main "switch"
details "switch"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ metadata {
tiles {
standardTile("switch", "device.switch", width: 2, height: 2) {
state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn"
state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff"
state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821"
state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff"
state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC"
state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff"
}
controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ metadata {
standardTile("mode", "device.thermostatMode", inactiveLabel: false, decoration: "flat") {
state "off", label:'${name}', action:"thermostat.emergencyHeat", backgroundColor:"#ffffff"
state "emergencyHeat", label:'${name}', action:"thermostat.heat", backgroundColor:"#e86d13"
state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffc000"
state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#269bd2"
state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13"
state "cool", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC"
}
standardTile("fanMode", "device.thermostatFanMode", inactiveLabel: false, decoration: "flat") {
state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata {
tiles {
standardTile("water", "device.water", width: 2, height: 2) {
state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff"
state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0"
state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC"
}

main "water"
Expand Down
2 changes: 1 addition & 1 deletion devicetypes/com-obycode/beaconthing.src/beaconthing.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ metadata {

tiles {
standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) {
state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#53a7c0")
state("present", labelIcon:"st.presence.tile.present", backgroundColor:"#00A0DC")
state("not present", labelIcon:"st.presence.tile.not-present", backgroundColor:"#ffffff")
}
valueTile("inRange", "device.inRangeFriendly", inactiveLabel: true, height:1, width:3, decoration: "flat") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ metadata {
// Main
standardTile("main", "device.status", width: 1, height: 1, canChangeIcon: true) {
state "paused", label:'Paused', action:"music Player.play", icon:"st.Electronics.electronics19", nextState:"playing", backgroundColor:"#ffffff"
state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#79b821"
state "playing", label:'Playing', action:"music Player.pause", icon:"st.Electronics.electronics19", nextState:"paused", backgroundColor:"#00A0DC"
}

// Row 1
Expand Down
57 changes: 57 additions & 0 deletions devicetypes/curb/curb-power-meter.src/curb-power-meter.groovy
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/**
* Curb Power Meter
*
* Copyright 2017 Curb
*
* 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:
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
* on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
* for the specific language governing permissions and limitations under the License.
*
*/

metadata {
definition(name: "CURB Power Meter", namespace: "curb", author: "Curb", ocfDeviceType: "x.com.st.d.energymeter") {
capability "Power Meter"
capability "Energy Meter"
}

tiles {

multiAttributeTile(name: "power", type: "generic", width: 6, height: 4, canChangeIcon: false) {

tileAttribute("device.power", key: "PRIMARY_CONTROL") {
attributeState "power",
label: '${currentValue} W',
icon: 'st.switches.switch.off',
backgroundColors: [
[value: -1000, color: "#25c100"],
[value: -500, color: "#76ce61"],
[value: -100, color: "#bbedaf"],
[value: 0, color: "#bcbbb5"],
[value: 100, color: "#efc621"],
[value: 1000, color: "#ed8c25"],
[value: 2000, color: "#db5e1f"]
]
}
tileAttribute ("device.energy", key: "SECONDARY_CONTROL") {
attributeState "energy", label:'${currentValue} kWh'
}
}
main(["power"])

details(["power"])
}
}

def handlePower(value) {
sendEvent(name: "power", value: value)
}

def handleKwhBilling(kwh) {
sendEvent(name: "energy", value: kwh.round(3))
}
2 changes: 2 additions & 0 deletions devicetypes/drzwave/ezmultipli.src/.st-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.st-ignore
README.md
44 changes: 44 additions & 0 deletions devicetypes/drzwave/ezmultipli.src/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Express Controls EZMultiPli

Works with:

* [Express Controls EZMultiPli](https://www.smartthings.com/works-with-smartthings/)

## Table of contents

* [Release Notes](#release-notes)
* [Capabilities](#capabilities)
* [Troubleshooting](#troubleshooting)

## Release Notes

* **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

* **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

Loading

0 comments on commit 0834761

Please sign in to comment.