Skip to content
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

Jump to bottom

Allow scenes with lights off #118

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow scenes with lights off #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 26 additions & 13 deletions scenes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,18 @@ func updateScenes() {
}

func updateSceneForSchedule(scene *hue.Scene, lightSchedule LightSchedule) {
// Scene returned by AllScenes() doesn't have LightStates populated
scene, err := bridge.bridge.SceneByID(scene.Id)
if err != nil {
log.Warningf("🎨 %v", err)
return
}

// Updating lights
var modifyScene hue.ModifyScene
modifyScene.Lights = toStringArray(lightSchedule.AssociatedDeviceIDs)

_, err := scene.Modify(modifyScene)
_, err = scene.Modify(modifyScene)
if err != nil {
log.Warningf("🎨 %v", err)
return
Expand All @@ -68,20 +75,26 @@ func updateSceneForSchedule(scene *hue.Scene, lightSchedule LightSchedule) {

state := interval.calculateLightStateInInterval(time.Now())

var modifyState hue.ModifyLightState
modifyState.On = true // turn lights on when the scene is activated
for i, oldstate := range scene.LightStates {
if !oldstate.On {
continue
}

if state.ColorTemperature != -1 {
modifyState.ColorTemperature = uint16(mapColorTemperature(state.ColorTemperature))
modifyState.Xy = colorTemperatureToXYColor(state.ColorTemperature)
}
if state.Brightness != -1 {
modifyState.Brightness = uint8(mapBrightness(state.Brightness))
}
var modifyState hue.ModifyLightState
modifyState.On = true // turn lights on when the scene is activated

_, err = scene.ModifyLightStates(modifyState)
if err != nil {
log.Warningf("🎨 %v", err)
if state.ColorTemperature != -1 {
modifyState.ColorTemperature = uint16(mapColorTemperature(state.ColorTemperature))
modifyState.Xy = colorTemperatureToXYColor(state.ColorTemperature)
}
if state.Brightness != -1 {
modifyState.Brightness = uint8(mapBrightness(state.Brightness))
}

_, err = scene.ModifyLightState(i, modifyState)
if err != nil {
log.Warningf("🎨 %v", err)
}
}

log.Debugf("🎨 Successfully updated scene \"%s\"", scene.Name)
Expand Down