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

testing #39

Merged
marko merged 7 commits from testing into master 2021-06-02 09:53:51 +00:00
Conversation 0 Commits 7 Files Changed 3 +12 -6
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7882128336 - Show all commits

2
controls_AutoShuttersControl.txt
View File

@@ -4,7 +4,7 @@ UPD 2021-02-18_11:11:24 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-03-25_07:52:48 31487 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-03-25_07:52:48 31487 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-05-24_11:14:48 110757 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-05-24_11:31:28 111147 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-02-18_11:11:24 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-02-18_11:11:24 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

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

@@ -282,12 +282,12 @@ sub EventProcessingWindowRec {
. $homemode . $homemode
. ' QueryShuttersPosWinRecTilted:' . ' QueryShuttersPosWinRecTilted:'
. $FHEM::Automation::ShuttersControl::shutters . $FHEM::Automation::ShuttersControl::shutters
->getQueryShuttersPos( ->getQueryShuttersPos(
$FHEM::Automation::ShuttersControl::shutters->getVentilatePos $FHEM::Automation::ShuttersControl::shutters->getVentilatePos
) )
. ' QueryShuttersPosWinRecComfort: ' . ' QueryShuttersPosWinRecComfort: '
. $FHEM::Automation::ShuttersControl::shutters . $FHEM::Automation::ShuttersControl::shutters
->getQueryShuttersPos( ->getQueryShuttersPos(
$FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos $FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos
) )
); );
@@ -310,15 +310,21 @@ sub EventProcessingWindowRec {
eq 'on' ) eq 'on' )
|| ( $FHEM::Automation::ShuttersControl::shutters->getStatus == || ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownPos ->getPrivacyDownPos
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownStatus != 2 ->getPrivacyDownStatus != 2
&& !$FHEM::Automation::ShuttersControl::shutters->getIsDay )
|| ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
$FHEM::Automation::ShuttersControl::shutters
->getOpenPos
&& $FHEM::Automation::ShuttersControl::shutters
->getLockOut ne 'off'
&& !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) && !$FHEM::Automation::ShuttersControl::shutters->getIsDay )
) )
&& ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen && ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen
eq 'on' eq 'on'
|| $FHEM::Automation::ShuttersControl::ascDev || $FHEM::Automation::ShuttersControl::ascDev
->getAutoShuttersControlComfort eq 'on' ) ->getAutoShuttersControlComfort eq 'on' )
) )
{ {
FHEM::Automation::ShuttersControl::ASC_Debug( FHEM::Automation::ShuttersControl::ASC_Debug(