svenvanheugten/night-light
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make generateZigbeeCommandsToFixLight accept whole state

Browse source
This commit is contained in:
Sven van Heugten 2026-01-17 16:35:45 +01:00
parent 998e3a94fc
commit 0bf13d4c6f
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
NightLight.Core/NightLightStateMachine.fs
View file

@ -11,23 +11,25 @@ open FsToolkit.ErrorHandling
let internal tryFindLight friendlyName =
Seq.tryFind (fun light -> light.FriendlyName = friendlyName) lights
let internal generateZigbeeCommandsToFixLight state (light: Light) =
seq {
match light.ControlledWithRemote, state.State with
| NonRemote, On -> ()
| NonRemote, Off -> failwith $"Unexpectly trying to turn off {light}. It's not remote-controlled."
| _, _ -> yield generateStateCommand state.State light
if state.State = On then
yield generateColorCommand light state.Color
yield generateBrightnessCommand light state.Brightness
}
type internal NightLightState =
{ Time: DateTime
Alarm: bool
LightToState: Map<Light, LightState> }
let internal generateZigbeeCommandsToFixLight (nightLightState: NightLightState) (light: Light) =
seq {
let desiredLightState = nightLightState.LightToState[light]
match light.ControlledWithRemote, desiredLightState.State with
| NonRemote, On -> ()
| NonRemote, Off -> failwith $"Unexpectly trying to turn off {light}. It's not remote-controlled."
| _, _ -> yield generateStateCommand nightLightState.LightToState[light].State light
if desiredLightState.State = On then
yield generateColorCommand light desiredLightState.Color
yield generateBrightnessCommand light desiredLightState.Brightness
}
let internal withStateFor (light: Light) (state: State) (oldNightLightState: NightLightState) =
let oldState = oldNightLightState.LightToState[light]
@ -48,7 +50,7 @@ let internal generateZigbeeCommandsForDifference (maybeBefore: NightLightState o
let oldState = maybeBefore |> Option.map _.LightToState[light]
if oldState <> Some newState then
generateZigbeeCommandsToFixLight newState light
generateZigbeeCommandsToFixLight after light
else
Seq.empty)
@ -68,7 +70,7 @@ type NightLightStateMachine private (maybeState: NightLightState option) =
this,
match maybeLight with
| Some light -> generateZigbeeCommandsToFixLight currentState.LightToState[light] light
| Some light -> generateZigbeeCommandsToFixLight currentState light
| None -> Seq.empty
| ButtonPress action ->
let newNightLightState =