forked from SmartThingsCommunity/SmartThingsPublic
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request SmartThingsCommunity#1706 from SmartThingsCommunit…
…y/staging Rolling up staging to production for deploy
- Loading branch information
Showing
18 changed files
with
80 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,14 +17,14 @@ | |
| */ | ||
|
|
||
| definition( | ||
| name: "Hue (Connect)", | ||
| namespace: "smartthings", | ||
| author: "SmartThings", | ||
| description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.", | ||
| category: "SmartThings Labs", | ||
| iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png", | ||
| iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/[email protected]", | ||
| singleInstance: true | ||
| name: "Hue (Connect)", | ||
| namespace: "smartthings", | ||
| author: "SmartThings", | ||
| description: "Allows you to connect your Philips Hue lights with SmartThings and control them from your Things area or Dashboard in the SmartThings Mobile app. Adjust colors by going to the Thing detail screen for your Hue lights (tap the gear on Hue tiles).\n\nPlease update your Hue Bridge first, outside of the SmartThings app, using the Philips Hue app.", | ||
| category: "SmartThings Labs", | ||
| iconUrl: "https://s3.amazonaws.com/smartapp-icons/Partner/hue.png", | ||
| iconX2Url: "https://s3.amazonaws.com/smartapp-icons/Partner/[email protected]", | ||
| singleInstance: true | ||
| ) | ||
|
|
||
| preferences { | ||
|
|
@@ -85,7 +85,8 @@ def bridgeDiscovery(params=[:]) | |
| } | ||
|
|
||
| return dynamicPage(name:"bridgeDiscovery", title:"Discovery Started!", nextPage:"bridgeBtnPush", refreshInterval:refreshInterval, uninstall: true) { | ||
| section("Please wait while we discover your Hue Bridge. Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") { | ||
| section("Please wait while we discover your Hue Bridge. Kindly note that you must first configure your Hue Bridge and Lights using the Philips Hue application. " + | ||
| "Discovery can take five minutes or more, so sit back and relax! Select your device below once discovered.") { | ||
| input "selectedHue", "enum", required:false, title:"Select Hue Bridge (${numFound} found)", multiple:false, options:options, submitOnChange: true | ||
| } | ||
| } | ||
|
|
@@ -178,7 +179,7 @@ def bulbDiscovery() { | |
| } | ||
|
|
||
| if (bulbRefreshCount > 200 && numFound == 0) { | ||
| // Time out to avoid endless discovery | ||
| // Time out after 10 minutes | ||
| state.inBulbDiscovery = false | ||
| bulbRefreshCount = 0 | ||
| return dynamicPage(name:"bulbDiscovery", title:"Light Discovery Failed!", nextPage:"", refreshInterval:0, install:true, uninstall: true) { | ||
|
|
@@ -216,32 +217,32 @@ private sendDeveloperReq() { | |
| def token = app.id | ||
| def host = getBridgeIP() | ||
| sendHubCommand(new physicalgraph.device.HubAction([ | ||
| method: "POST", | ||
| path: "/api", | ||
| headers: [ | ||
| HOST: host | ||
| ], | ||
| body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"])) | ||
| method: "POST", | ||
| path: "/api", | ||
| headers: [ | ||
| HOST: host | ||
| ], | ||
| body: [devicetype: "$token-0"]], "${selectedHue}", [callback: "usernameHandler"])) | ||
| } | ||
|
|
||
| private discoverHueBulbs() { | ||
| def host = getBridgeIP() | ||
| sendHubCommand(new physicalgraph.device.HubAction([ | ||
| method: "GET", | ||
| path: "/api/${state.username}/lights", | ||
| headers: [ | ||
| HOST: host | ||
| ]], "${selectedHue}", [callback: "lightsHandler"])) | ||
| method: "GET", | ||
| path: "/api/${state.username}/lights", | ||
| headers: [ | ||
| HOST: host | ||
| ]], "${selectedHue}", [callback: "lightsHandler"])) | ||
| } | ||
|
|
||
| private verifyHueBridge(String deviceNetworkId, String host) { | ||
| log.trace "Verify Hue Bridge $deviceNetworkId" | ||
| sendHubCommand(new physicalgraph.device.HubAction([ | ||
| method: "GET", | ||
| path: "/description.xml", | ||
| headers: [ | ||
| HOST: host | ||
| ]], deviceNetworkId, [callback: "bridgeDescriptionHandler"])) | ||
| method: "GET", | ||
| path: "/description.xml", | ||
| headers: [ | ||
| HOST: host | ||
| ]], deviceNetworkId, [callback: "bridgeDescriptionHandler"])) | ||
| } | ||
|
|
||
| private verifyHueBridges() { | ||
|
|
@@ -399,7 +400,7 @@ def addBulbs() { | |
| log.debug "$dni in not longer paired to the Hue Bridge or ID changed" | ||
| } | ||
| } else { | ||
| //backwards compatable | ||
| //backwards compatable | ||
| newHueBulb = bulbs.find { (app.id + "/" + it.id) == dni } | ||
| d = addChildBulb(dni, "Extended Color Light", newHueBulb?.value?.name, newHueBulb?.value?.hub) | ||
| d?.completedSetup = true | ||
|
|
@@ -1151,7 +1152,7 @@ def setColorTemperature(childDevice, huesettings) { | |
| def ct = hueSettings == 6500 ? 153 : Math.round(1000000/huesettings) | ||
| createSwitchEvent(childDevice, "on") | ||
| put("lights/$id/state", [ct: ct, on: true]) | ||
| return "Setting color temperature to $percent" | ||
| return "Setting color temperature to $ct" | ||
| } | ||
|
|
||
| def setColor(childDevice, huesettings) { | ||
|
|
@@ -1226,7 +1227,7 @@ private poll() { | |
| def uri = "/api/${state.username}/lights/" | ||
| log.debug "GET: $host$uri" | ||
| sendHubCommand(new physicalgraph.device.HubAction("GET ${uri} HTTP/1.1\r\n" + | ||
| "HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue)) | ||
| "HOST: ${host}\r\n\r\n", physicalgraph.device.Protocol.LAN, selectedHue)) | ||
| } | ||
|
|
||
| private isOnline(id) { | ||
|
|
@@ -1243,10 +1244,10 @@ private put(path, body) { | |
| log.debug "BODY: ${bodyJSON}" | ||
|
|
||
| sendHubCommand(new physicalgraph.device.HubAction("PUT $uri HTTP/1.1\r\n" + | ||
| "HOST: ${host}\r\n" + | ||
| "Content-Length: ${length}\r\n" + | ||
| "\r\n" + | ||
| "${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}")) | ||
| "HOST: ${host}\r\n" + | ||
| "Content-Length: ${length}\r\n" + | ||
| "\r\n" + | ||
| "${bodyJSON}", physicalgraph.device.Protocol.LAN, "${selectedHue}")) | ||
| } | ||
|
|
||
| /* | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters