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

Merge branch 'patch-privacyDown_WindowCloseAfterNight' of git.cooltux.net:FHEM/mod-AutoShuttersControl into patch-privacyDown_WindowCloseAfterNight

Browse Source
This commit is contained in:
Marko Oldenburg
2021-05-25 07:53:24 +02:00
parent d89a05632b 7882128336
commit d3af20bc01
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controls_AutoShuttersControl.txt
View File

@@ -1,10 +1,10 @@
UPD 2021-05-18_10:42:56 97974 FHEM/73_AutoShuttersControl.pm
UPD 2021-05-18_11:02:07 97974 FHEM/73_AutoShuttersControl.pm
UPD 2021-05-17_14:34:49 74350 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-05-18_10:37:51 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-05-17_14:30:37 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-05-17_14:34:49 108472 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-05-25_07:52:14 108862 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-02-26_14:36:10 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-05-18_10:37:51 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

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

@@ -283,12 +283,12 @@ sub EventProcessingWindowRec {
. $homemode
. ' QueryShuttersPosWinRecTilted:'
. $FHEM::Automation::ShuttersControl::shutters
->getQueryShuttersPos(
->getQueryShuttersPos(
$FHEM::Automation::ShuttersControl::shutters->getVentilatePos
)
. ' QueryShuttersPosWinRecComfort: '
. $FHEM::Automation::ShuttersControl::shutters
->getQueryShuttersPos(
->getQueryShuttersPos(
$FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos
)
);
@@ -311,15 +311,21 @@ sub EventProcessingWindowRec {
eq 'on' )
|| ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
$FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownPos
->getPrivacyDownPos
&& $FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownStatus == 1
->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->getVentilateOpen
eq 'on'
|| $FHEM::Automation::ShuttersControl::ascDev
->getAutoShuttersControlComfort eq 'on' )
->getAutoShuttersControlComfort eq 'on' )
)
{
FHEM::Automation::ShuttersControl::ASC_Debug(