From 1674dc7339bc0291cf5b20a0ceb321f648d9cd20 Mon Sep 17 00:00:00 2001 From: Curb Operations Date: Fri, 22 Jul 2016 10:39:53 -0500 Subject: [PATCH 01/17] MSA-1408: it exposes a customer's smart thing switches, and allows the user to toggle them from the Curb app. --- .../curb-control.src/curb-control.groovy | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 smartapps/curb-v2/curb-control.src/curb-control.groovy diff --git a/smartapps/curb-v2/curb-control.src/curb-control.groovy b/smartapps/curb-v2/curb-control.src/curb-control.groovy new file mode 100644 index 0000000..f098bc9 --- /dev/null +++ b/smartapps/curb-v2/curb-control.src/curb-control.groovy @@ -0,0 +1,103 @@ +/** + * Curb Control + * + * Copyright 2016 Savanni D'Gerinel + * + */ +definition( + name: "Curb Control", + namespace: "curb-v2", + author: "Savanni D'Gerinel", + description: "Control point for Curb/SmartThings integration", + category: "Green Living", + iconUrl: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience.png", + iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png", + iconX3Url: "https://s3.amazonaws.com/smartapp-icons/Convenience/Cat-Convenience@2x.png", + oauth: true) + + +preferences { + section("Allow Endpoint to Control These Things...") { + input "switches", "capability.switch", title: "Which Switches?", multiple: true, required: false + } +} + +mappings { + + path("/switches") { + action: [ + GET: "listSwitches" + ] + } + path("/switches/:id") { + action: [ + GET: "showSwitch" + ] + } + path("/switches/:id/:command") { + action: [ + PUT: "updateSwitch" + ] + } +} + +def installed() {} + +def updated() {} + + +//switches +def listSwitches() { + switches.collect{device(it,"switch")} +} + +def showSwitch() { + show(switches, "switch") +} +void updateSwitch() { + update(switches) +} + + +def deviceHandler(evt) {} + +private void update(devices) { + log.debug "update, request: params: ${params}, devices: $devices.id" + + + //def command = request.JSON?.command + def command = params.command + //let's create a toggle option here + if (command) + { + def device = devices.find { it.id == params.id } + if (!device) { + httpError(404, "Device not found") + } else { + if(command == "toggle") + { + if(device.currentValue('switch') == "on") + device.off(); + else + device.on();; + } + } + } +} + +private show(devices, type) { + def device = devices.find { it.id == params.id } + if (!device) { + httpError(404, "Device not found") + } + else { + def attributeName = type == "motionSensor" ? "motion" : type + def s = device.currentState(attributeName) + [id: device.id, label: device.displayName, value: s?.value, unitTime: s?.date?.time, type: type] + } +} + + +private device(it, type) { + it ? [id: it.id, label: it.label, type: type] : null +} From 5cb84a269de1394b8ac7daf900bca44daa24d15f Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Mon, 13 Feb 2017 16:21:24 +0530 Subject: [PATCH 02/17] [CHF-523] Adding Readme files for the following DTH: 1. Z-Wave Switch Generic a) Leviton 15A Switch VRS15-1LZ (Z-Wave) b) Enerwave Duplex Receptacle ZW15R (Z-Wave) c) Enerwave On/Off Switch ZW15S (Z-Wave) 2. Dimmer Switch a) 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725) b) In-Wall Smart Fan Control (GE 12730) 3. ZigBee RGB Bulb a) OSRAM LIGHTIFY Gardenspot mini RGB 4. ZigBee RGBW Bulb a) OSRAM LIGHTIFY Flex RGBW strips --- .../smartthings/dimmer-switch.src/README.md | 8 +++- .../zigbee-rgb-bulb.src/.st-ignore | 2 + .../smartthings/zigbee-rgb-bulb.src/README.md | 39 +++++++++++++++++++ .../zigbee-rgbw-bulb.src/README.md | 6 ++- .../zwave-switch-generic.src/README.md | 12 ++++-- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 devicetypes/smartthings/zigbee-rgb-bulb.src/.st-ignore create mode 100644 devicetypes/smartthings/zigbee-rgb-bulb.src/README.md diff --git a/devicetypes/smartthings/dimmer-switch.src/README.md b/devicetypes/smartthings/dimmer-switch.src/README.md index 71a27b6..595ff8d 100644 --- a/devicetypes/smartthings/dimmer-switch.src/README.md +++ b/devicetypes/smartthings/dimmer-switch.src/README.md @@ -7,6 +7,8 @@ Works with: * [GE Z-Wave In-Wall Smart Dimmer (GE 12724)](http://products.z-wavealliance.org/products/1197) * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729)](http://products.z-wavealliance.org/products/1201) * [GE Z-Wave Plug-in Smart Dimmer (GE 12718)](http://products.z-wavealliance.org/products/1191) +* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725)](http://products.z-wavealliance.org/products/1198) +* [GE In-Wall Smart Fan Control (GE 12730)](http://products.z-wavealliance.org/products/1202) ## Table of contents @@ -27,7 +29,7 @@ Works with: ## Device Health -Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In) are polled by the hub. +Z-Wave Smart Dimmers (In-Wall, In-Wall(Toggle), Plug-In), 1000-watt In-Wall Smart Dimmer Switch and In-Wall Smart Fan Control are polled by the hub. As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed. Check-in interval = 32 mins. Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for @@ -44,4 +46,6 @@ Instructions related to pairing, resetting and removing the device from SmartThi * [General Z-Wave Dimmer/Switch Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200955890-Troubleshooting-GE-in-wall-switch-or-dimmer-won-t-respond-to-commands-or-automations-Z-Wave-) * [GE Z-Wave In-Wall Smart Dimmer (GE 12724) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200902600-GE-In-Wall-Paddle-Dimmer-Switch-GE-12724-Z-Wave-) * [GE Z-Wave In-Wall Smart Dimmer (Toggle) (GE 12729) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207568463-GE-In-Wall-Smart-Toggle-Dimmer-GE-12729-Z-Wave-) -* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-) \ No newline at end of file +* [GE Z-Wave Plug-in Smart Dimmer (GE 12718) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/202088474-GE-Plug-In-Smart-Dimmer-GE-12718-Z-Wave-) +* [GE 1,000-Watt In-Wall Smart Dimmer Switch (GE 12725) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274) +* [GE In-Wall Smart Fan Control (GE 12730) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200879274) \ No newline at end of file diff --git a/devicetypes/smartthings/zigbee-rgb-bulb.src/.st-ignore b/devicetypes/smartthings/zigbee-rgb-bulb.src/.st-ignore new file mode 100644 index 0000000..f78b46e --- /dev/null +++ b/devicetypes/smartthings/zigbee-rgb-bulb.src/.st-ignore @@ -0,0 +1,2 @@ +.st-ignore +README.md diff --git a/devicetypes/smartthings/zigbee-rgb-bulb.src/README.md b/devicetypes/smartthings/zigbee-rgb-bulb.src/README.md new file mode 100644 index 0000000..f59f26c --- /dev/null +++ b/devicetypes/smartthings/zigbee-rgb-bulb.src/README.md @@ -0,0 +1,39 @@ +# ZigBee RGB Bulb + +Cloud Execution + +Works with: + +* [OSRAM LIGHTIFY Gardenspot mini RGB](https://www.smartthings.com/works-with-smartthings/lighting-and-switches/osram-lightify-gardenspot-rgb) + +## Table of contents + +* [Capabilities](#capabilities) +* [Health](#device-health) +* [Battery](#battery-specification) + +## Capabilities + +* **Actuator** - represents that a Device has commands +* **Color Control** - It 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. +* **Polling** - It represents that a device can be polled. +* **Refresh** - _refresh()_ command for status updates +* **Switch** - can detect state (possible values: on/off) +* **Switch Level** - represents current light level, usually 0-100 in percent +* **Health Check** - indicates ability to get device health notifications +* **Light** - Indicates that the device belongs to light category. + +## Device Health + +Zigbee RGB Bulb with reporting interval of 5 mins. +SmartThings platform will ping the device after `checkInterval` seconds of inactivity in last attempt to reach the device before marking it `OFFLINE` + +*__12min__ checkInterval + +## Troubleshooting + +If the device doesn't pair when trying from the SmartThings mobile app, it is possible that the device is out of range. +Pairing needs to be tried again by placing the device closer to the hub. +Other troubleshooting tips are listed as follows: +* [OSRAM LIGHTIFY Gardenspot mini RGB Troubleshooting](https://support.smartthings.com/hc/en-us/articles/214191863) \ No newline at end of file diff --git a/devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md b/devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md index 0e413e5..e704056 100644 --- a/devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md +++ b/devicetypes/smartthings/zigbee-rgbw-bulb.src/README.md @@ -4,7 +4,8 @@ Cloud Execution Works with: -* [OSRAM LIGHTIFY LED RGBW Bulb](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW) +* [OSRAM LIGHTIFY LED Smart Connected Light A19 RGBW](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW) +* [OSRAM LIGHTIFY Flex RGBW strips](https://www.smartthings.com/works-with-smartthings/lighting-and-switches/osram-lightify-flex-rgbw-strips) ## Table of contents @@ -38,4 +39,5 @@ If the device doesn't pair when trying from the SmartThings mobile app, it is po Pairing needs to be tried again by placing the device closer to the hub. It may also happen that you need to reset the device. Instructions related to pairing, resetting and removing the device from SmartThings can be found in the following link: -* [Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW) \ No newline at end of file +* [OSRAM LIGHTIFY LED Smart Connected Light A19 RGBW Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/207728173-OSRAM-LIGHTIFY-LED-Smart-Connected-Light-A19-RGBW) +* [OSRAM LIGHTIFY Flex RGBW strips Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/214191863) \ No newline at end of file diff --git a/devicetypes/smartthings/zwave-switch-generic.src/README.md b/devicetypes/smartthings/zwave-switch-generic.src/README.md index baec4dd..f3fc268 100644 --- a/devicetypes/smartthings/zwave-switch-generic.src/README.md +++ b/devicetypes/smartthings/zwave-switch-generic.src/README.md @@ -1,4 +1,4 @@ -# Z-wave Switch +# Z-wave Switch Generic Cloud Execution @@ -8,6 +8,9 @@ Works with: * [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave)](https://www.smartthings.com/works-with-smartthings/outlets/ge-plug-in-outdoor-smart-switch) * [Leviton Outlet (DZR15-1LZ)](https://www.smartthings.com/works-with-smartthings/outlets/leviton-outlet) * [Leviton Switch (DZS15-1LZ)](https://www.smartthings.com/works-with-smartthings/switches-and-dimmers/leviton-switch) +* [Leviton 15A Switch (VRS15-1LZ)](https://www.smartthings.com/works-with-smartthings/lighting-and-switches/leviton-15a-switch) +* [Enerwave Duplex Receptacle (ZW15R)](https://www.smartthings.com/works-with-smartthings/outlets/enerwave-duplex-receptacle) +* [Enerwave On/Off Switch (ZW15S)](https://www.smartthings.com/works-with-smartthings/lighting-and-switches/enerwave-onoff-switch) ## Table of contents @@ -25,7 +28,7 @@ Works with: ## Device Health -Leviton Appliance Module (DZPA1-1LW), GE Plug-In Outdoor Smart Switch (GE 12720), Leviton Outlet (DZR15-1LZ) and Leviton Switch (DZS15-1LZ) (Z-Wave) are polled by the hub. +Leviton Appliance Module (DZPA1-1LW), GE Plug-In Outdoor Smart Switch (GE 12720), Leviton Outlet (DZR15-1LZ), Leviton Switch (DZS15-1LZ) (Z-Wave), Leviton Switch, Enerwave Duplex Receptacle (ZW15R) and Enerwave On/Off Switch (ZW15S) are polled by the hub. As of hubCore version 0.14.38 the hub sends up reports every 15 minutes regardless of whether the state changed. Device-Watch allows 2 check-in misses from device plus some lag time. So Check-in interval = (2*15 + 2)mins = 32 mins. Not to mention after going OFFLINE when the device is plugged back in, it might take a considerable amount of time for @@ -42,4 +45,7 @@ Instructions related to pairing, resetting and removing the device from SmartThi * [Leviton Appliance Module (DZPA1-1LW) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices) * [GE Plug-In Outdoor Smart Switch (GE 12720) (Z-Wave) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/200903080-GE-Plug-In-Outdoor-Smart-Switch-GE-12720-Z-Wave-) * [Leviton Outlet (DZR15-1LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices) -* [Leviton Switch (DZS15-1LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices) \ No newline at end of file +* [Leviton Switch (DZS15-1LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices) +* [Leviton 15A Switch (VRS15-1LZ) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/206171053-How-to-connect-Leviton-Z-Wave-devices) +* [Enerwave Duplex Receptacle (ZW15R) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204854176-How-to-connect-Enerwave-switches-and-dimmers) +* [Enerwave On/Off Switch (ZW15S) Troubleshooting Tips](https://support.smartthings.com/hc/en-us/articles/204854176-How-to-connect-Enerwave-switches-and-dimmers) \ No newline at end of file From 0aabce9fa3b845b6858246d34b05a8f52f7d1812 Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Fri, 17 Feb 2017 18:21:16 +0530 Subject: [PATCH 03/17] [DVCSMP-2445] DTH UX Improvements for the following DTHs: 1. Quirky Wink Powerstrip 2. Momentary Button Tile 3. Beaconthing 4. Unknown 5. Zwave Water Valve 6. Zen Thermostat 7. Zigbee Valve 8. Hue Bloom --- .../com-obycode/beaconthing.src/beaconthing.groovy | 2 +- devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy | 4 ++-- .../momentary-button-tile.groovy | 2 +- devicetypes/smartthings/unknown.src/unknown.groovy | 2 +- .../smartthings/zigbee-valve.src/zigbee-valve.groovy | 8 ++++---- .../zwave-water-valve.src/zwave-water-valve.groovy | 8 ++++---- .../quirky-wink-powerstrip.groovy | 2 +- .../zenwithin/zen-thermostat.src/zen-thermostat.groovy | 8 ++++---- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy b/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy index de1850c..f5bca64 100644 --- a/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy +++ b/devicetypes/com-obycode/beaconthing.src/beaconthing.groovy @@ -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") { diff --git a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy index 2d6f063..2462e88 100644 --- a/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy +++ b/devicetypes/smartthings/hue-bloom.src/hue-bloom.groovy @@ -31,9 +31,9 @@ metadata { tiles (scale: 2){ multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy b/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy index 7a164fa..923836e 100644 --- a/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy +++ b/devicetypes/smartthings/momentary-button-tile.src/momentary-button-tile.groovy @@ -32,7 +32,7 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: 'Push', action: "momentary.push", backgroundColor: "#ffffff", nextState: "on" - state "on", label: 'Push', action: "momentary.push", backgroundColor: "#53a7c0" + state "on", label: 'Push', action: "momentary.push", backgroundColor: "#00A0DC" } main "switch" details "switch" diff --git a/devicetypes/smartthings/unknown.src/unknown.groovy b/devicetypes/smartthings/unknown.src/unknown.groovy index e084bb1..12cee41 100644 --- a/devicetypes/smartthings/unknown.src/unknown.groovy +++ b/devicetypes/smartthings/unknown.src/unknown.groovy @@ -23,7 +23,7 @@ metadata { // UI tile definitions tiles { standardTile("unknown", "device.unknown", width: 2, height: 2) { - state(name:"default", icon:"st.unknown.unknown.unknown", backgroundColor:"#767676", label: "Unknown") + state(name:"default", icon:"st.unknown.unknown.unknown", backgroundColor:"#ffffff", label: "Unknown") } main "unknown" diff --git a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy index 905f743..657da69 100644 --- a/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy +++ b/devicetypes/smartthings/zigbee-valve.src/zigbee-valve.groovy @@ -40,10 +40,10 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.contact", key: "PRIMARY_CONTROL") { - attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing" - attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening" - attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing" - attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening" + attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" + attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" + attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" + attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" } tileAttribute ("powerSource", key: "SECONDARY_CONTROL") { attributeState "powerSource", label:'Power Source: ${currentValue}' diff --git a/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy b/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy index 0be843d..8826760 100644 --- a/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy +++ b/devicetypes/smartthings/zwave-water-valve.src/zwave-water-valve.groovy @@ -36,10 +36,10 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"valve", type: "generic", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.contact", key: "PRIMARY_CONTROL") { - attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing" - attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening" - attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#ffe71e" - attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffe71e" + attributeState "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" + attributeState "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" + attributeState "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC" + attributeState "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff" } } diff --git a/devicetypes/wackford/quirky-wink-powerstrip.src/quirky-wink-powerstrip.groovy b/devicetypes/wackford/quirky-wink-powerstrip.src/quirky-wink-powerstrip.groovy index 8dd6c27..b4b38bf 100644 --- a/devicetypes/wackford/quirky-wink-powerstrip.src/quirky-wink-powerstrip.groovy +++ b/devicetypes/wackford/quirky-wink-powerstrip.src/quirky-wink-powerstrip.groovy @@ -46,7 +46,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" } standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") { state "default", action:"refresh.refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/zenwithin/zen-thermostat.src/zen-thermostat.groovy b/devicetypes/zenwithin/zen-thermostat.src/zen-thermostat.groovy index a13646f..2e046da 100644 --- a/devicetypes/zenwithin/zen-thermostat.src/zen-thermostat.groovy +++ b/devicetypes/zenwithin/zen-thermostat.src/zen-thermostat.groovy @@ -36,7 +36,7 @@ metadata { } valueTile("temperature", "device.temperature", width: 1, height: 1) { - state("temperature", label:'${currentValue}°', backgroundColor:"#0A1E2C") + state("temperature", label:'${currentValue}°', backgroundColor:"#00A0DC") } standardTile("fanMode", "device.thermostatFanMode", decoration: "flat") { @@ -46,9 +46,9 @@ metadata { standardTile("mode", "device.thermostatMode", decoration: "flat") { - state "off", action:"setThermostatMode", backgroundColor:"#e8e3d8", icon:"st.thermostat.heating-cooling-off", nextState:"heating" - state "heat", action:"setThermostatMode", backgroundColor:"#ff6e7e", icon:"st.thermostat.heat", nextState:"cooling" - state "cool", action:"setThermostatMode", backgroundColor:"#90d0e8", icon:"st.thermostat.cool", nextState:"..." + state "off", action:"setThermostatMode", backgroundColor:"#ffffff", icon:"st.thermostat.heating-cooling-off", nextState:"heating" + state "heat", action:"setThermostatMode", backgroundColor:"#e86d13", icon:"st.thermostat.heat", nextState:"cooling" + state "cool", action:"setThermostatMode", backgroundColor:"#00A0DC", icon:"st.thermostat.cool", nextState:"..." //state "auto", action:"setThermostatMode", backgroundColor:"#e8e3d8", icon:"st.thermostat.auto" state "heating", action:"setThermostatMode", nextState:"to_cool" state "cooling", action:"setThermostatMode", nextState:"..." From 0d4b681971d591cae6c34291a62e6ca009fc615e Mon Sep 17 00:00:00 2001 From: "piyush.c" Date: Mon, 20 Feb 2017 15:35:27 +0530 Subject: [PATCH 04/17] [DVCSMP-2438] Standardize Page 1 of DTH UX Improvements --- .../thermostat-capability.groovy | 4 ++-- .../tile-basic-presence.groovy | 6 ++--- .../tile-multiattribute-generic.groovy | 6 ++--- .../tile-multiattribute-videoplayer.groovy | 24 +++++++++---------- .../quirky-wink-eggtray.groovy | 6 ++--- .../quirky-wink-spotter.groovy | 10 ++++---- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy b/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy index 113b4a5..80cdf98 100644 --- a/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy +++ b/devicetypes/capabilities/thermostat-capability.src/thermostat-capability.groovy @@ -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" diff --git a/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy b/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy index 968fc08..392866c 100644 --- a/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy +++ b/devicetypes/smartthings/tile-ux/tile-basic-presence.src/tile-basic-presence.groovy @@ -26,8 +26,8 @@ metadata { tiles(scale: 2) { // You only get a presence tile view when the size is 3x3 otherwise it's a value tile standardTile("presence", "device.presence", width: 3, height: 3, canChangeBackground: true) { - state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0") - state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ebeef2") + state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC") + state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#cccccc") } standardTile("notPresentBtn", "device.fake", width: 3, height: 3, decoration: "flat") { @@ -35,7 +35,7 @@ metadata { } standardTile("presentBtn", "device.fake", width: 3, height: 3, decoration: "flat") { - state("present", label:'present', backgroundColor:"#53a7c0", action:"arrived") + state("present", label:'present', backgroundColor:"#00A0DC", action:"arrived") } main("presence") diff --git a/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy b/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy index d535647..9353c00 100644 --- a/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy +++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-generic.src/tile-multiattribute-generic.groovy @@ -25,7 +25,7 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"basicTile", type:"generic", width:6, height:4) { tileAttribute("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" @@ -33,7 +33,7 @@ metadata { } multiAttributeTile(name:"sliderTile", type:"generic", width:6, height:4) { tileAttribute("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', backgroundColor:"#ffffff", nextState:"turningOn" attributeState "turningOn", label:'${name}', backgroundColor:"#79b821", nextState:"turningOff" attributeState "turningOff", label:'${name}', backgroundColor:"#ffffff", nextState:"turningOn" @@ -57,7 +57,7 @@ metadata { ] } tileAttribute("device.switch", key: "SECONDARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", backgroundColor:"#ffffff", nextState:"turningOn" attributeState "turningOn", label:'…', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" attributeState "turningOff", label:'…', action:"switch.on", backgroundColor:"#ffffff", nextState:"turningOn" diff --git a/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy b/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy index 792b458..c6dc80d 100644 --- a/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy +++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-videoplayer.src/tile-multiattribute-videoplayer.groovy @@ -34,10 +34,10 @@ metadata { tiles(scale: 2) { multiAttributeTile(name: "videoPlayer", type: "videoPlayer", width: 6, height: 4) { tileAttribute("device.switch", key: "CAMERA_STATUS") { - attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#79b821", defaultState: true) + attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#00A0DC", defaultState: true) attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", action: "switch.on", backgroundColor: "#ffffff") - attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0") - attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#F22000") + attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC") + attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#cccccc") } tileAttribute("device.errorMessage", key: "CAMERA_ERROR_MESSAGE") { @@ -45,10 +45,10 @@ metadata { } tileAttribute("device.camera", key: "PRIMARY_CONTROL") { - attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#79b821", defaultState: true) + attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC", defaultState: true) attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", backgroundColor: "#ffffff") - attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0") - attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#F22000") + attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC") + attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#cccccc") } tileAttribute("device.startLive", key: "START_LIVE") { @@ -72,10 +72,10 @@ metadata { multiAttributeTile(name: "videoPlayerMin", type: "videoPlayer", width: 6, height: 4) { tileAttribute("device.switch", key: "CAMERA_STATUS") { - attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#79b821", defaultState: true) + attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", action: "switch.off", backgroundColor: "#00A0DC", defaultState: true) attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", action: "switch.on", backgroundColor: "#ffffff") - attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0") - attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#F22000") + attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC") + attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", action: "refresh.refresh", backgroundColor: "#cccccc") } tileAttribute("device.errorMessage", key: "CAMERA_ERROR_MESSAGE") { @@ -83,10 +83,10 @@ metadata { } tileAttribute("device.camera", key: "PRIMARY_CONTROL") { - attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#79b821", defaultState: true) + attributeState("on", label: "Active", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC", defaultState: true) attributeState("off", label: "Inactive", icon: "st.camera.dlink-indoor", backgroundColor: "#ffffff") - attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#53a7c0") - attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#F22000") + attributeState("restarting", label: "Connecting", icon: "st.camera.dlink-indoor", backgroundColor: "#00A0DC") + attributeState("unavailable", label: "Unavailable", icon: "st.camera.dlink-indoor", backgroundColor: "#cccccc") } tileAttribute("device.startLive", key: "START_LIVE") { diff --git a/devicetypes/wackford/quirky-wink-eggtray.src/quirky-wink-eggtray.groovy b/devicetypes/wackford/quirky-wink-eggtray.src/quirky-wink-eggtray.groovy index 9e8ea7f..4d9d00c 100644 --- a/devicetypes/wackford/quirky-wink-eggtray.src/quirky-wink-eggtray.groovy +++ b/devicetypes/wackford/quirky-wink-eggtray.src/quirky-wink-eggtray.groovy @@ -53,15 +53,15 @@ metadata { tiles { standardTile("inventory", "device.inventory", width: 2, height: 2){ - state "goodEggs", label : " ", unit : "" , icon:"st.quirky.egg-minder.quirky-egg-device", backgroundColor: "#53a7c0" - state "haveBadEgg", label : " ", unit : "" , icon:"st.quirky.egg-minder.quirky-egg-device", backgroundColor: "#FF1919" + state "goodEggs", label : " ", unit : "" , icon:"st.quirky.egg-minder.quirky-egg-device", backgroundColor: "#00A0DC" + state "haveBadEgg", label : " ", unit : "" , icon:"st.quirky.egg-minder.quirky-egg-device", backgroundColor: "#e86d13" state "noEggs", label : " ", unit : "" , icon:"st.quirky.egg-minder.quirky-egg-device", backgroundColor: "#ffffff" } standardTile("totalEggs", "device.totalEggs", inactiveLabel: false){ state "totalEggs", label : '${currentValue}', unit : "" , icon:"st.quirky.egg-minder.quirky-egg-count", backgroundColor: "#53a7c0" } standardTile("freshEggs", "device.freshEggs", inactiveLabel: false){ - state "freshEggs", label : '${currentValue}', unit : "" , icon:"st.quirky.egg-minder.quirky-egg-fresh", backgroundColor: "#53a7c0" + state "freshEggs", label : '${currentValue}', unit : "" , icon:"st.quirky.egg-minder.quirky-egg-fresh", backgroundColor: "#00A0DC" } standardTile("oldEggs", "device.oldEggs", inactiveLabel: false){ state "oldEggs", label : '${currentValue}', unit : "" , icon:"st.quirky.egg-minder.quirky-egg-expired", backgroundColor: "#53a7c0" diff --git a/devicetypes/wackford/quirky-wink-spotter.src/quirky-wink-spotter.groovy b/devicetypes/wackford/quirky-wink-spotter.src/quirky-wink-spotter.groovy index 8de12f2..5133606 100644 --- a/devicetypes/wackford/quirky-wink-spotter.src/quirky-wink-spotter.groovy +++ b/devicetypes/wackford/quirky-wink-spotter.src/quirky-wink-spotter.groovy @@ -54,8 +54,8 @@ metadata { tiles { standardTile("acceleration", "device.acceleration", width: 2, height: 2, canChangeIcon: true) { - state "active", label:'active', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0" - state "inactive", label:'inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff" + state "active", label:'active', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC" + state "inactive", label:'inactive', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc" } valueTile("temperature", "device.temperature", canChangeIcon: false) { @@ -75,11 +75,11 @@ metadata { state "humidity", label:'${currentValue}% RH', unit:"" } standardTile("sound", "device.sound", inactiveLabel: false) { - state "active", label: "noise", unit:"", icon: "st.alarm.beep.beep", backgroundColor: "#53a7c0" - state "inactive", label: "quiet", unit:"", icon: "st.alarm.beep.beep", backgroundColor: "#ffffff" + state "active", label: "noise", unit:"", icon: "st.alarm.beep.beep", backgroundColor: "#00A0DC" + state "inactive", label: "quiet", unit:"", icon: "st.alarm.beep.beep", backgroundColor: "#cccccc" } standardTile("light", "device.light", inactiveLabel: false, canChangeIcon: true) { - state "active", label: "light", unit:"", icon: "st.illuminance.illuminance.bright", backgroundColor: "#53a7c0" + state "active", label: "light", unit:"", icon: "st.illuminance.illuminance.bright", backgroundColor: "#00A0DC" state "inactive", label: "dark", unit:"", icon: "st.illuminance.illuminance.dark", backgroundColor: "#B2B2B2" } valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, canChangeIcon: false) { From e54a8644c3a13886a0ecd43ab05351ab64c85894 Mon Sep 17 00:00:00 2001 From: Parijat Das Date: Mon, 20 Feb 2017 17:39:27 +0530 Subject: [PATCH 05/17] DTH UX Improvements for Page 11 of DTHs: From Danalock ... to ...ZWave-Virtual-MomentaryContactSwitch --- devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy | 2 +- devicetypes/smartthings/danalock.src/danalock.groovy | 4 ++-- .../smartthings/dimmer-switch.src/dimmer-switch.groovy | 4 ++-- .../everspring-flood-sensor.groovy | 2 +- .../sylvania-ultra-iq.src/sylvania-ultra-iq.groovy | 2 +- .../zwave-dimmer-switch-generic.groovy | 4 ++-- .../zwave-switch-secure.src/zwave-switch-secure.groovy | 2 +- .../zwave-virtual-momentary-contact-switch.groovy | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy b/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy index e356fe6..1123df1 100644 --- a/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy +++ b/devicetypes/smartthings/aeon-outlet.src/aeon-outlet.groovy @@ -45,7 +45,7 @@ metadata { // tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } valueTile("energy", "device.energy", decoration: "flat") { diff --git a/devicetypes/smartthings/danalock.src/danalock.groovy b/devicetypes/smartthings/danalock.src/danalock.groovy index 0cbc330..31834c1 100644 --- a/devicetypes/smartthings/danalock.src/danalock.groovy +++ b/devicetypes/smartthings/danalock.src/danalock.groovy @@ -33,10 +33,10 @@ metadata { tiles { standardTile("toggle", "device.lock", width: 2, height: 2) { - state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking" + state "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00a0dc", nextState:"unlocking" state "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking" state "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking" - state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821" + state "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#00a0dc" state "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff" } standardTile("lock", "device.lock", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy index dadd3f1..ef0fddd 100644 --- a/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy +++ b/devicetypes/smartthings/dimmer-switch.src/dimmer-switch.groovy @@ -54,9 +54,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy b/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy index f97fdde..3c72f29 100644 --- a/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy +++ b/devicetypes/smartthings/everspring-flood-sensor.src/everspring-flood-sensor.groovy @@ -33,7 +33,7 @@ metadata { multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){ tileAttribute ("device.water", key: "PRIMARY_CONTROL") { attributeState "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff" - attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0" + attributeState "wet", icon:"st.alarm.water.wet", backgroundColor:"#00a0dc" } } valueTile("battery", "device.battery", decoration: "flat", inactiveLabel: false, width: 2, height: 2) { diff --git a/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy b/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy index 4058ff6..1916ada 100644 --- a/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy +++ b/devicetypes/smartthings/sylvania-ultra-iq.src/sylvania-ultra-iq.groovy @@ -36,7 +36,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" } controlTile("levelSliderControl", "device.level", "slider", height: 2, width: 1, inactiveLabel: false) { state "level", action:"switch level.setLevel" diff --git a/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy b/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy index 498e438..7c9c575 100644 --- a/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy +++ b/devicetypes/smartthings/zwave-dimmer-switch-generic.src/zwave-dimmer-switch-generic.groovy @@ -54,9 +54,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/zwave-switch-secure.src/zwave-switch-secure.groovy b/devicetypes/smartthings/zwave-switch-secure.src/zwave-switch-secure.groovy index c35ebc0..a5a1dc1 100644 --- a/devicetypes/smartthings/zwave-switch-secure.src/zwave-switch-secure.groovy +++ b/devicetypes/smartthings/zwave-switch-secure.src/zwave-switch-secure.groovy @@ -33,7 +33,7 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/zwave-virtual-momentary-contact-switch.src/zwave-virtual-momentary-contact-switch.groovy b/devicetypes/smartthings/zwave-virtual-momentary-contact-switch.src/zwave-virtual-momentary-contact-switch.groovy index ac54c9a..5f4db51 100644 --- a/devicetypes/smartthings/zwave-virtual-momentary-contact-switch.src/zwave-virtual-momentary-contact-switch.groovy +++ b/devicetypes/smartthings/zwave-virtual-momentary-contact-switch.src/zwave-virtual-momentary-contact-switch.groovy @@ -39,7 +39,7 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: '${name}', action: "momentary.push", 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" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" From 6e94220e9e96646adc0925e2ecd4d1be644e8d46 Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Mon, 20 Feb 2017 18:08:12 +0530 Subject: [PATCH 06/17] [DVCSMP-2446] DTH UX Improvements for the following DTHs: 1. Cree Bulb 2. ZigBee Switch Power 3. Ecobee Sensor 4. Mobile Presence 5. On-Off Shield 6. Life360 User 7. WeMo Light Switch 8. Coopboss h3vx 9. Smartsense Moisture --- .../johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy | 8 ++++---- devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy | 4 ++-- .../smartthings/ecobee-sensor.src/ecobee-sensor.groovy | 4 ++-- .../smartthings/life360-user.src/life360-user.groovy | 2 +- .../mobile-presence.src/mobile-presence.groovy | 4 ++-- .../smartthings/on-off-shield.src/on-off-shield.groovy | 2 +- .../smartsense-moisture.src/smartsense-moisture.groovy | 6 +++--- .../wemo-light-switch.src/wemo-light-switch.groovy | 6 +++--- .../zigbee-switch-power.src/zigbee-switch-power.groovy | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy b/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy index 510c4ef..e398e09 100644 --- a/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy +++ b/devicetypes/johnrucker/coopboss-h3vx.src/coopboss-h3vx.groovy @@ -112,10 +112,10 @@ metadata { multiAttributeTile(name:"dtlsDoorCtrl", type:"generic", width:6, height:4) {tileAttribute("device.doorState", key: "PRIMARY_CONTROL") { attributeState "unknown", label: '${name}', action:"openDoor", icon: "st.secondary.tools", nextState:"Sent" - attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#0000ff", nextState:"Sent" - attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e" - attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821", nextState:"Sent" - attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e" + attributeState "open", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-open", backgroundColor: "#00A0DC", nextState:"Sent" + attributeState "opening", label: '${name}', action:"closeDoor", icon: "st.doors.garage.garage-opening", backgroundColor: "#00A0DC" + attributeState "closed", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ffffff", nextState:"Sent" + attributeState "closing", label: '${name}', action:"openDoor", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffffff" attributeState "jammed", label: '${name}', action:"closeDoorHiI", icon: "st.doors.garage.garage-open", backgroundColor: "#ff0000", nextState:"Sent" attributeState "forced close", label: "forced", action:"openDoor", icon: "st.doors.garage.garage-closed", backgroundColor: "#ff8000", nextState:"Sent" attributeState "fault", label: 'FAULT', action:"openDoor", icon: "st.secondary.tools", backgroundColor: "#ff0000", nextState:"Sent" diff --git a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy index 1fc593f..e04a47a 100644 --- a/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy +++ b/devicetypes/smartthings/cree-bulb.src/cree-bulb.groovy @@ -43,9 +43,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy b/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy index 381f6fc..312513b 100644 --- a/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy +++ b/devicetypes/smartthings/ecobee-sensor.src/ecobee-sensor.groovy @@ -47,8 +47,8 @@ metadata { } standardTile("motion", "device.motion") { - state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff") - state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0") + state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc") + state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC") } standardTile("refresh", "device.refresh", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/life360-user.src/life360-user.groovy b/devicetypes/smartthings/life360-user.src/life360-user.groovy index 5b72c64..c4c2b6f 100644 --- a/devicetypes/smartthings/life360-user.src/life360-user.groovy +++ b/devicetypes/smartthings/life360-user.src/life360-user.groovy @@ -29,7 +29,7 @@ metadata { tiles { standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) { - state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0") + state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC") state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff") } diff --git a/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy b/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy index 8ed14ab..7af7519 100644 --- a/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy +++ b/devicetypes/smartthings/mobile-presence.src/mobile-presence.groovy @@ -27,8 +27,8 @@ metadata { tiles { standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) { - state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#53a7c0") - state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ebeef2") + state("present", labelIcon:"st.presence.tile.mobile-present", backgroundColor:"#00A0DC") + state("not present", labelIcon:"st.presence.tile.mobile-not-present", backgroundColor:"#ffffff") } main "presence" details "presence" diff --git a/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy b/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy index 5286a25..1007c3d 100644 --- a/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy +++ b/devicetypes/smartthings/on-off-shield.src/on-off-shield.groovy @@ -31,7 +31,7 @@ metadata { // UI tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true, canChangeBackground: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } diff --git a/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy b/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy index 43577f1..ebd5888 100644 --- a/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy +++ b/devicetypes/smartthings/smartsense-moisture.src/smartsense-moisture.groovy @@ -37,13 +37,13 @@ metadata { multiAttributeTile(name:"water", type: "generic", width: 6, height: 4){ tileAttribute ("device.water", key: "PRIMARY_CONTROL") { attributeState "dry", label: "Dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff" - attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0" + attributeState "wet", label: "Wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC" } } standardTile("temperatureState", "device.temperature", width: 2, height: 2) { state "normal", icon:"st.alarm.temperature.normal", backgroundColor:"#ffffff" - state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#53a7c0" - state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#F80000" + state "freezing", icon:"st.alarm.temperature.freeze", backgroundColor:"#00A0DC" + state "overheated", icon:"st.alarm.temperature.overheat", backgroundColor:"#e86d13" } valueTile("temperature", "device.temperature", width: 2, height: 2) { state("temperature", label:'${currentValue}°', diff --git a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy index ad72065..b90a577 100644 --- a/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy +++ b/devicetypes/smartthings/wemo-light-switch.src/wemo-light-switch.groovy @@ -52,11 +52,11 @@ metadata { } standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.Home.home30", backgroundColor:"#00A0DC", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.Home.home30", backgroundColor:"#ffffff", nextState:"turningOn" - state "offline", label:'${name}', icon:"st.Home.home30", backgroundColor:"#ff0000" + state "offline", label:'${name}', icon:"st.Home.home30", backgroundColor:"#cccccc" } standardTile("refresh", "device.switch", inactiveLabel: false, height: 2, width: 2, decoration: "flat") { diff --git a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy index 8581252..9253465 100644 --- a/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy +++ b/devicetypes/smartthings/zigbee-switch-power.src/zigbee-switch-power.groovy @@ -33,9 +33,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("power", key: "SECONDARY_CONTROL") { From 1d2fe8af22b330932b4228b40de1c19d8f729136 Mon Sep 17 00:00:00 2001 From: Parijat Das Date: Mon, 20 Feb 2017 18:41:46 +0530 Subject: [PATCH 07/17] DTH UX Improvements for Page 12 of DTHs: From ZWave-Relay... to ...Pet-feeder-shield --- ...ro-door-window-sensor-zw5-with-temperature.groovy | 6 +++--- .../fibaro-door-window-sensor-zw5.groovy | 6 +++--- .../fibaro-flood-sensor-zw5.groovy | 8 ++++---- .../fibaro-motion-sensor-zw5.groovy | 4 ++-- .../aeon-led-bulb.src/aeon-led-bulb.groovy | 4 ++-- .../aeon-smartstrip.src/aeon-smartstrip.groovy | 4 ++-- .../centralite-thermostat.groovy | 4 ++-- .../smartsense-multi-sensor.groovy | 12 ++++++------ .../smartthings/zwave-relay.src/zwave-relay.groovy | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy index 56f12ac..47c3f4a 100644 --- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy +++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5-with-temperature.src/fibaro-door-window-sensor-zw5-with-temperature.groovy @@ -34,8 +34,8 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app tileAttribute("device.contact", key:"PRIMARY_CONTROL") { - attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e") - attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821") + attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13") + attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc") } tileAttribute("device.tamper", key:"SECONDARY_CONTROL") { @@ -44,7 +44,7 @@ metadata { } } - valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") { + valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") { state "battery", label:'${currentValue}% battery', unit:"" } diff --git a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy index f65f838..b05d959 100644 --- a/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy +++ b/devicetypes/fibargroup/fibaro-door-window-sensor-zw5.src/fibaro-door-window-sensor-zw5.groovy @@ -31,8 +31,8 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"FGK", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app tileAttribute("device.contact", key:"PRIMARY_CONTROL") { - attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#ffa81e") - attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#79b821") + attributeState("open", icon:"st.contact.contact.open", backgroundColor:"#e86d13") + attributeState("closed", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc") } tileAttribute("device.tamper", key:"SECONDARY_CONTROL") { @@ -41,7 +41,7 @@ metadata { } } - valueTile("battery", "device.battery", inactiveLabel: false, , width: 2, height: 2, decoration: "flat") { + valueTile("battery", "device.battery", inactiveLabel: false, width: 2, height: 2, decoration: "flat") { state "battery", label:'${currentValue}% battery', unit:"" } diff --git a/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy b/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy index 4ab0479..bf691d8 100644 --- a/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy +++ b/devicetypes/fibargroup/fibaro-flood-sensor-zw5.src/fibaro-flood-sensor-zw5.groovy @@ -32,13 +32,13 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"FGFS", type:"lighting", width:6, height:4) {//with generic type secondary control text is not displayed in Android app tileAttribute("device.water", key:"PRIMARY_CONTROL") { - attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#79b821") - attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#ffa81e") + attributeState("dry", icon:"st.alarm.water.dry", backgroundColor:"#00a0dc") + attributeState("wet", icon:"st.alarm.water.wet", backgroundColor:"#e86d13") } tileAttribute("device.tamper", key:"SECONDARY_CONTROL") { - attributeState("active", label:'tamper active', backgroundColor:"#53a7c0") - attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff") + attributeState("active", label:'tamper active', backgroundColor:"#00a0dc") + attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc") } } diff --git a/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy b/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy index ae882ed..b3be160 100644 --- a/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy +++ b/devicetypes/fibargroup/fibaro-motion-sensor-zw5.src/fibaro-motion-sensor-zw5.groovy @@ -38,8 +38,8 @@ metadata { } tileAttribute("device.tamper", key:"SECONDARY_CONTROL") { - attributeState("active", label:'tamper active', backgroundColor:"#53a7c0") - attributeState("inactive", label:'tamper inactive', backgroundColor:"#ffffff") + attributeState("active", label:'tamper active', backgroundColor:"#00a0dc") + attributeState("inactive", label:'tamper inactive', backgroundColor:"#cccccc") } } diff --git a/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy b/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy index fbcbc40..eecaa62 100644 --- a/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy +++ b/devicetypes/smartthings/aeon-led-bulb.src/aeon-led-bulb.groovy @@ -37,9 +37,9 @@ metadata { } standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy b/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy index cfd1330..ecb698f 100644 --- a/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy +++ b/devicetypes/smartthings/aeon-smartstrip.src/aeon-smartstrip.groovy @@ -60,7 +60,7 @@ metadata { // tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } valueTile("power", "device.power", decoration: "flat") { @@ -78,7 +78,7 @@ metadata { (1..4).each { n -> standardTile("switch$n", "switch$n", canChangeIcon: true) { - state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#79b821" + state "on", label: '${name}', action: "off$n", icon: "st.switches.switch.on", backgroundColor: "#00a0dc" state "off", label: '${name}', action: "on$n", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } valueTile("power$n", "power$n", decoration: "flat") { diff --git a/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy b/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy index 394ac2d..a2e6bda 100644 --- a/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy +++ b/devicetypes/smartthings/centralite-thermostat.src/centralite-thermostat.groovy @@ -55,13 +55,13 @@ metadata { state "fanOn", label:'${name}', action:"thermostat.setThermostatFanMode" } controlTile("heatSliderControl", "device.heatingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) { - state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#d04e00" + state "setHeatingSetpoint", action:"thermostat.setHeatingSetpoint", backgroundColor:"#e86d13" } valueTile("heatingSetpoint", "device.heatingSetpoint", inactiveLabel: false, decoration: "flat") { state "heat", label:'${currentValue}° heat', unit:"F", backgroundColor:"#ffffff" } controlTile("coolSliderControl", "device.coolingSetpoint", "slider", height: 1, width: 2, inactiveLabel: false) { - state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#1e9cbb" + state "setCoolingSetpoint", action:"thermostat.setCoolingSetpoint", backgroundColor: "#00a0dc" } valueTile("coolingSetpoint", "device.coolingSetpoint", inactiveLabel: false, decoration: "flat") { state "cool", label:'${currentValue}° cool', unit:"F", backgroundColor:"#ffffff" 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 f9cc7f0..8229414 100644 --- a/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy +++ b/devicetypes/smartthings/smartsense-multi-sensor.src/smartsense-multi-sensor.groovy @@ -76,15 +76,15 @@ metadata { tiles(scale: 2) { multiAttributeTile(name: "status", type: "generic", width: 6, height: 4) { tileAttribute("device.status", key: "PRIMARY_CONTROL") { - attributeState "open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#ffa81e" - attributeState "closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#79b821" - attributeState "garage-open", label: 'Open', icon: "st.doors.garage.garage-open", backgroundColor: "#ffa81e" - attributeState "garage-closed", label: 'Closed', icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821" + attributeState "open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#e86d13" + attributeState "closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#00a0dc" + attributeState "garage-open", label: 'Open', icon: "st.doors.garage.garage-open", backgroundColor: "#e86d13" + attributeState "garage-closed", label: 'Closed', icon: "st.doors.garage.garage-closed", backgroundColor: "#00a0dc" } } standardTile("contact", "device.contact", width: 2, height: 2) { - state("open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#ffa81e") - state("closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#79b821") + state("open", label: 'Open', icon: "st.contact.contact.open", backgroundColor: "#e86d13") + state("closed", label: 'Closed', icon: "st.contact.contact.closed", backgroundColor: "#00a0dc") } standardTile("acceleration", "device.acceleration", width: 2, height: 2) { state("active", label: 'Active', icon: "st.motion.acceleration.active", backgroundColor: "#53a7c0") diff --git a/devicetypes/smartthings/zwave-relay.src/zwave-relay.groovy b/devicetypes/smartthings/zwave-relay.src/zwave-relay.groovy index 7088340..ca6365e 100644 --- a/devicetypes/smartthings/zwave-relay.src/zwave-relay.groovy +++ b/devicetypes/smartthings/zwave-relay.src/zwave-relay.groovy @@ -38,7 +38,7 @@ metadata { // tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { From e687e76b3e0341027f82d463e45b88e7308ca0d8 Mon Sep 17 00:00:00 2001 From: Parijat Das Date: Tue, 21 Feb 2017 11:28:27 +0530 Subject: [PATCH 08/17] DTH UX Improvements for Page 13 of DTHs: From Rgbw-Light... to ...Smartsense-Virtual-Open-Closed --- .../arrival-sensor-ha.src/arrival-sensor-ha.groovy | 2 +- .../smartthings/cooper-rf9500.src/cooper-rf9500.groovy | 2 +- .../smartthings/ge-link-bulb.src/ge-link-bulb.groovy | 4 ++-- devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy | 4 ++-- .../smartsense-virtual-open-closed.groovy | 8 ++++---- .../tile-basic-carousel.src/tile-basic-carousel.groovy | 6 +++--- .../timevalve-smart.src/timevalve-smart.groovy | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy b/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy index f13b89b..e54657a 100644 --- a/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy +++ b/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy @@ -39,7 +39,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" } standardTile("beep", "device.beep", decoration: "flat") { diff --git a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy index 5e22791..cace3cc 100644 --- a/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy +++ b/devicetypes/smartthings/cooper-rf9500.src/cooper-rf9500.groovy @@ -36,7 +36,7 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: '${name}', action: "switch.on", icon: "st.Home.home30", backgroundColor: "#ffffff" - state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#79b821" + state "on", label: '${name}', action: "switch.off", icon: "st.Home.home30", backgroundColor: "#00a0dc" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", label:"", action:"refresh.refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy b/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy index a2b77ad..2510a2f 100644 --- a/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy +++ b/devicetypes/smartthings/ge-link-bulb.src/ge-link-bulb.groovy @@ -61,9 +61,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00a0dc", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy b/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy index fd729a3..f4c3c81 100644 --- a/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy +++ b/devicetypes/smartthings/rgbw-light.src/rgbw-light.groovy @@ -37,9 +37,9 @@ metadata { } standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00a0dc", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } standardTile("reset", "device.reset", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy b/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy index 5795f3e..4ffc9a2 100644 --- a/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy +++ b/devicetypes/smartthings/smartsense-virtual-open-closed.src/smartsense-virtual-open-closed.groovy @@ -51,12 +51,12 @@ metadata { tiles { standardTile("contact", "device.contact", width: 2, height: 2) { - state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e") - state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821") + state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13") + state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00a0dc") } standardTile("acceleration", "device.acceleration") { - state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0") - state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff") + state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00a0dc") + state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc") } valueTile("temperature", "device.temperature") { state("temperature", label:'${currentValue}°', diff --git a/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy b/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy index 19a9d91..0af22a2 100644 --- a/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy +++ b/devicetypes/smartthings/tile-ux/tile-basic-carousel.src/tile-basic-carousel.groovy @@ -41,9 +41,9 @@ metadata { attributeState("default", label:'${currentValue}%', unit:"%") } tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") { - attributeState("idle", backgroundColor:"#44b621") - attributeState("heating", backgroundColor:"#ffa81e") - attributeState("cooling", backgroundColor:"#269bd2") + attributeState("idle", backgroundColor:"#ffffff") + attributeState("heating", backgroundColor:"#e86d13") + attributeState("cooling", backgroundColor:"#00a0dc") } tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") { attributeState("off", label:'${name}') diff --git a/devicetypes/timevalve-gaslock-t-08/timevalve-smart.src/timevalve-smart.groovy b/devicetypes/timevalve-gaslock-t-08/timevalve-smart.src/timevalve-smart.groovy index 53df65a..feca26e 100644 --- a/devicetypes/timevalve-gaslock-t-08/timevalve-smart.src/timevalve-smart.groovy +++ b/devicetypes/timevalve-gaslock-t-08/timevalve-smart.src/timevalve-smart.groovy @@ -25,12 +25,12 @@ metadata { tiles (scale: 2) { multiAttributeTile(name:"statusTile", type:"generic", width:6, height:4) { tileAttribute("device.contact", key: "PRIMARY_CONTROL") { - attributeState "open", label: '${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#ffa81e" - attributeState "closed", label:'${name}', action: "", icon:"st.contact.contact.closed", backgroundColor:"#79b821" + attributeState "open", label: '${name}', action: "close", icon:"st.contact.contact.open", backgroundColor:"#e86d13" + attributeState "closed", label:'${name}', action: "", icon:"st.contact.contact.closed", backgroundColor:"#00a0dc" } tileAttribute("device.remainingText", key: "SECONDARY_CONTROL") { - attributeState "open", label: '${currentValue}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e" - attributeState "closed", label:'', icon:"st.contact.contact.closed", backgroundColor:"#79b821" + attributeState "open", label: '${currentValue}', icon:"st.contact.contact.open", backgroundColor:"#e86d13" + attributeState "closed", label:'', icon:"st.contact.contact.closed", backgroundColor:"#00a0dc" } } From 379e70b3439544703323b544bbfcc3d3379b6126 Mon Sep 17 00:00:00 2001 From: "piyush.c" Date: Mon, 20 Feb 2017 17:54:54 +0530 Subject: [PATCH 09/17] [DVCSMP-2441] Standardize Page 2 of DTH UX Improvements --- .../acceleration-sensor-capability.groovy | 4 +- .../contact-sensor-capability.groovy | 4 +- .../motion-sensor-capability.groovy | 2 +- .../switch-level-capability.groovy | 4 +- .../water-sensor-capability.groovy | 2 +- .../spruce-controller.groovy | 38 +++++++++---------- .../simulated-garage-door-opener.groovy | 8 ++-- .../simulated-switch.groovy | 2 +- .../tile-basic-standard.groovy | 6 +-- .../tile-multiattribute-lighting.groovy | 16 ++++---- 10 files changed, 43 insertions(+), 43 deletions(-) diff --git a/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy b/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy index 14ec809..a1e00b7 100644 --- a/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy +++ b/devicetypes/capabilities/acceleration-sensor-capability.src/acceleration-sensor-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy b/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy index 1aa6f22..a134693 100644 --- a/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy +++ b/devicetypes/capabilities/contact-sensor-capability.src/contact-sensor-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy b/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy index 52cc2b9..493173f 100644 --- a/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy +++ b/devicetypes/capabilities/motion-sensor-capability.src/motion-sensor-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy b/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy index 15230bc..58fc9aa 100644 --- a/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy +++ b/devicetypes/capabilities/switch-level-capability.src/switch-level-capability.groovy @@ -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) { diff --git a/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy b/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy index 5b338e5..567bcf0 100644 --- a/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy +++ b/devicetypes/capabilities/water-sensor-capability.src/water-sensor-capability.groovy @@ -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" diff --git a/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy b/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy index 0025def..baf2f1a 100644 --- a/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy +++ b/devicetypes/plaidsystems/spruce-controller.src/spruce-controller.groovy @@ -122,13 +122,13 @@ metadata { state "raintoday", label: 'Rain Today', icon: "st.custom.wuk.nt_chancerain" state "rainy", label: 'Previous Rain', icon: "st.custom.wuk.nt_chancerain" state "raintom", label: 'Rain Tomorrow', icon: "st.custom.wuk.nt_chancerain" - state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#52c435" + state "donewweek", label: 'Spruce Finished', icon: "st.Outdoor.outdoor5", backgroundColor: "#00A0DC" state "skipping", label: 'Skip Today', icon: "st.Outdoor.outdoor20", backgroundColor: "#36cfe3" state "moisture", label: '', icon: "st.Weather.weather2", backgroundColor: "#36cfe3" - state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#f2a51f" + state "pause", label: 'PAUSE', icon: "st.contact.contact.open", backgroundColor: "#e86d13" state "active", label: 'Active', icon: "st.Outdoor.outdoor12", backgroundColor: "#3DC72E" state "season", label: 'Seasonal Adjustment', icon: "st.Outdoor.outdoor17", backgroundColor: "#ffb900" - state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#888888" + state "disable", label: 'Disabled', icon: "st.secondary.off", backgroundColor: "#cccccc" state "warning", label: '', icon: "st.categories.damageAndDanger", backgroundColor: "#ffff7f" state "alarm", label: 'Alarm', icon: "st.categories.damageAndDanger", backgroundColor: "#f9240c" } @@ -144,67 +144,67 @@ metadata { } standardTile("switch1", "device.switch1") { state "z1off", label: '1', action: "z1on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z1on", label: '1', action: "z1off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch2", "device.switch2") { state "z2off", label: '2', action: "z2on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z2on", label: '2', action: "z2off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch3", "device.switch3", inactiveLabel: false) { state "z3off", label: '3', action: "z3on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z3on", label: '3', action: "z3off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch4", "device.switch4", inactiveLabel: false) { state "z4off", label: '4', action: "z4on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z4on", label: '4', action: "z4off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch5", "device.switch5", inactiveLabel: false) { state "z5off", label: '5', action: "z5on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z5on", label: '5', action: "z5off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch6", "device.switch6", inactiveLabel: false) { state "z6off", label: '6', action: "z6on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z6on", label: '6', action: "z6off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch7", "device.switch7", inactiveLabel: false) { state "z7off", label: '7', action: "z7on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z7on", label: '7', action: "z7off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch8", "device.switch8", inactiveLabel: false) { state "z8off", label: '8', action: "z8on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z8on", label: '8', action: "z8off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch9", "device.switch9", inactiveLabel: false) { state "z9off", label: '9', action: "z9on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z9on", label: '9', action: "z9off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch10", "device.switch10", inactiveLabel: false) { state "z10off", label: '10', action: "z10on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z10on", label: '10', action: "z10off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch11", "device.switch11", inactiveLabel: false) { state "z11off", label: '11', action: "z11on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z11on", label: '11', action: "z11off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch12", "device.switch12", inactiveLabel: false) { state "z12off", label: '12', action: "z12on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z12on", label: '12', action: "z12off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch13", "device.switch13", inactiveLabel: false) { state "z13off", label: '13', action: "z13on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z13on", label: '13', action: "z13off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch14", "device.switch14", inactiveLabel: false) { state "z14off", label: '14', action: "z14on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z14on", label: '14', action: "z14off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch15", "device.switch15", inactiveLabel: false) { state "z15off", label: '15', action: "z15on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z15on", label: '15', action: "z15off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("switch16", "device.switch16", inactiveLabel: false) { state "z16off", label: '16', action: "z16on", icon: "st.valves.water.closed", backgroundColor: "#ffffff" - state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#46c2e8" + state "z16on", label: '16', action: "z16off", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", action: "refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy b/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy index a54c567..3b37682 100644 --- a/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy +++ b/devicetypes/smartthings/testing/simulated-garage-door-opener.src/simulated-garage-door-opener.groovy @@ -29,10 +29,10 @@ metadata { tiles { standardTile("toggle", "device.door", width: 2, height: 2) { - state("closed", label:'${name}', action:"door control.open", icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821", nextState:"opening") - state("open", label:'${name}', action:"door control.close", icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e", nextState:"closing") - state("opening", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#ffe71e") - state("closing", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#ffe71e") + state("closed", label:'${name}', action:"door control.open", icon:"st.doors.garage.garage-closed", backgroundColor:"#00A0DC", nextState:"opening") + state("open", label:'${name}', action:"door control.close", icon:"st.doors.garage.garage-open", backgroundColor:"#e86d13", nextState:"closing") + state("opening", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#e86d13") + state("closing", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#00A0DC") } standardTile("open", "device.door", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy b/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy index a977b86..8bf8088 100644 --- a/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy +++ b/devicetypes/smartthings/testing/simulated-switch.src/simulated-switch.groovy @@ -26,7 +26,7 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" - state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821" + state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC" } standardTile("on", "device.switch", decoration: "flat") { state "default", label: 'On', action: "onPhysical", backgroundColor: "#ffffff" diff --git a/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy b/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy index 1f4f029..21fcea6 100644 --- a/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy +++ b/devicetypes/smartthings/tile-ux/tile-basic-standard.src/tile-basic-standard.groovy @@ -24,19 +24,19 @@ metadata { // standard tile with actions standardTile("actionRings", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" - state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821" + state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC" } // standard flat tile with actions standardTile("actionFlat", "device.switch", width: 2, height: 2, canChangeIcon: true, decoration: "flat") { state "off", label: '${currentValue}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" - state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821" + state "on", label: '${currentValue}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC" } // standard flat tile without actions standardTile("noActionFlat", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: '${currentValue}',icon: "st.switches.switch.off", backgroundColor: "#ffffff" - state "on", label: '${currentValue}', icon: "st.switches.switch.on", backgroundColor: "#79b821" + state "on", label: '${currentValue}', icon: "st.switches.switch.on", backgroundColor: "#00A0DC" } // standard flat tile with only a label diff --git a/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy b/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy index 7ffaabc..283f5a5 100644 --- a/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy +++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-lighting.src/tile-multiattribute-lighting.groovy @@ -33,9 +33,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) { tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.power", key: "SECONDARY_CONTROL") { @@ -51,9 +51,9 @@ metadata { multiAttributeTile(name:"switchNoPower", type: "lighting", width: 6, height: 4, canChangeIcon: true) { tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { @@ -66,9 +66,9 @@ metadata { multiAttributeTile(name:"switchNoSlider", type: "lighting", width: 6, height: 4, canChangeIcon: true) { tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.power", key: "SECONDARY_CONTROL") { @@ -81,9 +81,9 @@ metadata { multiAttributeTile(name:"switchNoSliderOrColor", type: "lighting", width: 6, height: 4, canChangeIcon: true) { tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.power", key: "SECONDARY_CONTROL") { From 31c037e7ab773d47e6fb4480c453606b8388d614 Mon Sep 17 00:00:00 2001 From: rappleg Date: Sat, 25 Feb 2017 11:05:08 -0600 Subject: [PATCH 10/17] DVCSMP-2474 Arrival Sensor HA schedule needs jitter to avoid all firing at top of minute --- .../smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy b/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy index f13b89b..6b772b3 100644 --- a/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy +++ b/devicetypes/smartthings/arrival-sensor-ha.src/arrival-sensor-ha.groovy @@ -151,7 +151,7 @@ private handlePresenceEvent(present) { private startTimer() { log.debug "Scheduling periodic timer" - schedule("0 * * * * ?", checkPresenceCallback) + runEvery1Minute("checkPresenceCallback") } private stopTimer() { From 6381580e44d19169595cf944258da51a509ad616 Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Tue, 28 Feb 2017 16:22:14 +0530 Subject: [PATCH 11/17] [DVCSMP-2447] DTH UX Improvements for the following DTHs: 1. Harmony Activity 2. Hue Bridge 3. Smartsense Garage Door Multi 4. Smartsense Garage Door Sensor Button 5. WeMo Motion 6. ZigBee Dimmer 7. ZigBee RGB Bulb 8. ZigBee Lock 9. ZLL RGB Bulb 10. Smart Block --- .../harmony-activity.src/harmony-activity.groovy | 2 +- .../smartthings/hue-bridge.src/hue-bridge.groovy | 2 +- .../smartsense-garage-door-multi.groovy | 14 +++++++------- .../smartsense-garage-door-sensor-button.groovy | 10 +++++----- .../smartthings/wemo-motion.src/wemo-motion.groovy | 6 +++--- .../zigbee-dimmer.src/zigbee-dimmer.groovy | 4 ++-- .../smartthings/zigbee-lock.src/zigbee-lock.groovy | 4 ++-- .../zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy | 4 ++-- .../zll-rgb-bulb.src/zll-rgb-bulb.groovy | 4 ++-- .../minecraft/smart-block.src/smart-block.groovy | 4 ++-- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy b/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy index e87a185..56bb6d2 100644 --- a/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy +++ b/devicetypes/smartthings/harmony-activity.src/harmony-activity.groovy @@ -32,7 +32,7 @@ metadata { tiles { standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: 'Off', action: "switch.on", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#ffffff", nextState: "on" - state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#79b821", nextState: "off" + state "on", label: 'On', action: "switch.off", icon: "st.harmony.harmony-hub-icon", backgroundColor: "#00A0DC", nextState: "off" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy b/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy index 08f11ef..b6e4267 100644 --- a/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy +++ b/devicetypes/smartthings/hue-bridge.src/hue-bridge.groovy @@ -27,7 +27,7 @@ metadata { multiAttributeTile(name:"rich-control"){ tileAttribute ("device.status", key: "PRIMARY_CONTROL") { attributeState "Offline", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#ffffff" - attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#79b821" + attributeState "Online", label: '${currentValue}', action: "", icon: "st.Lighting.light99-hue", backgroundColor: "#00A0DC" } } valueTile("doNotRemove", "v", decoration: "flat", height: 2, width: 6, inactiveLabel: false) { diff --git a/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy b/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy index 7cf58bf..435cb2a 100644 --- a/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy +++ b/devicetypes/smartthings/smartsense-garage-door-multi.src/smartsense-garage-door-multi.groovy @@ -50,18 +50,18 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"status", type: "generic", width: 6, height: 4){ tileAttribute ("device.status", key: "PRIMARY_CONTROL") { - attributeState "closed", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#79b821", nextState:"opening" - attributeState "open", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#ffa81e", nextState:"closing" - attributeState "opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#ffe71e" - attributeState "closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#ffe71e" + attributeState "closed", label:'${name}', icon:"st.doors.garage.garage-closed", backgroundColor:"#00A0DC", nextState:"opening" + attributeState "open", label:'${name}', icon:"st.doors.garage.garage-open", backgroundColor:"#e86d13", nextState:"closing" + attributeState "opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#e86d13" + attributeState "closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#00A0DC" } } standardTile("contact", "device.contact", width: 2, height: 2) { - state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e") - state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821") + state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13") + state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC") } standardTile("acceleration", "device.acceleration", decoration: "flat", width: 2, height: 2) { - state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0") + state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC") state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff") } valueTile("temperature", "device.temperature", decoration: "flat", width: 2, height: 2) { diff --git a/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy b/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy index 1a2345c..1ff5426 100644 --- a/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy +++ b/devicetypes/smartthings/smartsense-garage-door-sensor-button.src/smartsense-garage-door-sensor-button.groovy @@ -50,17 +50,17 @@ metadata { tiles { standardTile("status", "device.status", width: 2, height: 2) { - state("closed", label:'${name}', icon:"st.doors.garage.garage-closed", action: "actuate", backgroundColor:"#79b821", nextState:"opening") - state("open", label:'${name}', icon:"st.doors.garage.garage-open", action: "actuate", backgroundColor:"#ffa81e", nextState:"closing") - state("opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#ffe71e") - state("closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#ffe71e") + state("closed", label:'${name}', icon:"st.doors.garage.garage-closed", action: "actuate", backgroundColor:"#00A0DC", nextState:"opening") + state("open", label:'${name}', icon:"st.doors.garage.garage-open", action: "actuate", backgroundColor:"#e86d13", nextState:"closing") + state("opening", label:'${name}', icon:"st.doors.garage.garage-opening", backgroundColor:"#e86d13") + state("closing", label:'${name}', icon:"st.doors.garage.garage-closing", backgroundColor:"#00A0DC") } standardTile("contact", "device.contact") { state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e") state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821") } standardTile("acceleration", "device.acceleration", decoration: "flat") { - state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#53a7c0") + state("active", label:'${name}', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC") state("inactive", label:'${name}', icon:"st.motion.acceleration.inactive", backgroundColor:"#ffffff") } valueTile("temperature", "device.temperature", decoration: "flat") { diff --git a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy index dd5f1fa..fe844f2 100644 --- a/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy +++ b/devicetypes/smartthings/wemo-motion.src/wemo-motion.groovy @@ -36,9 +36,9 @@ tiles(scale: 2) { multiAttributeTile(name:"rich-control", type: "motion", canChangeIcon: true){ tileAttribute ("device.motion", key: "PRIMARY_CONTROL") { - attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0" - attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff" - attributeState "offline", label:'${name}', icon:"st.motion.motion.active", backgroundColor:"#ff0000" + attributeState "active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC" + attributeState "inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc" + attributeState "offline", label:'${name}', icon:"st.motion.motion.active", backgroundColor:"#cccccc" } tileAttribute ("currentIP", key: "SECONDARY_CONTROL") { attributeState "currentIP", label: '' diff --git a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy index 8fe39fc..55b22f2 100644 --- a/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy +++ b/devicetypes/smartthings/zigbee-dimmer.src/zigbee-dimmer.groovy @@ -38,9 +38,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy index 27ba626..fb31a6b 100644 --- a/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy +++ b/devicetypes/smartthings/zigbee-lock.src/zigbee-lock.groovy @@ -39,10 +39,10 @@ import physicalgraph.zigbee.zcl.DataType tiles(scale: 2) { multiAttributeTile(name:"toggle", type:"generic", width:6, height:4){ tileAttribute ("device.lock", key:"PRIMARY_CONTROL") { - attributeState "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#79b821", nextState:"unlocking" + attributeState "locked", label:'locked', action:"lock.unlock", icon:"st.locks.lock.locked", backgroundColor:"#00A0DC", nextState:"unlocking" attributeState "unlocked", label:'unlocked', action:"lock.lock", icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff", nextState:"locking" attributeState "unknown", label:"unknown", action:"lock.lock", icon:"st.locks.lock.unknown", backgroundColor:"#ffffff", nextState:"locking" - attributeState "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#79b821" + attributeState "locking", label:'locking', icon:"st.locks.lock.locked", backgroundColor:"#00A0DC" attributeState "unlocking", label:'unlocking', icon:"st.locks.lock.unlocked", backgroundColor:"#ffffff" } } diff --git a/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy b/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy index 0698ddf..4b0ad25 100644 --- a/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy +++ b/devicetypes/smartthings/zigbee-rgb-bulb.src/zigbee-rgb-bulb.groovy @@ -38,9 +38,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy b/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy index 977774a..1e5345f 100644 --- a/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy +++ b/devicetypes/smartthings/zll-rgb-bulb.src/zll-rgb-bulb.groovy @@ -29,9 +29,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy b/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy index d5ec4c0..f17a4cf 100644 --- a/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy +++ b/devicetypes/vlaminck/minecraft/smart-block.src/smart-block.groovy @@ -39,8 +39,8 @@ metadata { tiles { standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) { state "off", label: '${name}', icon: "st.switches.switch.off", backgroundColor: "#ffffff", action: "switch.on", nextState: "turningOn" - state "turningOn", label: '${name}', icon: "st.switches.switch.on", backgroundColor: "#79b821" - state "on", label: '${name}', icon: "st.switches.switch.on", backgroundColor: "#79b821", action: "switch.off", nextState: "turningOff" + state "turningOn", label: '${name}', icon: "st.switches.switch.on", backgroundColor: "#00A0DC" + state "on", label: '${name}', icon: "st.switches.switch.on", backgroundColor: "#00A0DC", action: "switch.off", nextState: "turningOff" state "turningOff", label: '${name}', icon: "st.switches.switch.off", backgroundColor: "#ffffff" } valueTile("level", "device.level", height: 1, width: 1, inactiveLabel: false) { From 2610f00a82b04110e3a5cc93cc8380c99ac8d4fc Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Tue, 28 Feb 2017 17:23:13 +0530 Subject: [PATCH 12/17] [DVCSMP-2448] DTH UX Improvements for the following DTHs: 1. Aeon Illuminator Module 2. Foscam 3. Secure Dimmer 4. WeMo Bulb 5. Z- wave Metering Dimmer 6. TCP Bulb --- .../aeon-illuminator-module.groovy | 4 ++-- devicetypes/smartthings/foscam.src/foscam.groovy | 2 +- .../smartthings/secure-dimmer.src/secure-dimmer.groovy | 4 ++-- devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy | 4 ++-- .../zwave-metering-dimmer.src/zwave-metering-dimmer.groovy | 4 ++-- devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy b/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy index 2f2c747..ab84256 100644 --- a/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy +++ b/devicetypes/smartthings/aeon-illuminator-module.src/aeon-illuminator-module.groovy @@ -47,9 +47,9 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821" + 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) { diff --git a/devicetypes/smartthings/foscam.src/foscam.groovy b/devicetypes/smartthings/foscam.src/foscam.groovy index c509e65..737ac6b 100644 --- a/devicetypes/smartthings/foscam.src/foscam.groovy +++ b/devicetypes/smartthings/foscam.src/foscam.groovy @@ -41,7 +41,7 @@ standardTile("take", "device.image", width: 1, height: 1, canChangeIcon: false, inactiveLabel: true, canChangeBackground: false) { state "take", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking" - state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#53a7c0" + state "taking", label:'Taking', action: "", icon: "st.camera.dropcam", backgroundColor: "#00A0DC" state "image", label: "Take", action: "Image Capture.take", icon: "st.camera.dropcam", backgroundColor: "#FFFFFF", nextState:"taking" } diff --git a/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy b/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy index 82af5e4..5c0f599 100644 --- a/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy +++ b/devicetypes/smartthings/secure-dimmer.src/secure-dimmer.groovy @@ -42,9 +42,9 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 3, inactiveLabel: false) { diff --git a/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy b/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy index 243dafb..8f98b02 100644 --- a/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy +++ b/devicetypes/smartthings/wemo-bulb.src/wemo-bulb.groovy @@ -43,9 +43,9 @@ metadata { // UI tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { diff --git a/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy b/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy index 5e95f5a..4b2fba2 100644 --- a/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy +++ b/devicetypes/smartthings/zwave-metering-dimmer.src/zwave-metering-dimmer.groovy @@ -57,9 +57,9 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#79b821" + state "turningOn", label:'${name}', icon:"st.switches.switch.on", backgroundColor:"#00A0DC" state "turningOff", label:'${name}', icon:"st.switches.switch.off", backgroundColor:"#ffffff" } valueTile("power", "device.power") { diff --git a/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy b/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy index 186c8b2..124808a 100644 --- a/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy +++ b/devicetypes/wackford/tcp-bulb.src/tcp-bulb.groovy @@ -70,9 +70,9 @@ metadata { tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + state "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" state "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } controlTile("levelSliderControl", "device.level", "slider", height: 1, width: 2, inactiveLabel: false) { From a006799ad36c29beefa5880bf34ad85d60b455fb Mon Sep 17 00:00:00 2001 From: "sushant.k1" Date: Tue, 28 Feb 2017 17:35:31 +0530 Subject: [PATCH 13/17] [DVCSMP-2449] DTH UX Improvements for the following DTHs: 1. Hue Bulb 2. Lifx Color Bulb 3. Lifx White Bulb 4. Smartpower Outlet 5. Zigbee Dimmer Power 6. ZLL RGBW Bulb 7. ZLL White Color Temperature Bulb --- devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy | 4 ++-- .../smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy | 4 ++-- .../smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy | 4 ++-- .../smartpower-outlet.src/smartpower-outlet.groovy | 4 ++-- .../zigbee-dimmer-power.src/zigbee-dimmer-power.groovy | 4 ++-- .../smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy | 4 ++-- .../zll-white-color-temperature-bulb.groovy | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy index a2c1a7a..377f05b 100644 --- a/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy +++ b/devicetypes/smartthings/hue-bulb.src/hue-bulb.groovy @@ -32,9 +32,9 @@ metadata { tiles (scale: 2){ multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy b/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy index 5240c60..964f8bf 100644 --- a/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy +++ b/devicetypes/smartthings/lifx-color-bulb.src/lifx-color-bulb.groovy @@ -24,9 +24,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn" } diff --git a/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy b/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy index bc559c8..472f269 100644 --- a/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy +++ b/devicetypes/smartthings/lifx-white-bulb.src/lifx-white-bulb.groovy @@ -23,9 +23,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'Turning on', action:"switch.off", icon:"http://hosted.lifx.co/smartthings/v1/196xOn.png", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'Turning off', action:"switch.on", icon:"http://hosted.lifx.co/smartthings/v1/196xOff.png", backgroundColor:"#ffffff", nextState:"turningOn" } diff --git a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy index 0261b47..76e0dc7 100644 --- a/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy +++ b/devicetypes/smartthings/smartpower-outlet.src/smartpower-outlet.groovy @@ -56,9 +56,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name: "switch", type: "lighting", width: 6, height: 4, canChangeIcon: true) { tileAttribute("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff" + attributeState "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "turningOff" attributeState "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn" - attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "turningOff" + attributeState "turningOn", label: 'Turning On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "turningOff" attributeState "turningOff", label: 'Turning Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "turningOn" } tileAttribute("power", key: "SECONDARY_CONTROL") { diff --git a/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy b/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy index 9b3901a..ceea649 100644 --- a/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy +++ b/devicetypes/smartthings/zigbee-dimmer-power.src/zigbee-dimmer-power.groovy @@ -34,9 +34,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.switch.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.switch.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy b/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy index aff9fa7..74cb921 100644 --- a/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy +++ b/devicetypes/smartthings/zll-rgbw-bulb.src/zll-rgbw-bulb.groovy @@ -38,9 +38,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy b/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy index 737a933..ee3130d 100644 --- a/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy +++ b/devicetypes/smartthings/zll-white-color-temperature-bulb.src/zll-white-color-temperature-bulb.groovy @@ -39,9 +39,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.switches.light.on", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.switches.light.off", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { From 72c75882cf124fc284034eaa0729b276b9aae4b3 Mon Sep 17 00:00:00 2001 From: "piyush.c" Date: Tue, 28 Feb 2017 18:32:02 +0530 Subject: [PATCH 14/17] [DVCSMP-2443] Standardize Page 4 of DTH UX Improvements --- .../lock-capability.src/lock-capability.groovy | 2 +- .../momentary-capability.groovy | 2 +- .../presence-sensor-capability.groovy | 2 +- .../switch-capability.groovy | 2 +- .../aeon-key-fob.src/aeon-key-fob.groovy | 16 ++++++++-------- .../hue-white-ambiance-bulb.groovy | 4 ++-- .../motion-detector.src/motion-detector.groovy | 4 ++-- .../smartpower-outlet-v1.groovy | 2 +- .../simulated-thermostat.groovy | 10 +++++----- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/devicetypes/capabilities/lock-capability.src/lock-capability.groovy b/devicetypes/capabilities/lock-capability.src/lock-capability.groovy index 634e7c6..dde6b62 100644 --- a/devicetypes/capabilities/lock-capability.src/lock-capability.groovy +++ b/devicetypes/capabilities/lock-capability.src/lock-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy b/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy index 9fa0a6b..688f2e2 100644 --- a/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy +++ b/devicetypes/capabilities/momentary-capability.src/momentary-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy b/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy index d90d7fa..219234b 100644 --- a/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy +++ b/devicetypes/capabilities/presence-sensor-capability.src/presence-sensor-capability.groovy @@ -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" diff --git a/devicetypes/capabilities/switch-capability.src/switch-capability.groovy b/devicetypes/capabilities/switch-capability.src/switch-capability.groovy index dc2070f..3b5a01e 100644 --- a/devicetypes/capabilities/switch-capability.src/switch-capability.groovy +++ b/devicetypes/capabilities/switch-capability.src/switch-capability.groovy @@ -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" diff --git a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy index 40f5403..a782169 100644 --- a/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy +++ b/devicetypes/smartthings/aeon-key-fob.src/aeon-key-fob.groovy @@ -37,14 +37,14 @@ metadata { tiles { standardTile("button", "device.button", width: 2, height: 2) { state "default", label: "", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffffff" - state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821" - state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821" - state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821" - state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#79b821" - state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e" - state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e" - state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e" - state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#ffa81e" + state "button 1 pushed", label: "pushed #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC" + state "button 2 pushed", label: "pushed #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC" + state "button 3 pushed", label: "pushed #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC" + state "button 4 pushed", label: "pushed #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#00A0DC" + state "button 1 held", label: "held #1", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13" + state "button 2 held", label: "held #2", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13" + state "button 3 held", label: "held #3", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13" + state "button 4 held", label: "held #4", icon: "st.unknown.zwave.remote-controller", backgroundColor: "#e86d13" } valueTile("battery", "device.battery", inactiveLabel: false, decoration: "flat") { state "battery", label:'${currentValue}% battery', unit:"" diff --git a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy b/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy index 6d1fa16..9c19381 100644 --- a/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy +++ b/devicetypes/smartthings/hue-white-ambiance-bulb.src/hue-white-ambiance-bulb.groovy @@ -28,9 +28,9 @@ metadata { tiles (scale: 2){ multiAttributeTile(name:"rich-control", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/motion-detector.src/motion-detector.groovy b/devicetypes/smartthings/motion-detector.src/motion-detector.groovy index a7c86a4..ca1de53 100644 --- a/devicetypes/smartthings/motion-detector.src/motion-detector.groovy +++ b/devicetypes/smartthings/motion-detector.src/motion-detector.groovy @@ -28,8 +28,8 @@ metadata { // UI tile definitions tiles { standardTile("motion", "device.motion", width: 2, height: 2) { - state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0") - state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff") + state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC") + state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc") } main "motion" diff --git a/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy b/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy index 4be7bce..0987f0d 100644 --- a/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy +++ b/devicetypes/smartthings/smartpower-outlet-v1.src/smartpower-outlet-v1.groovy @@ -23,7 +23,7 @@ metadata { multiAttributeTile(name:"switch", type: "lighting", width: 6, height: 4, canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { attributeState "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" - attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821" + attributeState "on", label: '${name}', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC" } } main "switch" diff --git a/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy b/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy index 63d08f8..998dba9 100644 --- a/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy +++ b/devicetypes/smartthings/testing/simulated-thermostat.src/simulated-thermostat.groovy @@ -101,9 +101,9 @@ metadata { standardTile("mode", "device.thermostatMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") { state "off", label:'${name}', action:"thermostat.heat", backgroundColor:"#ffffff" - state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffa81e" - state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#269bd2" - state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#79b821" + state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13" + state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#00A0DC" + state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC" } standardTile("fanMode", "device.thermostatFanMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") { state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff" @@ -112,8 +112,8 @@ metadata { } standardTile("operatingState", "device.thermostatOperatingState", width: 2, height: 2) { state "idle", label:'${name}', backgroundColor:"#ffffff" - state "heating", label:'${name}', backgroundColor:"#ffa81e" - state "cooling", label:'${name}', backgroundColor:"#269bd2" + state "heating", label:'${name}', backgroundColor:"#e86d13" + state "cooling", label:'${name}', backgroundColor:"#00A0DC" } main("thermostatMulti") From fe5a965f6fa146eeefdf42137916db8e1edd5910 Mon Sep 17 00:00:00 2001 From: "piyush.c" Date: Tue, 28 Feb 2017 19:07:03 +0530 Subject: [PATCH 15/17] [DVCSMP-2444] Standardize Page 5 of DTH UX Improvements --- .../on-off-button-tile.src/on-off-button-tile.groovy | 2 +- .../open-closed-sensor.src/open-closed-sensor.groovy | 4 ++-- devicetypes/smartthings/spark.src/spark.groovy | 2 +- .../simulated-contact-sensor.groovy | 4 ++-- .../testing/simulated-lock.src/simulated-lock.groovy | 2 +- .../simulated-motion-sensor.groovy | 4 ++-- .../simulated-presence-sensor.groovy | 2 +- .../simulated-water-sensor.src/simulated-water-sensor.groovy | 2 +- .../simulated-water-valve.src/simulated-water-valve.groovy | 4 ++-- .../quirky-wink-porkfolio.src/quirky-wink-porkfolio.groovy | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy b/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy index 59b82bf..ec86e5a 100644 --- a/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy +++ b/devicetypes/smartthings/on-off-button-tile.src/on-off-button-tile.groovy @@ -31,7 +31,7 @@ metadata { tiles { standardTile("button", "device.switch", width: 2, height: 2, canChangeIcon: true) { state "off", label: 'Off', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff", nextState: "on" - state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#79b821", nextState: "off" + state "on", label: 'On', action: "switch.off", icon: "st.switches.switch.on", backgroundColor: "#00A0DC", nextState: "off" } main "button" details "button" diff --git a/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy b/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy index 6c2e42e..8883096 100644 --- a/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy +++ b/devicetypes/smartthings/open-closed-sensor.src/open-closed-sensor.groovy @@ -29,8 +29,8 @@ metadata { // UI tile definitions tiles { standardTile("contact", "device.contact", width: 2, height: 2) { - state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#ffa81e" - state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#79b821" + state "open", label: '${name}', icon: "st.contact.contact.open", backgroundColor: "#e86d13" + state "closed", label: '${name}', icon: "st.contact.contact.closed", backgroundColor: "#00A0DC" } main "contact" diff --git a/devicetypes/smartthings/spark.src/spark.groovy b/devicetypes/smartthings/spark.src/spark.groovy index 3f74ce4..84e08d5 100644 --- a/devicetypes/smartthings/spark.src/spark.groovy +++ b/devicetypes/smartthings/spark.src/spark.groovy @@ -20,7 +20,7 @@ metadata { // tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - 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" state "off", label: '${name}', action: "switch.on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } diff --git a/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy b/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy index 0c520e8..5fa041e 100644 --- a/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy +++ b/devicetypes/smartthings/testing/simulated-contact-sensor.src/simulated-contact-sensor.groovy @@ -28,8 +28,8 @@ metadata { tiles { standardTile("contact", "device.contact", width: 2, height: 2) { - state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#79b821", action: "open") - state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#ffa81e", action: "close") + state("closed", label:'${name}', icon:"st.contact.contact.closed", backgroundColor:"#00A0DC", action: "open") + state("open", label:'${name}', icon:"st.contact.contact.open", backgroundColor:"#e86d13", action: "close") } main "contact" details "contact" diff --git a/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy b/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy index 59e6e0d..775abbb 100644 --- a/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy +++ b/devicetypes/smartthings/testing/simulated-lock.src/simulated-lock.groovy @@ -23,7 +23,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" diff --git a/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy b/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy index cf5a773..3776ab5 100644 --- a/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy +++ b/devicetypes/smartthings/testing/simulated-motion-sensor.src/simulated-motion-sensor.groovy @@ -28,8 +28,8 @@ metadata { tiles { standardTile("motion", "device.motion", width: 2, height: 2) { - state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#ffffff", action: "active") - state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#53a7c0", action: "inactive") + state("inactive", label:'no motion', icon:"st.motion.motion.inactive", backgroundColor:"#cccccc", action: "active") + state("active", label:'motion', icon:"st.motion.motion.active", backgroundColor:"#00A0DC", action: "inactive") } main "motion" details "motion" diff --git a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy index 389122a..b7ef6ca 100644 --- a/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy +++ b/devicetypes/smartthings/testing/simulated-presence-sensor.src/simulated-presence-sensor.groovy @@ -29,7 +29,7 @@ metadata { tiles { standardTile("presence", "device.presence", width: 2, height: 2, canChangeBackground: true) { state("not present", label:'not present', icon:"st.presence.tile.not-present", backgroundColor:"#ffffff", action:"arrived") - state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#53a7c0", action:"departed") + state("present", label:'present', icon:"st.presence.tile.present", backgroundColor:"#00A0DC", action:"departed") } main "presence" details "presence" diff --git a/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy b/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy index 4998447..b36aa67 100644 --- a/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy +++ b/devicetypes/smartthings/testing/simulated-water-sensor.src/simulated-water-sensor.groovy @@ -29,7 +29,7 @@ metadata { tiles { standardTile("water", "device.water", width: 2, height: 2) { state "dry", icon:"st.alarm.water.dry", backgroundColor:"#ffffff", action: "wet" - state "wet", icon:"st.alarm.water.wet", backgroundColor:"#53a7c0", action: "dry" + state "wet", icon:"st.alarm.water.wet", backgroundColor:"#00A0DC", action: "dry" } standardTile("wet", "device.water", inactiveLabel: false, decoration: "flat") { state "default", label:'Wet', action:"wet", icon: "st.alarm.water.wet" diff --git a/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy b/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy index 478d7f6..f767a8c 100644 --- a/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy +++ b/devicetypes/smartthings/testing/simulated-water-valve.src/simulated-water-valve.groovy @@ -21,8 +21,8 @@ metadata { // tile definitions tiles { standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) { - state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13" - state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0" + state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff" + state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/wackford/quirky-wink-porkfolio.src/quirky-wink-porkfolio.groovy b/devicetypes/wackford/quirky-wink-porkfolio.src/quirky-wink-porkfolio.groovy index 8bf827b..4765be9 100644 --- a/devicetypes/wackford/quirky-wink-porkfolio.src/quirky-wink-porkfolio.groovy +++ b/devicetypes/wackford/quirky-wink-porkfolio.src/quirky-wink-porkfolio.groovy @@ -45,8 +45,8 @@ metadata { tiles { standardTile("acceleration", "device.acceleration", width: 2, height: 2, canChangeIcon: true) { - state "inactive", label:'pig secure', icon:"st.motion.acceleration.inactive", backgroundColor:"#44b621" - state "active", label:'pig alarm', icon:"st.motion.acceleration.active", backgroundColor:"#FF1919" + state "inactive", label:'pig secure', icon:"st.motion.acceleration.inactive", backgroundColor:"#cccccc" + state "active", label:'pig alarm', icon:"st.motion.acceleration.active", backgroundColor:"#00A0DC" } standardTile("balance", "device.balance", inactiveLabel: false, canChangeIcon: true) { state "balance", label:'${currentValue}', unit:"", icon:"st.Food & Dining.dining18" From cb6304530e8242d5ae60ec008fc041ecff344ea8 Mon Sep 17 00:00:00 2001 From: "piyush.c" Date: Tue, 28 Feb 2017 18:59:38 +0530 Subject: [PATCH 16/17] [DVCSMP-2442] Standardize Page 3 of DTH UX Improvements --- .../obything-music.src/obything-music.groovy | 2 +- .../jawbone-user.src/jawbone-user.groovy | 2 +- .../fibaro-rgbw-controller.groovy | 4 ++-- .../fortrezz-water-valve.groovy | 8 +++---- .../gentle-wake-up-controller.groovy | 4 ++-- .../hue-lux-bulb.src/hue-lux-bulb.groovy | 4 ++-- .../mimolite-garage-door-controller.groovy | 10 ++++----- .../tile-multiattribute-thermostat.groovy | 22 +++++++++---------- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/devicetypes/com-obycode/obything-music.src/obything-music.groovy b/devicetypes/com-obycode/obything-music.src/obything-music.groovy index b244e3e..878de77 100644 --- a/devicetypes/com-obycode/obything-music.src/obything-music.groovy +++ b/devicetypes/com-obycode/obything-music.src/obything-music.groovy @@ -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 diff --git a/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy b/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy index 4d15594..125f38c 100644 --- a/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy +++ b/devicetypes/juano2310/jawbone-user.src/jawbone-user.groovy @@ -24,7 +24,7 @@ metadata { tiles { standardTile("sleeping", "device.sleeping", width: 1, height: 1, canChangeIcon: false, canChangeBackground: false) { state("sleeping", label: "Sleeping", icon:"st.Bedroom.bedroom12", backgroundColor:"#ffffff") - state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#79b821") + state("not sleeping", label: "Awake", icon:"st.Health & Wellness.health12", backgroundColor:"#00A0DC") } standardTile("steps", "device.steps", width: 2, height: 2, canChangeIcon: false, canChangeBackground: false) { state("steps", label: '${currentValue} Steps', icon:"st.Health & Wellness.health11", backgroundColor:"#ffffff") diff --git a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy index cd40f10..4385edc 100644 --- a/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy +++ b/devicetypes/smartthings/fibaro-rgbw-controller.src/fibaro-rgbw-controller.groovy @@ -89,9 +89,9 @@ state "whiteLevel", action:"setWhiteLevel", label:'White Level' } standardTile("switch", "device.switch", width: 1, height: 1, canChangeIcon: true) { - state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821", nextState:"turningOff" + state "on", label:'${name}', action:"switch.off", icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC", nextState:"turningOff" state "off", label:'${name}', action:"switch.on", icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff", nextState:"turningOn" - state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#79b821" + state "turningOn", label:'${name}', icon:"st.illuminance.illuminance.bright", backgroundColor:"#00A0DC" state "turningOff", label:'${name}', icon:"st.illuminance.illuminance.dark", backgroundColor:"#ffffff" } valueTile("power", "device.power", decoration: "flat") { diff --git a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy index 538694a..1b67c5d 100644 --- a/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy +++ b/devicetypes/smartthings/fortrezz-water-valve.src/fortrezz-water-valve.groovy @@ -34,10 +34,10 @@ metadata { // tile definitions tiles { standardTile("contact", "device.contact", width: 2, height: 2, canChangeIcon: true) { - state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#53a7c0", nextState:"closing" - state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#e86d13", nextState:"opening" - state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#ffe71e" - state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffe71e" + state "open", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC", nextState:"closing" + state "closed", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff", nextState:"opening" + state "opening", label: '${name}', action: "valve.close", icon: "st.valves.water.open", backgroundColor: "#00A0DC" + state "closing", label: '${name}', action: "valve.open", icon: "st.valves.water.closed", backgroundColor: "#ffffff" } standardTile("refresh", "device.switch", inactiveLabel: false, decoration: "flat") { state "default", label:'', action:"refresh.refresh", icon:"st.secondary.refresh" diff --git a/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy b/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy index b34a355..a142cdd 100644 --- a/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy +++ b/devicetypes/smartthings/gentle-wake-up-controller.src/gentle-wake-up-controller.groovy @@ -31,7 +31,7 @@ metadata { tileAttribute("sessionStatus", key: "PRIMARY_CONTROL") { attributeState "cancelled", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "running" attributeState "stopped", action: "timed session.start", icon: "http://f.cl.ly/items/322n181j2K3f281r2s0A/playbutton.png", backgroundColor: "#ffffff", nextState: "cancelled" - attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#79b821", nextState: "cancelled" + attributeState "running", action: "timed session.stop", icon: "http://f.cl.ly/items/0B3y3p2V3X2l3P3y3W09/stopbutton.png", backgroundColor: "#00A0DC", nextState: "cancelled" } tileAttribute("timeRemaining", key: "SECONDARY_CONTROL") { attributeState "timeRemaining", label:'${currentValue} remaining' @@ -45,7 +45,7 @@ metadata { standardTile("sessionStatusTile", "sessionStatus", width: 1, height: 1, canChangeIcon: true) { state "cancelled", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png" state "stopped", label: "Stopped", action: "timed session.start", backgroundColor: "#ffffff", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png" - state "running", label: "Running", action: "timed session.stop", backgroundColor: "#79b821", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png" + state "running", label: "Running", action: "timed session.stop", backgroundColor: "#00A0DC", icon: "http://f.cl.ly/items/1J1g0H2P0S1G1f2O1s1s/icon.png" } // duration diff --git a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy index c221593..387bea3 100644 --- a/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy +++ b/devicetypes/smartthings/hue-lux-bulb.src/hue-lux-bulb.groovy @@ -27,9 +27,9 @@ metadata { tiles(scale: 2) { multiAttributeTile(name:"rich-control", type: "lighting", canChangeIcon: true){ tileAttribute ("device.switch", key: "PRIMARY_CONTROL") { - attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "on", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "off", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" - attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#79b821", nextState:"turningOff" + attributeState "turningOn", label:'${name}', action:"switch.off", icon:"st.lights.philips.hue-single", backgroundColor:"#00A0DC", nextState:"turningOff" attributeState "turningOff", label:'${name}', action:"switch.on", icon:"st.lights.philips.hue-single", backgroundColor:"#ffffff", nextState:"turningOn" } tileAttribute ("device.level", key: "SLIDER_CONTROL") { diff --git a/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy b/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy index fb7407e..9af3124 100644 --- a/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy +++ b/devicetypes/smartthings/mimolite-garage-door-controller.src/mimolite-garage-door-controller.groovy @@ -53,11 +53,11 @@ metadata { // UI tile definitions tiles { standardTile("switch", "device.switch", width: 2, height: 2, canChangeIcon: true) { - state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#79b821" - state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#ffa81e" - state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#ffa81e" - state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#ffa81e" - state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#53a7c0" + state "doorClosed", label: "Closed", action: "on", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC" + state "doorOpen", label: "Open", action: "on", icon: "st.doors.garage.garage-open", backgroundColor: "#e86d13" + state "doorOpening", label: "Opening", action: "on", icon: "st.doors.garage.garage-opening", backgroundColor: "#e86d13" + state "doorClosing", label: "Closing", action: "on", icon: "st.doors.garage.garage-closing", backgroundColor: "#00A0DC" + state "on", label: "Actuate", action: "off", icon: "st.doors.garage.garage-closed", backgroundColor: "#00A0DC" state "off", label: '${name}', action: "on", icon: "st.switches.switch.off", backgroundColor: "#ffffff" } standardTile("contact", "device.contact", inactiveLabel: false) { diff --git a/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy b/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy index 6fb57bd..a784ac5 100644 --- a/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy +++ b/devicetypes/smartthings/tile-ux/tile-multiattribute-thermostat.src/tile-multiattribute-thermostat.groovy @@ -42,9 +42,9 @@ metadata { attributeState("humidity", label:'${currentValue}%', unit:"%", defaultState: true) } tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") { - attributeState("idle", backgroundColor:"#44b621") - attributeState("heating", backgroundColor:"#ffa81e") - attributeState("cooling", backgroundColor:"#269bd2") + attributeState("idle", backgroundColor:"#00A0DC") + attributeState("heating", backgroundColor:"#e86d13") + attributeState("cooling", backgroundColor:"#00A0DC") } tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") { attributeState("off", label:'${name}') @@ -69,9 +69,9 @@ metadata { attributeState("VALUE_DOWN", action: "tempDown") } tileAttribute("device.thermostatOperatingState", key: "OPERATING_STATE") { - attributeState("idle", backgroundColor:"#44b621") - attributeState("heating", backgroundColor:"#ffa81e") - attributeState("cooling", backgroundColor:"#269bd2") + attributeState("idle", backgroundColor:"#00A0DC") + attributeState("heating", backgroundColor:"#e86d13") + attributeState("cooling", backgroundColor:"#00A0DC") } tileAttribute("device.thermostatMode", key: "THERMOSTAT_MODE") { attributeState("off", label:'${name}') @@ -148,9 +148,9 @@ metadata { standardTile("mode", "device.thermostatMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") { state "off", label:'${name}', action:"thermostat.heat", backgroundColor:"#ffffff" - state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#ffa81e" - state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#269bd2" - state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#79b821" + state "heat", label:'${name}', action:"thermostat.cool", backgroundColor:"#e86d13" + state "cool", label:'${name}', action:"thermostat.auto", backgroundColor:"#00A0DC" + state "auto", label:'${name}', action:"thermostat.off", backgroundColor:"#00A0DC" } standardTile("fanMode", "device.thermostatFanMode", width: 2, height: 2, inactiveLabel: false, decoration: "flat") { state "fanAuto", label:'${name}', action:"thermostat.fanOn", backgroundColor:"#ffffff" @@ -159,8 +159,8 @@ metadata { } standardTile("operatingState", "device.thermostatOperatingState", width: 2, height: 2) { state "idle", label:'${name}', backgroundColor:"#ffffff" - state "heating", label:'${name}', backgroundColor:"#ffa81e" - state "cooling", label:'${name}', backgroundColor:"#269bd2" + state "heating", label:'${name}', backgroundColor:"#e86d13" + state "cooling", label:'${name}', backgroundColor:"#00A0DC" } From 28c0cc96193b124897ed5fad30015b23dbf41bd5 Mon Sep 17 00:00:00 2001 From: Tom Manley Date: Tue, 28 Feb 2017 09:52:00 -0600 Subject: [PATCH 17/17] Add fingerprint for motionv5 https://smartthings.atlassian.net/browse/DVCSMP-2481 --- .../smartsense-motion-sensor.src/smartsense-motion-sensor.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy index a93e927..7f84859 100644 --- a/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy +++ b/devicetypes/smartthings/smartsense-motion-sensor.src/smartsense-motion-sensor.groovy @@ -35,6 +35,7 @@ metadata { fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326" fingerprint inClusters: "0000,0001,0003,0402,0500,0020,0B05", outClusters: "0019", manufacturer: "CentraLite", model: "3326-L", deviceJoinName: "Iris Motion Sensor" fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv4", deviceJoinName: "Motion Sensor" + fingerprint inClusters: "0000,0001,0003,000F,0020,0402,0500", outClusters: "0019", manufacturer: "SmartThings", model: "motionv5", deviceJoinName: "Motion Sensor" } simulator {