Compare commits
5
Commits
servant
...
bd5f97f96e
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd5f97f96e | ||
|
|
4ea75beb7b | ||
|
|
96d3482af8 | ||
|
|
7fc07c1883 | ||
|
|
a7becaf2d4 |
No files matched your search
@@ -56,19 +56,12 @@ bedroomPresenceController = proc x -> do
|
|||||||
Event LightsOff -> do
|
Event LightsOff -> do
|
||||||
callService (light bedroomLights Off) -< ()
|
callService (light bedroomLights Off) -< ()
|
||||||
Event LightsOn -> do
|
Event LightsOn -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
callService (activateScene "scene.makuuhuone_lights_snapshot") -< ()
|
||||||
Event LightsSleep -> do
|
Event LightsSleep -> do
|
||||||
callService createBedroomScene -< ()
|
callService createBedroomScene -< ()
|
||||||
adaptiveMode -< True
|
callService (activateScene "scene.makuuhuone_lepotila") -< ()
|
||||||
sleepMode -< True
|
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
|
|
||||||
where
|
|
||||||
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
|
||||||
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
|
||||||
|
|
||||||
|
|
||||||
data BedroomControls
|
data BedroomControls
|
||||||
= Masse (IkeaButton IkeaGesture)
|
= Masse (IkeaButton IkeaGesture)
|
||||||
@@ -91,44 +84,22 @@ bedroomButtonController = proc x -> do
|
|||||||
-- Any event will cause the sleep mode to be turned off
|
-- Any event will cause the sleep mode to be turned off
|
||||||
case ev of
|
case ev of
|
||||||
Event (Masse (OnButton ShortRelease)) -> do
|
Event (Masse (OnButton ShortRelease)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_masse") -< ()
|
callService (activateScene "scene.makuuhuone_masse") -< ()
|
||||||
Event (Masse (OnButton DoubleClick)) -> do
|
Event (Masse (OnButton DoubleClick)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_keski") -< ()
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
Event (Masse (OnButton LongClick)) -> do
|
Event (Masse (OnButton LongClick)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
Event (Masse (OffButton _)) -> do
|
Event (Masse (OffButton _)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
Event (Enishen (OnButton ShortRelease)) -> do
|
Event (Enishen (OnButton ShortRelease)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
callService (activateScene "scene.makuuhuone_jemina") -< ()
|
||||||
Event (Enishen (OnButton DoubleClick)) -> do
|
Event (Enishen (OnButton DoubleClick)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_keski") -< ()
|
callService (activateScene "scene.makuuhuone_keski") -< ()
|
||||||
Event (Enishen (OnButton LongClick)) -> do
|
Event (Enishen (OnButton LongClick)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
callService (activateScene "scene.makuuhuone_kirkas") -< ()
|
||||||
Event (Enishen (OffButton _)) -> do
|
Event (Enishen (OffButton _)) -> do
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
callService (light [AreaId "makuuhuone"] Off) -< ()
|
callService (light [AreaId "makuuhuone"] Off) -< ()
|
||||||
Event (Central _) -> do
|
|
||||||
sleepMode -< False
|
|
||||||
adaptiveMode -< False
|
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
where
|
|
||||||
sleepMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot_sleep_mode"] )
|
|
||||||
adaptiveMode = callServiceDyn (switch [EntityId "switch.adaptive_lighting_makuuhuoneen_valot"] )
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -2,12 +2,13 @@
|
|||||||
{-# LANGUAGE Arrows #-}
|
{-# LANGUAGE Arrows #-}
|
||||||
module HomeAssistant.Controller.Livingroom where
|
module HomeAssistant.Controller.Livingroom where
|
||||||
|
|
||||||
import HomeAssistant.Controller (HASS, Presence (..), Target (..), presence, callServiceDyn, light, Light (..), traceEvent)
|
import HomeAssistant.Controller (HASS, Presence (..), Target (..), presence, callServiceDyn, light, Light (..), traceEvent, callService, activateScene)
|
||||||
import qualified AFRP
|
import qualified AFRP
|
||||||
import Control.Arrow ((>>>), Arrow (..), returnA)
|
import Control.Arrow ((>>>), Arrow (..), returnA)
|
||||||
import Data.Aeson (Value)
|
import Data.Aeson (Value)
|
||||||
import Prelude hiding ((.))
|
import Prelude hiding ((.))
|
||||||
import Control.Category ((.))
|
import Control.Category ((.))
|
||||||
|
import Data.Time (LocalTime(..), toGregorian, TimeOfDay (..))
|
||||||
|
|
||||||
data Lights = LightsOn | LightsOff
|
data Lights = LightsOn | LightsOff
|
||||||
deriving (Show)
|
deriving (Show)
|
||||||
@@ -49,3 +50,51 @@ livingroomPresenceController = proc x -> do
|
|||||||
AFRP.Event LightsOff -> callServiceDyn (light lights) -< Off
|
AFRP.Event LightsOff -> callServiceDyn (light lights) -< Off
|
||||||
_ -> returnA -< ()
|
_ -> returnA -< ()
|
||||||
returnA -< ()
|
returnA -< ()
|
||||||
|
|
||||||
|
data Season = Summer | Fall | Winter | Spring
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
|
||||||
|
season :: HASS a Season
|
||||||
|
season = AFRP.currentTime >>> arr toSeason
|
||||||
|
where
|
||||||
|
toSeason t =
|
||||||
|
case toGregorian (localDay t) of
|
||||||
|
(_, m, _)
|
||||||
|
| m >= 12 || m <= 2 -> Winter
|
||||||
|
| m <= 5 -> Spring
|
||||||
|
| m <= 8 -> Summer
|
||||||
|
| otherwise -> Fall
|
||||||
|
|
||||||
|
tod :: HASS a TimeOfDay
|
||||||
|
tod = AFRP.currentTime >>> arr localTimeOfDay
|
||||||
|
|
||||||
|
data PlantLightMode = Growth | Ambience
|
||||||
|
deriving Show
|
||||||
|
|
||||||
|
plantLightMode :: HASS (Season, TimeOfDay) (AFRP.Event PlantLightMode)
|
||||||
|
plantLightMode =
|
||||||
|
(lightMode &&& ambienceMode) >>> arr (uncurry AFRP.lMerge)
|
||||||
|
where
|
||||||
|
lightMode = arr (uncurry lightWanted) >>> AFRP.edge >>> arr (AFRP.tag Growth)
|
||||||
|
ambienceMode = arr (uncurry ambienceWanted) >>> AFRP.edge >>> arr (AFRP.tag Ambience)
|
||||||
|
-- Full brightness during daytime only non-summer
|
||||||
|
lightWanted :: Season -> TimeOfDay -> Bool
|
||||||
|
lightWanted Summer _ = False
|
||||||
|
lightWanted _ TimeOfDay{todHour=10,todMin=00} = True
|
||||||
|
lightWanted _ _ = False
|
||||||
|
-- Ambience mode is always
|
||||||
|
ambienceWanted :: Season -> TimeOfDay -> Bool
|
||||||
|
ambienceWanted _ TimeOfDay{todHour=20,todMin=0} = True
|
||||||
|
ambienceWanted _ _ = False
|
||||||
|
|
||||||
|
livingroomPlantLights :: HASS (AFRP.Event a) ()
|
||||||
|
livingroomPlantLights = (season &&& tod)
|
||||||
|
>>> plantLightMode
|
||||||
|
>>> setLights
|
||||||
|
where
|
||||||
|
setLights = proc mode -> do
|
||||||
|
case mode of
|
||||||
|
AFRP.Event Growth -> callService (activateScene "scene.olohuoneen_kasvivalo") -< ()
|
||||||
|
AFRP.Event Ambience -> callService (activateScene "scene.makuuhuone_lepotila") -< ()
|
||||||
|
_ -> returnA -< ()
|
||||||
@@ -36,7 +36,7 @@ import qualified HomeAssistant.Runtime.Metrics
|
|||||||
import System.FilePath ((</>))
|
import System.FilePath ((</>))
|
||||||
import Text.Read (readMaybe)
|
import Text.Read (readMaybe)
|
||||||
import HomeAssistant.Controller.Kitchen (kitchenMotionController)
|
import HomeAssistant.Controller.Kitchen (kitchenMotionController)
|
||||||
import HomeAssistant.Controller.Livingroom (livingroomPresenceController)
|
import HomeAssistant.Controller.Livingroom (livingroomPresenceController, livingroomPlantLights)
|
||||||
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
import HomeAssistant.Runtime.RateLimit (slidingWindowLimiter, registerRateLimitMetrics)
|
||||||
import UnliftIO.Async
|
import UnliftIO.Async
|
||||||
import HomeAssistant.Runtime.Supervisor (supervised)
|
import HomeAssistant.Runtime.Supervisor (supervised)
|
||||||
@@ -63,6 +63,7 @@ controllers =
|
|||||||
, Controller True "livingroom-presence" livingroomPresenceController
|
, Controller True "livingroom-presence" livingroomPresenceController
|
||||||
, Controller True "hallway-motion-controller" hallwayLightsController
|
, Controller True "hallway-motion-controller" hallwayLightsController
|
||||||
, Controller True "children-button" childrenBedroomButtonController
|
, Controller True "children-button" childrenBedroomButtonController
|
||||||
|
, Controller True "livingroom-plants" livingroomPlantLights
|
||||||
]
|
]
|
||||||
|
|
||||||
-- | Steps the machine for every inbound message; service calls go to the
|
-- | Steps the machine for every inbound message; service calls go to the
|
||||||
|
|||||||
Reference in new issue
Block a user