diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 2dc0b56..14a5fc4 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,10 +1,10 @@ UPD 2021-10-24_07:33:53 111901 FHEM/73_AutoShuttersControl.pm -UPD 2021-10-24_17:15:09 74468 lib/FHEM/Automation/ShuttersControl.pm +UPD 2021-10-24_18:37:41 74468 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 2494 lib/FHEM/Automation/ShuttersControl/Roommate.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-24_07:33:53 109522 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-10-25_09:47:08 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-10-09_07:12:54 40628 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 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm diff --git a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index 3bce602..1050927 100644 --- a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -324,6 +324,13 @@ sub EventProcessingWindowRec { ->getShuttersPlace eq 'terrace' ) && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) + || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == + $FHEM::Automation::ShuttersControl::shutters + ->getOpenPos + && $FHEM::Automation::ShuttersControl::shutters + ->getDelayCmd ne 'none' + && $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'terrace' ) ) && ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen eq 'on' @@ -370,7 +377,12 @@ sub EventProcessingWindowRec { || $FHEM::Automation::ShuttersControl::shutters ->getStatus != $FHEM::Automation::ShuttersControl::shutters - ->getLastManPos ) + ->getLastManPos + || ( $FHEM::Automation::ShuttersControl::shutters + ->getDelayCmd ne 'none' + && $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'terrace' ) + ) ) { if ( $FHEM::Automation::ShuttersControl::shutters @@ -395,11 +407,17 @@ sub EventProcessingWindowRec { ->setDriveCmd( ( $FHEM::Automation::ShuttersControl::shutters - ->getVentilatePosAfterDayClosed eq 'open' + ->getDelayCmd ne 'none' + && $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'terrace' ? $FHEM::Automation::ShuttersControl::shutters - ->getOpenPos + ->getDelayCmd + : ( $FHEM::Automation::ShuttersControl::shutters + ->getVentilatePosAfterDayClosed eq 'open' + ? $FHEM::Automation::ShuttersControl::shutters + ->getOpenPos : $FHEM::Automation::ShuttersControl::shutters - ->getLastManPos + ->getLastManPos ) ) ); }