diff --git a/src/HomeAssistant/Controller/Bedroom.hs b/src/HomeAssistant/Controller/Bedroom.hs index c367c10..55f7ed0 100644 --- a/src/HomeAssistant/Controller/Bedroom.hs +++ b/src/HomeAssistant/Controller/Bedroom.hs @@ -64,7 +64,8 @@ bedroomPresenceController :: HASS (Event Value) () bedroomPresenceController = proc x -> do p <- presenceLightEvents >>> traceEvent -< x capped <- lightLevel >>> arr (< 4) -< x - snap <- (doSnapshot &&& bedroomLightStatus) >>> AFRP.snapshot M.empty >>> arr Snapshot -< x + st <- bedroomLightStatus -< x + snap <- first doSnapshot >>> AFRP.snapshot M.empty >>> arr Snapshot -< (x,st) -- This line is just for debugging _ <- AFRP.changes >>> traceEvent -< snap case p of @@ -73,10 +74,12 @@ bedroomPresenceController = proc x -> do Event LightingOn -> do callServicesDyn "Turn on lights (capped)" (\(c,xs) -> concatMap (uncurry (toLight c)) xs) -< (capped, M.toList (getSnapshot snap)) returnA -< () - Event LightingSleep -> do + Event LightingSleep | anyLightsAreOn st -> do callService "Turn on sleep" (activateScene "scene.makuuhuone_lepotila") -< () _ -> returnA -< () where + anyLightsAreOn :: Foldable f => f LightObservation -> Bool + anyLightsAreOn = any observedOn toLight :: Bool -> T.Text -> LightObservation -> [Service] toLight _ entityId LightObservation{observedOn=False} = [light [EntityId entityId] Off] toLight capped entityId LightObservation{observedOn=True, observedTemperature=t, observedBrightness=b} =