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

Make the Left and Right button behave the same way

Browse source
This commit is contained in:
Sven van Heugten 2026-03-16 19:58:53 +01:00
parent 451d8b09f1
commit 5d8406d8ad
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
NightLight.Core.Tests/FakeHome.fs
View file

@ -9,9 +9,9 @@ open FSharp.Data
type BedroomControllingRemoteInteraction = type BedroomControllingRemoteInteraction =
| RemotePressedOnButton | RemotePressedOnButton
| RemotePressedOffButton | RemotePressedOffButton
| RemotePressedLeftButton
type LivingRoomControllingRemoteAction = type LivingRoomControllingRemoteAction =
| RemotePressedLeftButton
| RemotePressedRightButton | RemotePressedRightButton
| LivingRoomRemotePressedOnButton | LivingRoomRemotePressedOnButton
| LivingRoomRemotePressedOffButton | LivingRoomRemotePressedOffButton
@ -138,7 +138,7 @@ type FakeHome() =
Payload = @"{ ""action"": ""off"" }" } Payload = @"{ ""action"": ""off"" }" }
|> ReceivedZigbeeEvent |> ReceivedZigbeeEvent
|> onEventPublished.Trigger |> onEventPublished.Trigger
| BedroomControllingRemoteInteraction RemotePressedLeftButton -> | LivingRoomControllingRemoteInteraction RemotePressedLeftButton ->
{ Topic = $"zigbee2mqtt/{remoteControlFriendlyName.Get}" { Topic = $"zigbee2mqtt/{remoteControlFriendlyName.Get}"
Payload = @"{ ""action"": ""arrow_left_click"" }" } Payload = @"{ ""action"": ""arrow_left_click"" }" }
|> ReceivedZigbeeEvent |> ReceivedZigbeeEvent

5
NightLight.Core.Tests/InteractionListGenerators.fs
View file

@ -37,11 +37,12 @@ let private genHumanInteraction =
let private genRemoteInteraction = let private genRemoteInteraction =
Gen.oneof Gen.oneof
[ Gen.elements [ RemotePressedOnButton; RemotePressedOffButton; RemotePressedLeftButton ] [ Gen.elements [ RemotePressedOnButton; RemotePressedOffButton ]
|> Gen.map BedroomControllingRemoteInteraction |> Gen.map BedroomControllingRemoteInteraction
Gen.elements Gen.elements
[ RemotePressedRightButton [ RemotePressedLeftButton
RemotePressedRightButton
LivingRoomRemotePressedOnButton LivingRoomRemotePressedOnButton
LivingRoomRemotePressedOffButton ] LivingRoomRemotePressedOffButton ]
|> Gen.map LivingRoomControllingRemoteInteraction ] |> Gen.map LivingRoomControllingRemoteInteraction ]

4
NightLight.Core.Tests/NightLightTests.fs
View file

@ -110,6 +110,7 @@ type NightLightTests() =
|> Seq.fold |> Seq.fold
(fun state interaction -> (fun state interaction ->
match interaction with match interaction with
| RemotePressedLeftButton -> not state
| RemotePressedRightButton -> not state | RemotePressedRightButton -> not state
| LivingRoomRemotePressedOnButton -> true | LivingRoomRemotePressedOnButton -> true
| LivingRoomRemotePressedOffButton -> false) | LivingRoomRemotePressedOffButton -> false)
@ -127,8 +128,7 @@ type NightLightTests() =
| BothOff, RemotePressedOnButton -> BothOn | BothOff, RemotePressedOnButton -> BothOn
| BothOn, RemotePressedOnButton -> LeftOn | BothOn, RemotePressedOnButton -> LeftOn
| LeftOn, RemotePressedOnButton -> RightOn | LeftOn, RemotePressedOnButton -> RightOn
| RightOn, RemotePressedOnButton -> BothOn | RightOn, RemotePressedOnButton -> BothOn)
| _, RemotePressedLeftButton -> LeftOn)
BothOn BothOn
let isExpectedOn light = let isExpectedOn light =

6
NightLight.Core/NightLightStateMachine.fs
View file

@ -107,11 +107,7 @@ type NightLightStateMachine private (maybeState: NightLightState option) =
|> withAlarmOff |> withAlarmOff
|> withStateFor RightBedroomLamp Off |> withStateFor RightBedroomLamp Off
|> withStateFor LeftBedroomLamp Off |> withStateFor LeftBedroomLamp Off
| PressedLeft -> | PressedLeft
currentState
|> withAlarmOff
|> withStateFor RightBedroomLamp Off
|> withStateFor LeftBedroomLamp On
| PressedRight -> | PressedRight ->
currentState currentState
|> withInvertedStateFor LivingRoomWallLamp |> withInvertedStateFor LivingRoomWallLamp