FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

fix: #77 #78

Merged
marko merged 1 commits from patch_issues77-DriveDownResidentsHomeButAutoControlOFF into devel 2021-12-04 09:53:12 +00:00
Conversation 0 Commits 1 Files Changed 2 +5 -3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controls_AutoShuttersControl.txt
View File

@@ -1,10 +1,10 @@
UPD 2021-11-29_15:18:18 115678 FHEM/73_AutoShuttersControl.pm UPD 2021-12-04_08:08:23 115678 FHEM/73_AutoShuttersControl.pm
UPD 2021-11-29_15:01:56 75264 lib/FHEM/Automation/ShuttersControl.pm UPD 2021-11-29_15:01:56 75264 lib/FHEM/Automation/ShuttersControl.pm
UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2021-12-04_09:50:00 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-11-25_11:58:42 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-12-04_10:50:05 110883 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-11-14_14:03:06 40094 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-11-14_14:03:06 40094 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

2
lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
View File

@@ -1115,6 +1115,7 @@ sub EventProcessingResidents {
->getRoommatesStatus eq 'none' ->getRoommatesStatus eq 'none'
&& ( $getModeDown eq 'home' && ( $getModeDown eq 'home'
|| $getModeDown eq 'always' ) || $getModeDown eq 'always' )
&& $FHEM::Automation::ShuttersControl::ascDev->getAutoShuttersControlEvening eq 'on'
&& $getResidentsLastStatus ne 'asleep' && $getResidentsLastStatus ne 'asleep'
&& $getResidentsLastStatus ne 'awoken' && $getResidentsLastStatus ne 'awoken'
&& IsAfterShuttersTimeBlocking($shuttersDev) && IsAfterShuttersTimeBlocking($shuttersDev)
@@ -1262,6 +1263,7 @@ sub EventProcessingResidents {
->getRoommatesStatus eq 'none' ->getRoommatesStatus eq 'none'
&& ( $getModeUp eq 'home' && ( $getModeUp eq 'home'
|| $getModeUp eq 'always' ) || $getModeUp eq 'always' )
&& $FHEM::Automation::ShuttersControl::ascDev->getAutoShuttersControlMorning eq 'on'
&& IsAfterShuttersTimeBlocking($shuttersDev) && IsAfterShuttersTimeBlocking($shuttersDev)
&& !$FHEM::Automation::ShuttersControl::shutters->getIfInShading && !$FHEM::Automation::ShuttersControl::shutters->getIfInShading
&& !$FHEM::Automation::ShuttersControl::shutters && !$FHEM::Automation::ShuttersControl::shutters