Livingroom lights

src/HomeAssistant/Controller/Kitchen.hs

@@ -7,37 +7,17 @@ import qualified AFRP
 import Data.Aeson (Value)
 import Control.Arrow ((>>>), Arrow (..), returnA)
 import Data.Bool (bool)
-import GHC.Generics (Generic)
-import Data.Serialize (Serialize)
 import Prelude hiding (id)
 import Data.Time (LocalTime(..), TimeOfDay (..))
 
 
 -- Kitchen has two "presence" sensors. One IKEA motion sensor and one SwitchBot presence sensor
-data Motion = MotionDetected | MotionNotDetected | MotionUnknown
-  deriving (Show, Eq, Generic)
-
-instance Serialize Motion
 
 data Lights = LightsOn | LightsOff
   deriving (Show)
 
-kitchenMotion :: HASS (Event Value) Motion
-kitchenMotion = entityBool "binary_sensor.kitchen_movement_occupancy"
-  >>> arr (fmap (bool MotionNotDetected MotionDetected))
-  >>> traceEvent
-  >>> AFRP.hold MotionUnknown
-
-
-kitchenPresence :: HASS Motion Presence
-kitchenPresence = (eventOccupied &&& eventUnoccupied)
-  >>> arr (uncurry AFRP.lMerge) >>> traceEvent
-  >>> AFRP.hold Unoccupied
-  where
-    eventOccupied :: HASS Motion (Event Presence)
-    eventOccupied = arr (== MotionDetected) >>> AFRP.edge >>> arr (fmap (const Occupied))
-    eventUnoccupied :: HASS Motion (Event Presence)
-    eventUnoccupied = arr (== MotionNotDetected) >>> AFRP.waitFor 300 >>> arr (AFRP.tag Unoccupied)
+kitchenPresence :: HASS (Event Value) Presence
+kitchenPresence = motion "binary_sensor.kitchen_movement_occupancy" >>> motionToPresence 500
 
 eventLights :: HASS Presence (Event Lights)
 eventLights = AFRP.changes >>> arr (fmap presenceLights)
@@ -48,7 +28,7 @@ eventLights = AFRP.changes >>> arr (fmap presenceLights)
 kitchenCeilingController :: HASS (Event Value) ()
 kitchenCeilingController = proc x -> do
   now <- AFRP.currentTime -< ()
-  p <- kitchenMotion >>> kitchenPresence -< x
+  p <- kitchenPresence -< x
   ev <- eventLights -< p
   traceEvent -< ev
   case ev of