Code organization

src/HomeAssistant/Controller.hs

@@ -22,13 +22,14 @@ module HomeAssistant.Controller
   , door
   , light
   , lightController
-  , bedroomPresenceController
+  , Presence(..)
+  , presence
   ) where
 
 import AFRP (Mealy, eff, Event(..), hold, events, changes, filterA, (>>|), toEvent)
 import Control.Arrow (Arrow(..), returnA)
 import Control.Category ((>>>))
-import Data.Aeson (Value, object, (.=))
+import Data.Aeson (Value)
 import qualified Data.Text as T
 import Control.Lens (has, only, (^?), to)
 import Data.Aeson.Lens (key, _String)
@@ -73,40 +74,6 @@ presence :: T.Text -> HASS (Event Value) (Event Presence)
 presence entityId =entityBool entityId
   >>> arr (fmap (bool Unoccupied Occupied))
 
-bedroomLights :: [T.Text]
-bedroomLights = ["light.bedroom_masse","light.bedroom_jemina","light.bedroom_ceiling","light.bedroom_led_switch"]
-
-createBedroomScene :: Service
-createBedroomScene = Service
-  { serviceDomain="scene"
-  , serviceName= "create"
-  , serviceData= Just $ object
-      [ "scene_id" .= ("makuuhuone_lights_snapshot" :: T.Text)
-      , "snapshot_entities" .= bedroomLights
-      ]
-  , serviceTarget= [] -- bedroomLights
-  }
-
-
-activateScene :: T.Text -> Service
-activateScene sceneId = Service
-  { serviceDomain="scene"
-  , serviceName= "turn_on"
-  , serviceTarget= [sceneId]
-  , serviceData = Nothing
-  }
-
--- Bedroom presence
-bedroomPresence :: HASS (Event Value) (Event Presence)
-bedroomPresence = presence "binary_sensor.presence_sensor_bedroom_occupancy"
-
-bedroomPresenceController :: HASS (Event Value) ()
-bedroomPresenceController = proc x -> do
-  p <- bedroomPresence -< x
-  case p of
-       Event Unoccupied -> callService createBedroomScene >>> callService (light bedroomLights False) -< ()
-       Event Occupied -> callService (activateScene "makuuhuone_lights_snapshot") -< ()
-       _ -> returnA -< ()
 
 
 door :: HASS (Event Value) (Event DoorState)