Merge pull request 'Use scenes instead of stateful applications of adaptive sleep mode' (#2) from bedroom-sleep-mode-via-scenes into main
Reviewed-on: #2
This commit was merged in pull request #2.
This commit is contained in:
@@ -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"] )
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user