diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 3373059..43dc4ba 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -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-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_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-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 23f6cd9..47ed46f 100644 --- a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -528,7 +528,7 @@ sub EventProcessingWindowRec { if ( $FHEM::Automation::ShuttersControl::ascDev ->getAutoShuttersControlComfort eq 'on' - and $FHEM::Automation::ShuttersControl::shutters + && $FHEM::Automation::ShuttersControl::shutters ->getQueryShuttersPos( $FHEM::Automation::ShuttersControl::shutters ->getComfortOpenPos @@ -608,8 +608,9 @@ sub EventProcessingRoommate { && ( $FHEM::Automation::ShuttersControl::ascDev ->getAutoShuttersControlMorning eq 'on' || ( $getUp eq 'roommate' - && $getRoommatesLastStatus ne 'absent' - && $getRoommatesLastStatus ne 'gone' ) + && ( $getRoommatesLastStatus eq 'asleep' + || $getRoommatesLastStatus ne 'awoken' ) + ) ) && IsAfterShuttersManualBlocking($shuttersDev) ) @@ -623,14 +624,14 @@ sub EventProcessingRoommate { $getRoommatesLastStatus eq 'asleep' && ( $FHEM::Automation::ShuttersControl::shutters ->getModeUp eq 'always' - or $FHEM::Automation::ShuttersControl::shutters + || $FHEM::Automation::ShuttersControl::shutters ->getModeUp eq $event ) ) || ( $getRoommatesLastStatus eq 'awoken' && ( $FHEM::Automation::ShuttersControl::shutters ->getModeUp eq 'always' - or $FHEM::Automation::ShuttersControl::shutters + || $FHEM::Automation::ShuttersControl::shutters ->getModeUp eq $event ) ) )