Add second remote

NightLight.Core.Tests/FakeHome.fs

@@ -11,7 +11,10 @@ type BedroomControllingRemoteInteraction =
     | RemotePressedOffButton
     | RemotePressedLeftButton
 
-type LivingRoomControllingRemoteAction = | RemotePressedRightButton
+type LivingRoomControllingRemoteAction =
+    | RemotePressedRightButton
+    | LivingRoomRemotePressedOnButton
+    | LivingRoomRemotePressedOffButton
 
 type HumanInteraction =
     | LightPoweredOn of Light
@@ -145,6 +148,16 @@ type FakeHome() =
               Payload = @"{ ""action"": ""arrow_right_click"" }" }
             |> ReceivedZigbeeEvent
             |> onEventPublished.Trigger
+        | LivingRoomControllingRemoteInteraction LivingRoomRemotePressedOnButton ->
+            { Topic = $"zigbee2mqtt/{livingRoomRemoteControlFriendlyName.Get}"
+              Payload = @"{ ""action"": ""on"" }" }
+            |> ReceivedZigbeeEvent
+            |> onEventPublished.Trigger
+        | LivingRoomControllingRemoteInteraction LivingRoomRemotePressedOffButton ->
+            { Topic = $"zigbee2mqtt/{livingRoomRemoteControlFriendlyName.Get}"
+              Payload = @"{ ""action"": ""off"" }" }
+            |> ReceivedZigbeeEvent
+            |> onEventPublished.Trigger
         | TimeChanged newTime -> newTime |> Event.TimeChanged |> onEventPublished.Trigger
 
 type FakeHome with

NightLight.Core.Tests/InteractionListGenerators.fs

@@ -40,7 +40,11 @@ let private genRemoteInteraction =
         [ Gen.elements [ RemotePressedOnButton; RemotePressedOffButton; RemotePressedLeftButton ]
           |> Gen.map BedroomControllingRemoteInteraction
 
-          Gen.constant (LivingRoomControllingRemoteInteraction RemotePressedRightButton) ]
+          Gen.elements
+              [ RemotePressedRightButton
+                LivingRoomRemotePressedOnButton
+                LivingRoomRemotePressedOffButton ]
+          |> Gen.map LivingRoomControllingRemoteInteraction ]
 
 let private genInteraction =
     Gen.frequency [ 4, genTimeChanged; 1, genHumanInteraction; 1, genRemoteInteraction ]

NightLight.Core.Tests/NightLightTests.fs

@@ -98,11 +98,16 @@ type NightLightTests() =
 
         let livingRoomLightsToggledOn =
             interactions
-            |> Seq.filter (function
+            |> Seq.choose (function
-                | Interaction.LivingRoomControllingRemoteInteraction RemotePressedRightButton -> true
+                | Interaction.LivingRoomControllingRemoteInteraction interaction -> Some interaction
-                | _ -> false)
+                | _ -> None)
-            |> Seq.length
+            |> Seq.fold
-            |> fun rightPresses -> rightPresses % 2 = 0
+                (fun state interaction ->
+                    match interaction with
+                    | RemotePressedRightButton -> not state
+                    | LivingRoomRemotePressedOnButton -> true
+                    | LivingRoomRemotePressedOffButton -> false)
+                true
 
         let isExpectedOn light =
             match light with

NightLight.Core/Models.fs

@@ -83,6 +83,8 @@ let lights =
 
 let remoteControlFriendlyName = DeviceFriendlyName "Fjärrkontroll"
 
+let livingRoomRemoteControlFriendlyName = DeviceFriendlyName "Living Room Remote"
+
 type internal State =
     | On
     | Off

NightLight.Core/NightLightStateMachine.fs

@@ -111,6 +111,14 @@ type NightLightStateMachine private (maybeState: NightLightState option) =
                                 currentState
                                 |> withInvertedStateFor LivingRoomWallLamp
                                 |> withInvertedStateFor LivingRoomFloorLamp
+                            | PressedLivingRoomOn ->
+                                currentState
+                                |> withStateFor LivingRoomWallLamp On
+                                |> withStateFor LivingRoomFloorLamp On
+                            | PressedLivingRoomOff ->
+                                currentState
+                                |> withStateFor LivingRoomWallLamp Off
+                                |> withStateFor LivingRoomFloorLamp Off
 
                         NightLightStateMachine(Some newNightLightState),
                         generateZigbeeCommandsForDifference (Some currentState) newNightLightState

NightLight.Core/ZigbeeCommands.fs

@@ -15,7 +15,6 @@ let generateStateCommand state light =
         | On -> "ON"
         | Off -> "OFF"
 
-    if (lightProps light).Bulb = IkeaBulb then
     commandObj["transition"] <- 0
 
     commandObj.ToJsonString() |> toZigbeeCommand light

NightLight.Core/ZigbeeEvents.fs

@@ -9,6 +9,8 @@ type Action =
     | PressedOff
     | PressedLeft
     | PressedRight
+    | PressedLivingRoomOn
+    | PressedLivingRoomOff
 
 type ZigbeeEvent =
     | DeviceAnnounce of DeviceFriendlyName
@@ -41,5 +43,12 @@ let parseZigbeeEvent (message: Message) =
                 | Some(JsonValue.String "arrow_right_click") -> Ok(ButtonPress PressedRight)
                 | Some _ -> Error InvalidActionField
                 | None -> Error MissingActionField
+        | "zigbee2mqtt/Living Room Remote" ->
+            return!
+                match jsonValue.TryGetProperty "action" with
+                | Some(JsonValue.String "on") -> Ok(ButtonPress PressedLivingRoomOn)
+                | Some(JsonValue.String "off") -> Ok(ButtonPress PressedLivingRoomOff)
+                | Some _ -> Error InvalidActionField
+                | None -> Error MissingActionField
         | _ -> return! Error <| UnknownTopic message.Topic
     }

NightLight/Program.fs

@@ -1,4 +1,4 @@
-open System
+open System
 open System.Text
 open System.Threading
 open System.Threading.Tasks
@@ -103,7 +103,7 @@ let mainAsync _ =
             :> Task)
 
         do!
-            [ "zigbee2mqtt/bridge/event"; $"zigbee2mqtt/{remoteControlFriendlyName.Get}" ]
+            [ "zigbee2mqtt/bridge/event"; $"zigbee2mqtt/{remoteControlFriendlyName.Get}"; $"zigbee2mqtt/{livingRoomRemoteControlFriendlyName.Get}" ]
             |> Seq.map (fun topic -> async { return! mqttClient.SubscribeAsync topic |> Async.AwaitTask })
             |> Async.Sequential
             |> Async.Ignore