Skip to content

Firey protons patch 1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FireyProtons wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Firey protons patch 1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef73ce1
Update milight-controller.groovy
FireyProtons May 20, 2018
ed19cb8
Update milight-light.groovy
FireyProtons May 20, 2018
41e8cf7
adding night tile
FireyProtons May 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions devicetypes/fireboy1919/milight-controller.src/milight-controller.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ metadata {
command "pair"
command "unpair"
command "whiten"
command "nighten"
}

preferences {
Expand Down Expand Up @@ -67,9 +68,13 @@ metadata {
standardTile("white", "device.switch", width: 2, height: 2, canChangeIcon: true) {
state "default", label:"White", defaultState: true, action: "whiten", icon: "st.switches.switch.off"
}

standardTile("night", "device.switch", width: 2, height: 2, canChangeIcon: true) {
state "default", label:"Night", defaultState: true, action: "nighten", icon: "st.switches.switch.off"
}

main(["switch"])
details(["switch","levelSliderControl", "rgbSelector", "refresh", "pair", "unpair", "white"])
details(["switch","levelSliderControl", "rgbSelector", "refresh", "pair", "unpair", "white", "night"])
}
}

Expand Down Expand Up @@ -117,6 +122,10 @@ def whiten() {
sendEvent(name: "whiten", value: java.util.UUID.randomUUID().toString())
}

def nighten() {
sendEvent(name: "nighten", value: java.util.UUID.randomUUID().toString())
}

def unknown() {
sendEvent(name: "switch", value: "unknown")
}
Expand Down Expand Up @@ -151,7 +160,8 @@ def httpCall(body, ipAddress, code, group) {
def ipAddress = getPreferences()['ipAddress']
def group = getPreferences()['group']
*/
def path = "/gateways/$code/rgbw/$group"
hexcode = convertToHex(code)
def path = "/gateways/$hexcode/rgbw/$group"
def bodyString = groovy.json.JsonOutput.toJson(body)
def ipAddressHex = convertIPtoHex(ipAddress)
def port = convertToHex(80);
Expand Down
11 changes: 9 additions & 2 deletions smartapps/fireboy1919/milight-light.src/milight-light.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ def nameMiLights() {
dynamicPage(name: "nameMiLights", title: "MiLight Wifi Hub Setup", uninstall: true, install: true) {
section("Light") {
input "miLightName", "text", title: "Light name", description: "i.e. Living Room", required: true, submitOnChange: false
input "code", "number", title: "Code", required: true, description: "Optional: will be autoassigned"
input "code", "number", title: "Code", required: false, description: "Optional: will be autoassigned"
Copy link
Copy Markdown
Owner

@fireboy1919 fireboy1919 Jun 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this isn't actually autoassigned (because I couldn't figure out a way to do that after an hour or so of looking), this is actually needed, and the app was throwing exceptions when I didn't require it. So this would produce a bug.

Copy link
Copy Markdown
Author

@FireyProtons FireyProtons Jun 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess i felt like if something were optional, it shouldn't be required... :)

input "lightType", "enum", title: "Bulb Type", required: true, options: ['rgbw', 'cct', 'rgb_cct'], defaultValue: 'rgbw'
input "group", "number", title: "The group you wish to control (0-4), 0 = all", required: true, defaultValue: "1"
}
}
}
Expand Down Expand Up @@ -81,7 +82,7 @@ def initialize() {
if(settings.code == null) {
settings.code = parent.parent.incLights();
}
myDevice.setPreferences(["code": settings.code, "group":1, "lightType": settings.lightType ])
myDevice.setPreferences(["code": settings.code, "group": settings.group, "lightType": settings.lightType ])

subscribe(myDevice, "switch.on", switchOnHandler)
subscribe(myDevice, "switch.off", switchOffHandler)
Expand All @@ -91,6 +92,7 @@ def initialize() {
subscribe(myDevice, "pair", pairHandler)
subscribe(myDevice, "unpair", unpairHandler)
subscribe(myDevice, "whiten", whitenHandler)
subscribe(myDevice, "nighten", nightenHandler)

log.debug("Subscribed")
//subscribeToCommand(myDevice, "refresh", switchRefreshHandler)
Expand Down Expand Up @@ -129,6 +131,11 @@ def whitenHandler(evt) {
httpCall(body, parent.settings.ipAddress, settings.code, evt.device)
}

def nightenHandler(evt) {
def body = ["command": "night_mode"]
httpCall(body, parent.settings.ipAddress, settings.code, evt.device)
}

def switchOnHandler(evt) {
def body = ["status": "on"]
//if(parent.parent.settings.isDebug) { log.debug "master switch on! ${settings.code} / ${evt.device.name}" }
Expand Down