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

dev #85

Merged
marko merged 35 commits from dev into testing 2022-01-01 08:46:44 +00:00
Conversation 0 Commits 35 Files Changed 17 +7 -6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 58b2f20f19 - Show all commits

2
controls_AutoShuttersControl.txt
View File

@@ -4,7 +4,7 @@ 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-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-12-04_08:36:32 110189 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-12-04_09:07:23 110215 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

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

@@ -528,7 +528,7 @@ sub EventProcessingWindowRec {
if ( if (
$FHEM::Automation::ShuttersControl::ascDev $FHEM::Automation::ShuttersControl::ascDev
->getAutoShuttersControlComfort eq 'on' ->getAutoShuttersControlComfort eq 'on'
and $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getQueryShuttersPos( ->getQueryShuttersPos(
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->getComfortOpenPos ->getComfortOpenPos
@@ -608,8 +608,9 @@ sub EventProcessingRoommate {
&& ( $FHEM::Automation::ShuttersControl::ascDev && ( $FHEM::Automation::ShuttersControl::ascDev
->getAutoShuttersControlMorning eq 'on' ->getAutoShuttersControlMorning eq 'on'
|| ( $getUp eq 'roommate' || ( $getUp eq 'roommate'
&& $getRoommatesLastStatus ne 'absent' && ( $getRoommatesLastStatus eq 'asleep'
&& $getRoommatesLastStatus ne 'gone' ) || $getRoommatesLastStatus ne 'awoken' )
)
) )
&& IsAfterShuttersManualBlocking($shuttersDev) && IsAfterShuttersManualBlocking($shuttersDev)
) )
@@ -623,14 +624,14 @@ sub EventProcessingRoommate {
$getRoommatesLastStatus eq 'asleep' $getRoommatesLastStatus eq 'asleep'
&& ( $FHEM::Automation::ShuttersControl::shutters && ( $FHEM::Automation::ShuttersControl::shutters
->getModeUp eq 'always' ->getModeUp eq 'always'
or $FHEM::Automation::ShuttersControl::shutters || $FHEM::Automation::ShuttersControl::shutters
->getModeUp eq $event ) ->getModeUp eq $event )
) )
|| ( || (
$getRoommatesLastStatus eq 'awoken' $getRoommatesLastStatus eq 'awoken'
&& ( $FHEM::Automation::ShuttersControl::shutters && ( $FHEM::Automation::ShuttersControl::shutters
->getModeUp eq 'always' ->getModeUp eq 'always'
or $FHEM::Automation::ShuttersControl::shutters || $FHEM::Automation::ShuttersControl::shutters
->getModeUp eq $event ) ->getModeUp eq $event )
) )
) )