Merge pull request 'dev' (#141) from dev into testing

Reviewed-on: #141

controls_AutoShuttersControl.txt

@@ -1,15 +1,16 @@
-UPD 2021-05-27_08:55:22 97974 FHEM/73_AutoShuttersControl.pm
+UPD 2025-01-21_18:19:08 116536 FHEM/73_AutoShuttersControl.pm
-UPD 2021-05-27_08:51:20 74350 lib/FHEM/Automation/ShuttersControl.pm
+UPD 2025-01-21_17:56:42 76570 lib/FHEM/Automation/ShuttersControl.pm
-UPD 2021-02-18_11:11:24 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
+UPD 2024-10-12_09:12:30 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
-UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
+UPD 2024-10-12_09:12:30 2675 lib/FHEM/Automation/ShuttersControl/Roommate.pm
-UPD 2021-05-27_08:51:20 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm
+UPD 2024-10-12_09:12:30 31828 lib/FHEM/Automation/ShuttersControl/Shutters.pm
-UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm
+UPD 2024-10-12_09:12:30 25541 lib/FHEM/Automation/ShuttersControl/Shading.pm
-UPD 2021-05-27_08:51:20 109039 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
+UPD 2024-10-12_09:12:30 112297 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
-UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
+UPD 2024-10-12_09:12:30 40681 lib/FHEM/Automation/ShuttersControl/Helper.pm
-UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
+UPD 2024-10-12_09:12:30 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
-UPD 2021-05-27_08:51:20 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
+UPD 2024-10-12_09:12:30 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
-UPD 2021-02-18_11:11:24 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
+UPD 2024-10-12_09:12:30 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
-UPD 2021-02-18_11:11:24 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
+UPD 2024-10-12_09:12:30 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
-UPD 2021-02-18_11:11:24 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
+UPD 2024-10-12_09:12:30 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
-UPD 2021-02-18_11:11:24 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
+UPD 2024-10-12_09:12:30 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
-UPD 2021-02-18_11:11:24 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
+UPD 2024-10-12_09:12:30 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
+UPD 2024-10-12_09:12:30 7394 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

hooks/commit-msg

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+commit_msg=$(cat "${1:?Missing commit message file}")
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}
+
+if ! echo "$commit_msg" | grep -Eq "^(build|chore|ci|docs|feat|feat!|fix|perf|refactor|revert|style|test)(\(.+\))?: .*$" ; then 
+
+  echo "Invalid commit message" 
+
+    exit 1 
+
+fi 
+
+echo "Commit message is valid!"

hooks/post-commit

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -eu
+
+# destination of the final changelog file
+OUTPUT_FILE=CHANGELOG.md
+
+# generate the changelog
+git --no-pager log --no-merges --format="### %s%d%n>%aD%n%n>Author: %aN (%aE)%n%n>Commiter: %cN (%cE)%n%n%b%n%N%n" > $OUTPUT_FILE
+
+# prevent recursion!
+# since a 'commit --amend' will trigger the post-commit script again
+# we have to check if the changelog file has changed or not
+res=$(git status --porcelain | grep -c ".\$OUTPUT_FILE$")
+if [ "$res" -gt 0 ]; then
+  git add $OUTPUT_FILE
+  git commit --amend
+  echo "Populated Changelog in $OUTPUT_FILE"
+fi

lib/FHEM/Automation/ShuttersControl/Dev.pm

@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# Developed with Kate
+# Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2018-2020 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
+#  (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -43,7 +43,7 @@ package FHEM::Automation::ShuttersControl::Dev;
 use FHEM::Automation::ShuttersControl::Dev::Readings;
 use FHEM::Automation::ShuttersControl::Dev::Attr;
 
-our @ISA =
+use base
   qw(FHEM::Automation::ShuttersControl::Dev::Readings FHEM::Automation::ShuttersControl::Dev::Attr);
 
 use strict;

lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# Developed with Kate
+# Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2018-2020 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
+#  (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -44,23 +44,12 @@ use strict;
 use warnings;
 use utf8;
 
-use GPUtils qw(GP_Import);
-
-## Import der FHEM Funktionen
-BEGIN {
-    GP_Import(
-        qw(
-          AttrVal
-          gettimeofday)
-    );
-}
-
 sub getShuttersOffset {
     my $self = shift;
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_shuttersDriveDelay', -1 );
+    return ::AttrVal( $name, 'ASC_shuttersDriveDelay', -1 );
 }
 
 sub getBrightnessMinVal {
@@ -70,7 +59,7 @@ sub getBrightnessMinVal {
 
     return $self->{ASC_brightness}->{triggermin}
       if ( exists( $self->{ASC_brightness}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_brightness}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_brightness}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->getBrightnessMaxVal;
 
     return $self->{ASC_brightness}->{triggermin};
@@ -83,8 +72,8 @@ sub getBrightnessMaxVal {
 
     return $self->{ASC_brightness}->{triggermax}
       if ( exists( $self->{ASC_brightness}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_brightness}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_brightness}->{LASTGETTIME} ) < 2 );
-    $self->{ASC_brightness}->{LASTGETTIME} = int( gettimeofday() );
+    $self->{ASC_brightness}->{LASTGETTIME} = int( ::gettimeofday() );
 
     my ( $triggermax, $triggermin ) =
       FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
@@ -104,7 +93,7 @@ sub _getTwilightDevice {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_twilightDevice', 'none' );
+    return ::AttrVal( $name, 'ASC_twilightDevice', 'none' );
 }
 
 sub getAutoAstroModeEvening {
@@ -112,7 +101,7 @@ sub getAutoAstroModeEvening {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoAstroModeEvening', 'REAL' );
+    return ::AttrVal( $name, 'ASC_autoAstroModeEvening', 'REAL' );
 }
 
 sub getAutoAstroModeEveningHorizon {
@@ -120,7 +109,7 @@ sub getAutoAstroModeEveningHorizon {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoAstroModeEveningHorizon', 0 );
+    return ::AttrVal( $name, 'ASC_autoAstroModeEveningHorizon', 0 );
 }
 
 sub getAutoAstroModeMorning {
@@ -128,7 +117,7 @@ sub getAutoAstroModeMorning {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoAstroModeMorning', 'REAL' );
+    return ::AttrVal( $name, 'ASC_autoAstroModeMorning', 'REAL' );
 }
 
 sub getAutoAstroModeMorningHorizon {
@@ -136,7 +125,7 @@ sub getAutoAstroModeMorningHorizon {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoAstroModeMorningHorizon', 0 );
+    return ::AttrVal( $name, 'ASC_autoAstroModeMorningHorizon', 0 );
 }
 
 sub getAutoShuttersControlMorning {
@@ -144,7 +133,7 @@ sub getAutoShuttersControlMorning {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoShuttersControlMorning', 'on' );
+    return ::AttrVal( $name, 'ASC_autoShuttersControlMorning', 'on' );
 }
 
 sub getAutoShuttersControlEvening {
@@ -152,7 +141,7 @@ sub getAutoShuttersControlEvening {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoShuttersControlEvening', 'on' );
+    return ::AttrVal( $name, 'ASC_autoShuttersControlEvening', 'on' );
 }
 
 sub getAutoShuttersControlComfort {
@@ -160,7 +149,7 @@ sub getAutoShuttersControlComfort {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_autoShuttersControlComfort', 'off' );
+    return ::AttrVal( $name, 'ASC_autoShuttersControlComfort', 'off' );
 }
 
 sub getFreezeTemp {
@@ -168,7 +157,7 @@ sub getFreezeTemp {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_freezeTemp', 3 );
+    return ::AttrVal( $name, 'ASC_freezeTemp', 3 );
 }
 
 sub getSlatDriveCmdInverse {
@@ -176,7 +165,7 @@ sub getSlatDriveCmdInverse {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_slatDriveCmdInverse', 0 );
+    return ::AttrVal( $name, 'ASC_slatDriveCmdInverse', 0 );
 }
 
 sub _getTempSensor {
@@ -186,11 +175,11 @@ sub _getTempSensor {
 
     return $self->{ASC_tempSensor}->{device}
       if ( exists( $self->{ASC_tempSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 );
-    $self->{ASC_tempSensor}->{LASTGETTIME} = int( gettimeofday() );
+    $self->{ASC_tempSensor}->{LASTGETTIME} = int( ::gettimeofday() );
     my ( $device, $reading ) =
-      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_tempSensor',
+      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
-        'none' );
+        'ASC_tempSensor', 'none' );
 
     ## erwartetes Ergebnis
     # DEVICE:READING
@@ -208,7 +197,7 @@ sub getTempSensorReading {
 
     return $self->{ASC_tempSensor}->{reading}
       if ( exists( $self->{ASC_tempSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_tempSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getTempSensor;
     return $self->{ASC_tempSensor}->{reading};
 }
@@ -220,8 +209,9 @@ sub _getResidentsDev {
 
     return $self->{ASC_residentsDev}->{device}
       if ( exists( $self->{ASC_residentsDev}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) <
-    $self->{ASC_residentsDev}->{LASTGETTIME} = int( gettimeofday() );
+        2 );
+    $self->{ASC_residentsDev}->{LASTGETTIME} = int( ::gettimeofday() );
     my ( $device, $reading ) =
       FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
         'ASC_residentsDev', 'none' );
@@ -240,7 +230,8 @@ sub getResidentsReading {
 
     return $self->{ASC_residentsDev}->{reading}
       if ( exists( $self->{ASC_residentsDev}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_residentsDev}->{LASTGETTIME} ) <
+        2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev;
     return $self->{ASC_residentsDev}->{reading};
 }
@@ -252,11 +243,11 @@ sub _getRainSensor {
 
     return $self->{ASC_rainSensor}->{device}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
-    $self->{ASC_rainSensor}->{LASTGETTIME} = int( gettimeofday() );
+    $self->{ASC_rainSensor}->{LASTGETTIME} = int( ::gettimeofday() );
     my ( $device, $reading, $max, $hyst, $pos, $wait ) =
-      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_rainSensor',
+      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
-        'none' );
+        'ASC_rainSensor', 'none' );
 
     ## erwartetes Ergebnis
     # DEVICE:READING MAX:HYST
@@ -266,10 +257,10 @@ sub _getRainSensor {
     $self->{ASC_rainSensor}->{reading} =
       ( $reading ne 'none' ? $reading : 'rain' );
     $self->{ASC_rainSensor}->{triggermax} = (
-         (   $max ne 'none'
+        ( $max ne 'none' && $max =~ m{\A(-?\d+(\.\d+)?)\z}xms )
-          && $max =~ m{\A(-?\d+(\.\d+)?)\z}xms )
         ? $max
-        : 1000 );
+        : 1000
+    );
 
     $self->{ASC_rainSensor}->{triggerhyst} = (
           $hyst ne 'none'
@@ -277,10 +268,11 @@ sub _getRainSensor {
         : ( $self->{ASC_rainSensor}->{triggermax} * 0 )
     );
 
-    $self->{ASC_rainSensor}->{shuttersClosedPos} =
+    $self->{ASC_rainSensor}->{shuttersClosedPos} = (
-      (   $pos ne 'none'
+          $pos ne 'none'
         ? $pos
-        : $FHEM::Automation::ShuttersControl::shutters->getClosedPos );
+        : $FHEM::Automation::ShuttersControl::shutters->getClosedPos
+    );
     $self->{ASC_rainSensor}->{waitingTime} =
       ( $wait ne 'none' ? $wait : 0 );
 
@@ -294,7 +286,7 @@ sub getRainSensorReading {
 
     return $self->{ASC_rainSensor}->{reading}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getRainSensor;
     return $self->{ASC_rainSensor}->{reading};
 }
@@ -306,7 +298,7 @@ sub getRainTriggerMax {
 
     return $self->{ASC_rainSensor}->{triggermax}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getRainSensor;
     return $self->{ASC_rainSensor}->{triggermax};
 }
@@ -318,7 +310,7 @@ sub getRainTriggerMin {
 
     return $self->{ASC_rainSensor}->{triggerhyst}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getRainSensor;
     return $self->{ASC_rainSensor}->{triggerhyst};
 }
@@ -330,7 +322,7 @@ sub getRainSensorShuttersClosedPos {
 
     return $self->{ASC_rainSensor}->{shuttersClosedPos}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getRainSensor;
     return $self->{ASC_rainSensor}->{shuttersClosedPos};
 }
@@ -342,7 +334,7 @@ sub getRainWaitingTime {
 
     return $self->{ASC_rainSensor}->{waitingTime}
       if ( exists( $self->{ASC_rainSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_rainSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getRainSensor;
     return $self->{ASC_rainSensor}->{waitingTime};
 }
@@ -354,11 +346,11 @@ sub _getWindSensor {
 
     return $self->{ASC_windSensor}->{device}
       if ( exists( $self->{ASC_windSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 );
-    $self->{ASC_windSensor}->{LASTGETTIME} = int( gettimeofday() );
+    $self->{ASC_windSensor}->{LASTGETTIME} = int( ::gettimeofday() );
     my ( $device, $reading ) =
-      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name, 'ASC_windSensor',
+      FHEM::Automation::ShuttersControl::Helper::GetAttrValues( $name,
-        'none' );
+        'ASC_windSensor', 'none' );
 
     return $device if ( $device eq 'none' );
     $self->{ASC_windSensor}->{device} = $device;
@@ -375,7 +367,7 @@ sub getWindSensorReading {
 
     return $self->{ASC_windSensor}->{reading}
       if ( exists( $self->{ASC_windSensor}->{LASTGETTIME} )
-        && ( gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 );
+        && ( ::gettimeofday() - $self->{ASC_windSensor}->{LASTGETTIME} ) < 2 );
     $FHEM::Automation::ShuttersControl::ascDev->_getWindSensor;
     return (
         defined( $self->{ASC_windSensor}->{reading} )
@@ -389,18 +381,23 @@ sub getBlockAscDrivesAfterManual {
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_blockAscDrivesAfterManual', 0 );
+    return ::AttrVal( $name, 'ASC_blockAscDrivesAfterManual', 0 );
 }
 
-sub getAdvDate {
+sub getAdvStartDate {
     my $self = shift;
 
     my $name = $self->{name};
 
-    return AttrVal( $name, 'ASC_advDate', 'FirstAdvent' );
+    return ::AttrVal( $name, 'ASC_advStartDate', 'FirstAdvent' );
 }
 
+sub getAdvEndDate {
+    my $self = shift;
 
+    my $name = $self->{name};
 
+    return ::AttrVal( $name, 'ASC_advEndDate', 'EpiphanyDay' );
+}
 
 1;

lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# Developed with Kate
+# Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2018-2020 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
+#  (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -48,12 +48,7 @@ use GPUtils qw(GP_Import);
 
 ## Import der FHEM Funktionen
 BEGIN {
-    GP_Import(
+    GP_Import(qw(defs));
-        qw(
-          readingsSingleUpdate
-          ReadingsVal
-          defs)
-    );
 }
 
 sub setDelayCmdReading {
@@ -62,7 +57,7 @@ sub setDelayCmdReading {
     my $name = $self->{name};
     my $hash = $defs{$name};
 
-    readingsSingleUpdate(
+    ::readingsSingleUpdate(
         $hash,
         $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
           . '_lastDelayPosValue',
@@ -79,7 +74,7 @@ sub setStateReading {
     my $name = $self->{name};
     my $hash = $defs{$name};
 
-    readingsSingleUpdate(
+    ::readingsSingleUpdate(
         $hash, 'state',
         (
             defined($value)
@@ -97,7 +92,7 @@ sub setPosReading {
     my $name = $self->{name};
     my $hash = $defs{$name};
 
-    readingsSingleUpdate(
+    ::readingsSingleUpdate(
         $hash,
         $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
           . '_PosValue',
@@ -113,7 +108,7 @@ sub setLastPosReading {
     my $name = $self->{name};
     my $hash = $defs{$name};
 
-    readingsSingleUpdate(
+    ::readingsSingleUpdate(
         $hash,
         $FHEM::Automation::ShuttersControl::shutters->getShuttersDev
           . '_lastPosValue',
@@ -128,7 +123,7 @@ sub getPartyMode {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'partyMode', 'off' );
+    return ::ReadingsVal( $name, 'partyMode', 'off' );
 }
 
 sub getHardLockOut {
@@ -136,7 +131,7 @@ sub getHardLockOut {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'hardLockOut', 'none' );
+    return ::ReadingsVal( $name, 'hardLockOut', 'none' );
 }
 
 sub getSunriseTimeWeHoliday {
@@ -144,7 +139,7 @@ sub getSunriseTimeWeHoliday {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'sunriseTimeWeHoliday', 'none' );
+    return ::ReadingsVal( $name, 'sunriseTimeWeHoliday', 'none' );
 }
 
 sub getMonitoredDevs {
@@ -152,14 +147,14 @@ sub getMonitoredDevs {
 
     my $name = $self->{name};
 
-    $self->{monitoredDevs} = ReadingsVal( $name, '.monitoredDevs', 'none' );
+    $self->{monitoredDevs} = ::ReadingsVal( $name, '.monitoredDevs', 'none' );
     return $self->{monitoredDevs};
 }
 
 sub getOutTemp {
     my $self = shift;
 
-    return ReadingsVal(
+    return ::ReadingsVal(
         $FHEM::Automation::ShuttersControl::ascDev->_getTempSensor,
         $FHEM::Automation::ShuttersControl::ascDev->getTempSensorReading,
         -100 );
@@ -169,7 +164,8 @@ sub getResidentsStatus {
     my $self = shift;
 
     my $val =
-      ReadingsVal( $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
+      ::ReadingsVal(
+        $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
         $FHEM::Automation::ShuttersControl::ascDev->getResidentsReading,
         'none' );
 
@@ -178,7 +174,7 @@ sub getResidentsStatus {
         return $1 && $1 eq 'pet' ? 'absent' : $2;
     }
     elsif (
-        ReadingsVal(
+        ::ReadingsVal(
             $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
             'homealoneType', '-' ) eq 'PET'
       )
@@ -196,7 +192,8 @@ sub getResidentsLastStatus {
     my $self = shift;
 
     my $val =
-      ReadingsVal( $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
+      ::ReadingsVal(
+        $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
         'lastState', 'none' );
 
     if ( $val =~ m{^(?:(.+)_)?(.+)$}xms ) {
@@ -204,7 +201,7 @@ sub getResidentsLastStatus {
         return $1 && $1 eq 'pet' ? 'absent' : $2;
     }
     elsif (
-        ReadingsVal(
+        ::ReadingsVal(
             $FHEM::Automation::ShuttersControl::ascDev->_getResidentsDev,
             'lastHomealoneType', '-' ) eq 'PET'
       )
@@ -223,7 +220,7 @@ sub getAutoShuttersControlShading {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'controlShading', 'none' );
+    return ::ReadingsVal( $name, 'controlShading', 'none' );
 }
 
 sub getSelfDefense {
@@ -231,7 +228,7 @@ sub getSelfDefense {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'selfDefense', 'none' );
+    return ::ReadingsVal( $name, 'selfDefense', 'none' );
 }
 
 sub getAzimuth {
@@ -239,13 +236,13 @@ sub getAzimuth {
 
     my $azimuth;
 
-    $azimuth = ReadingsVal(
+    $azimuth = ::ReadingsVal(
         $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice,
         'azimuth', -1 )
       if (
         $defs{ $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice }
         ->{TYPE} eq 'Twilight' );
-    $azimuth = ReadingsVal(
+    $azimuth = ::ReadingsVal(
         $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice,
         'SunAz', -1 )
       if (
@@ -260,13 +257,13 @@ sub getElevation {
 
     my $elevation;
 
-    $elevation = ReadingsVal(
+    $elevation = ::ReadingsVal(
         $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice,
         'elevation', -1 )
       if (
         $defs{ $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice }
         ->{TYPE} eq 'Twilight' );
-    $elevation = ReadingsVal(
+    $elevation = ::ReadingsVal(
         $FHEM::Automation::ShuttersControl::ascDev->_getTwilightDevice,
         'SunAlt', -1 )
       if (
@@ -281,7 +278,7 @@ sub getASCenable {
 
     my $name = $self->{name};
 
-    return ReadingsVal( $name, 'ascEnable', 'none' );
+    return ::ReadingsVal( $name, 'ascEnable', 'none' );
 }
 
 1;

lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm

@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# Developed with Kate
+# Developed with VSCodium and richterger perl plugin
 #
-#  (c) 2018-2021 Copyright: Marko Oldenburg (fhemdevelopment@cooltux.net)
+#  (c) 2018-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
 #  All rights reserved
 #
 #   Special thanks goes to:
@@ -52,7 +52,9 @@ use FHEM::Automation::ShuttersControl::Shading qw (:ALL);
 use FHEM::Automation::ShuttersControl::Rainprotection qw (:ALL);
 
 require Exporter;
-our @ISA       = qw(Exporter);
+use base qw(Exporter);
+
+# our @ISA       = qw(Exporter);
 our @EXPORT_OK = qw(
   EventProcessingPartyMode
   EventProcessingGeneral
@@ -70,21 +72,6 @@ our %EXPORT_TAGS = (
     ],
 );
 
-use GPUtils qw(GP_Import);
-## Import der FHEM Funktionen
-BEGIN {
-    GP_Import(
-        qw(
-           Log3
-           gettimeofday
-           computeAlignTime
-           CommandSet
-           ReadingsVal
-           RemoveInternalTimer
-          )
-    );
-}
-
 sub EventProcessingGeneral {
     my $hash    = shift;
     my $devname = shift;
@@ -94,8 +81,12 @@ sub EventProcessingGeneral {
 
     if ( defined($devname) && ($devname) )
     { # es wird lediglich der Devicename der Funktion mitgegeben wenn es sich nicht um global handelt daher hier die Unterscheidung
-        my $windReading = $FHEM::Automation::ShuttersControl::ascDev->getWindSensorReading // 'none';
+        my $windReading =
-        my $rainReading = $FHEM::Automation::ShuttersControl::ascDev->getRainSensorReading // 'none';
+          $FHEM::Automation::ShuttersControl::ascDev->getWindSensorReading
+          // 'none';
+        my $rainReading =
+          $FHEM::Automation::ShuttersControl::ascDev->getRainSensorReading
+          // 'none';
 
         while ( my ( $device, $deviceAttr ) =
             each %{ $hash->{monitoredDevs}{$devname} } )
@@ -122,13 +113,16 @@ sub EventProcessingGeneral {
             EventProcessingExternalTriggerDevice( $hash, $device, $events )
               if ( $deviceAttr eq 'ASC_ExternalTrigger' );
 
-            $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($device)
+            $FHEM::Automation::ShuttersControl::shutters->setShuttersDev(
+                $device)
               if ( $deviceAttr eq 'ASC_BrightnessSensor' );
 
             if (
                 $deviceAttr eq 'ASC_BrightnessSensor'
-                && (   $FHEM::Automation::ShuttersControl::shutters->getDown eq 'brightness'
+                && ( $FHEM::Automation::ShuttersControl::shutters->getDown eq
-                    || $FHEM::Automation::ShuttersControl::shutters->getUp eq 'brightness' )
+                    'brightness'
+                    || $FHEM::Automation::ShuttersControl::shutters->getUp eq
+                    'brightness' )
               )
             {
                 EventProcessingBrightness( $hash, $device, $events );
@@ -139,6 +133,10 @@ sub EventProcessingGeneral {
         }
     }
     else {    # alles was kein Devicenamen mit übergeben hat landet hier
+        ::Log3( $name, 4,
+"AutoShuttersControl ($name) - EventProcessing: All without device name in the Event"
+        );
+
         if (
             $events =~ m{^ATTR\s(.*)
              \s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSensor
@@ -147,8 +145,9 @@ sub EventProcessingGeneral {
              \s(.*)$}xms
           )
         {    # wurde den Attributen unserer Rolläden ein Wert zugewiesen ?
-            FHEM::Automation::ShuttersControl::AddNotifyDev( $hash, $3, $1, $2 ) if ( $3 ne 'none' );
+            FHEM::Automation::ShuttersControl::AddNotifyDev( $hash, $3, $1, $2 )
-            Log3( $name, 4,
+              if ( $3 ne 'none' );
+            ::Log3( $name, 4,
                 "AutoShuttersControl ($name) - EventProcessing: ATTR" );
         }
         elsif (
@@ -160,7 +159,7 @@ sub EventProcessingGeneral {
                 $}xms
           )
         {    # wurde das Attribut unserer Rolläden gelöscht ?
-            Log3( $name, 4,
+            ::Log3( $name, 4,
                 "AutoShuttersControl ($name) - EventProcessing: DELETEATTR" );
             FHEM::Automation::ShuttersControl::DeleteNotifyDev( $hash, $1, $2 );
         }
@@ -175,11 +174,17 @@ sub EventProcessingGeneral {
                 (.*)?}xms
           )
         {
-            FHEM::Automation::ShuttersControl::CreateSunRiseSetShuttersTimer( $hash, $2 )
+            ::Log3( $name, 4,
+"AutoShuttersControl ($name) - EventProcessing: Morning and Evening Time Shedules"
+            );
+
+            FHEM::Automation::ShuttersControl::CreateSunRiseSetShuttersTimer(
+                $hash, $2 )
               if (
                 $3 ne 'ASC_Time_Up_WE_Holiday'
                 || (   $3 eq 'ASC_Time_Up_WE_Holiday'
-                    && $FHEM::Automation::ShuttersControl::ascDev->getSunriseTimeWeHoliday eq 'on' )
+                    && $FHEM::Automation::ShuttersControl::ascDev
+                    ->getSunriseTimeWeHoliday eq 'on' )
               );
         }
         elsif (
@@ -189,7 +194,8 @@ sub EventProcessingGeneral {
                 (.*)?}xms
           )
         {
-            FHEM::Automation::ShuttersControl::RenewSunRiseSetShuttersTimer($hash);
+            FHEM::Automation::ShuttersControl::RenewSunRiseSetShuttersTimer(
+                $hash);
         }
         elsif (
             $events =~ m{^(DELETEATTR|ATTR)
@@ -197,7 +203,8 @@ sub EventProcessingGeneral {
                 (.*)?}xms
           )
         {
-            $FHEM::Automation::ShuttersControl::shutters->deleteShadingStateChangeSunny;
+            $FHEM::Automation::ShuttersControl::shutters
+              ->deleteShadingStateChangeSunny;
         }
 
         if (
@@ -219,11 +226,13 @@ m{^(DELETEATTR|ATTR)         #global ATTR myASC ASC_tempSensor Cellar
                     attrEvent      => 1,
                 );
 
-                FHEM::Automation::ShuttersControl::Shading::_CheckShuttersConditionsForShadingFn(\%funcHash);
+                FHEM::Automation::ShuttersControl::Shading::_CheckShuttersConditionsForShadingFn(
+                    \%funcHash );
             }
             else {
-                CommandSet( undef, $name . ' controlShading on' )
+                ::CommandSet( undef, $name . ' controlShading on' )
-                if ( ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' );
+                  if (
+                    ::ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' );
             }
         }
     }
@@ -243,9 +252,17 @@ sub EventProcessingWindowRec {
       $FHEM::Automation::ShuttersControl::shutters->getWinDevReading;
 
     if ( $events =~
-        m{.*$reading:.*?([Oo]pen(?>ed)?|[Cc]losed?|tilt(?>ed)?|true|false)}xms
+        m{.*$reading:.*?([Oo]pen(?>ed)?|[Cc]losed?|tilt(?>ed)?|true|false)}xms )
-        && IsAfterShuttersManualBlocking($shuttersDev) )
     {
+        return
+          if (
+            !IsAfterShuttersManualBlocking($shuttersDev)
+            && ( $FHEM::Automation::ShuttersControl::shutters->getLockOut eq
+                'off'
+                || $FHEM::Automation::ShuttersControl::shutters
+                ->getShuttersPlace ne 'terrace' )
+          );
+
         my $match = $1;
 
         FHEM::Automation::ShuttersControl::ASC_Debug(
@@ -260,11 +277,6 @@ sub EventProcessingWindowRec {
 
         $FHEM::Automation::ShuttersControl::shutters->setShuttersDev(
             $shuttersDev);
-        my $homemode =
-          $FHEM::Automation::ShuttersControl::shutters->getRoommatesStatus;
-        $homemode =
-          $FHEM::Automation::ShuttersControl::ascDev->getResidentsStatus
-          if ( $homemode eq 'none' );
 
         #### Hardware Lock der Rollläden
         $FHEM::Automation::ShuttersControl::shutters->setHardLockOut('off')
@@ -272,9 +284,25 @@ sub EventProcessingWindowRec {
             && $FHEM::Automation::ShuttersControl::shutters->getShuttersPlace
             eq 'terrace' );
         $FHEM::Automation::ShuttersControl::shutters->setHardLockOut('on')
-          if ( $match =~ m{[Oo]pen|false}xms
+          if (
+               $match =~ m{[Oo]pen|false}xms
             && $FHEM::Automation::ShuttersControl::shutters->getShuttersPlace
-            eq 'terrace' );
+            eq 'terrace'
+            && ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
+                   $FHEM::Automation::ShuttersControl::shutters->getOpenPos
+                || $FHEM::Automation::ShuttersControl::shutters->getStatus ==
+                $FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos
+            )
+          );
+
+        return
+          if ( !IsAfterShuttersManualBlocking($shuttersDev) );
+
+        my $homemode =
+          $FHEM::Automation::ShuttersControl::shutters->getRoommatesStatus;
+        $homemode =
+          $FHEM::Automation::ShuttersControl::ascDev->getResidentsStatus
+          if ( $homemode eq 'none' );
 
         FHEM::Automation::ShuttersControl::ASC_Debug(
                 'EventProcessingWindowRec: '
@@ -303,27 +331,33 @@ sub EventProcessingWindowRec {
                 $FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos
                 || ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
                        $FHEM::Automation::ShuttersControl::shutters->getOpenPos
-                    && $FHEM::Automation::ShuttersControl::shutters->getLastDrive
+                    && $FHEM::Automation::ShuttersControl::shutters
-                      eq 'ventilate - window open'
+                    ->getLastDrive eq 'ventilate - window open'
                     && $FHEM::Automation::ShuttersControl::shutters->getSubTyp
                     eq 'twostate'
-                    && $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen
+                    && $FHEM::Automation::ShuttersControl::shutters
-                      eq 'on' )
+                    ->getVentilateOpen eq 'on' )
                 || ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
                     $FHEM::Automation::ShuttersControl::shutters
                     ->getPrivacyDownPos
                     && $FHEM::Automation::ShuttersControl::shutters
                     ->getPrivacyDownStatus != 2
                     && !$FHEM::Automation::ShuttersControl::shutters->getIsDay )
-                || ( $FHEM::Automation::ShuttersControl::shutters->getStatus ==
+                || (
-                      $FHEM::Automation::ShuttersControl::shutters
+                    $FHEM::Automation::ShuttersControl::shutters->getStatus ==
-                         ->getOpenPos
+                    $FHEM::Automation::ShuttersControl::shutters->getOpenPos
                     && ( $FHEM::Automation::ShuttersControl::shutters
                         ->getLockOut ne 'off'
                         || $FHEM::Automation::ShuttersControl::shutters
-                             ->getShuttersPlace eq 'terrace'
+                        ->getShuttersPlace eq 'terrace' )
+                    && !$FHEM::Automation::ShuttersControl::shutters->getIsDay
                 )
-                    && !$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'
@@ -364,13 +398,19 @@ sub EventProcessingWindowRec {
                 elsif (
                     !$FHEM::Automation::ShuttersControl::shutters
                     ->getIfInShading
-                    && ( $FHEM::Automation::ShuttersControl::shutters->getStatus
+                    && (
+                        $FHEM::Automation::ShuttersControl::shutters->getStatus
                         != $FHEM::Automation::ShuttersControl::shutters
                         ->getOpenPos
                         || $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
@@ -394,6 +434,13 @@ sub EventProcessingWindowRec {
                         $FHEM::Automation::ShuttersControl::shutters
                           ->setDriveCmd(
                             (
+                                $FHEM::Automation::ShuttersControl::shutters
+                                  ->getDelayCmd ne 'none'
+                                  && $FHEM::Automation::ShuttersControl::shutters
+                                  ->getShuttersPlace eq 'terrace'
+                                ? $FHEM::Automation::ShuttersControl::shutters
+                                  ->getDelayCmd
+                                : (
                                     $FHEM::Automation::ShuttersControl::shutters
                                       ->getVentilatePosAfterDayClosed eq 'open'
                                     ? $FHEM::Automation::ShuttersControl::shutters
@@ -401,19 +448,22 @@ sub EventProcessingWindowRec {
                                     : $FHEM::Automation::ShuttersControl::shutters
                                       ->getLastManPos
                                 )
+                            )
                           );
                     }
                 }
             }
             elsif (
                   !$FHEM::Automation::ShuttersControl::shutters->getIsDay
-                && $FHEM::Automation::ShuttersControl::shutters->getModeDown eq 'roommate'
+                && $FHEM::Automation::ShuttersControl::shutters->getModeDown eq
-                && ( $FHEM::Automation::ShuttersControl::shutters->getRoommatesStatus eq 'home'
+                'roommate'
-                  || $FHEM::Automation::ShuttersControl::shutters->getRoommatesStatus eq 'awoken' )
+                && ( $FHEM::Automation::ShuttersControl::shutters
+                    ->getRoommatesStatus eq 'home'
+                    || $FHEM::Automation::ShuttersControl::shutters
+                    ->getRoommatesStatus eq 'awoken' )
               )
             {
-                $FHEM::Automation::ShuttersControl::shutters
+                $FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
-                          ->setDriveCmd(
                     (
                         $FHEM::Automation::ShuttersControl::shutters
                           ->getVentilatePosAfterDayClosed eq 'open'
@@ -477,9 +527,16 @@ sub EventProcessingWindowRec {
             )
             && $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen
             eq 'on'
-            && $FHEM::Automation::ShuttersControl::shutters
+            && (
+                $FHEM::Automation::ShuttersControl::shutters
                 ->getQueryShuttersPos(
-                $FHEM::Automation::ShuttersControl::shutters->getVentilatePos
+                    $FHEM::Automation::ShuttersControl::shutters
+                      ->getVentilatePos
+                )
+                || ( $FHEM::Automation::ShuttersControl::shutters
+                    ->getShuttersPlace eq 'terrace'
+                    && $FHEM::Automation::ShuttersControl::shutters->getSubTyp
+                    eq 'twostate' )
             )
           )
         {
@@ -510,7 +567,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
@@ -536,7 +593,7 @@ sub EventProcessingWindowRec {
                 $setLastDrive = 'ventilate - window open';
             }
 
-            if ( defined($posValue) && $posValue ) {
+            if ( defined($posValue) ) {
                 $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
                     $setLastDrive);
                 $FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
@@ -562,14 +619,15 @@ sub EventProcessingRoommate {
       $FHEM::Automation::ShuttersControl::shutters->getRoommatesReading;
 
     if ( $events =~ m{$reading:\s(absent|gotosleep|asleep|awoken|home)}xms ) {
-        Log3( $name, 4,
+        ::Log3( $name, 4,
             "AutoShuttersControl ($name) - EventProcessingRoommate: "
               . $FHEM::Automation::ShuttersControl::shutters
               ->getRoommatesReading );
-        Log3( $name, 4,
+        ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events"
         );
 
+        my $event     = $1;
         my $getModeUp = $FHEM::Automation::ShuttersControl::shutters->getModeUp;
         my $getModeDown =
           $FHEM::Automation::ShuttersControl::shutters->getModeDown;
@@ -577,21 +635,30 @@ sub EventProcessingRoommate {
           $FHEM::Automation::ShuttersControl::shutters->getRoommatesStatus;
         my $getRoommatesLastStatus =
           $FHEM::Automation::ShuttersControl::shutters->getRoommatesLastStatus;
-        my $event    = $1;
+        my $getUp    = $FHEM::Automation::ShuttersControl::shutters->getUp;
-        my $posValue = $FHEM::Automation::ShuttersControl::shutters->getStatus;
+        my $getDown  = $FHEM::Automation::ShuttersControl::shutters->getDown;
+        my $getIsDay = $FHEM::Automation::ShuttersControl::shutters->getIsDay;
+
+        my $posValue = $FHEM::Automation::ShuttersControl::shutters
+          ->getStatus;    # !!! ACHTUNG!!!
 
         if (
             ( $event eq 'home' || $event eq 'awoken' )
             && (   $getRoommatesStatus eq 'home'
                 || $getRoommatesStatus eq 'awoken' )
-            && ( $FHEM::Automation::ShuttersControl::ascDev
+            && (
+                $FHEM::Automation::ShuttersControl::ascDev
                 ->getAutoShuttersControlMorning eq 'on'
-                || $FHEM::Automation::ShuttersControl::shutters->getUp eq
+                || (
-                'roommate' )
+                    $getUp eq 'roommate'
+                    && (   $getRoommatesLastStatus eq 'asleep'
+                        || $getRoommatesLastStatus ne 'awoken' )
+                )
+            )
             && IsAfterShuttersManualBlocking($shuttersDev)
           )
         {
-            Log3( $name, 4,
+            ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate_1: $shuttersDev und Events $events"
             );
             if (
@@ -600,26 +667,24 @@ 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 )
                     )
                 )
-                && (   $FHEM::Automation::ShuttersControl::shutters->getIsDay
+                && (   $getIsDay
-                    || $FHEM::Automation::ShuttersControl::shutters->getUp eq
+                    || $getUp eq 'roommate' )
-                    'roommate' )
                 && ( IsAfterShuttersTimeBlocking($shuttersDev)
-                    || $FHEM::Automation::ShuttersControl::shutters->getUp eq
+                    || $getUp eq 'roommate' )
-                    'roommate' )
               )
             {
-                Log3( $name, 4,
+                ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate_2: $shuttersDev und Events $events"
                 );
 
@@ -657,7 +722,7 @@ sub EventProcessingRoommate {
               )
             {
                 if (
-                       $FHEM::Automation::ShuttersControl::shutters->getIsDay
+                       $getIsDay
                     && $FHEM::Automation::ShuttersControl::shutters
                     ->getIfInShading
                     && $FHEM::Automation::ShuttersControl::shutters->getStatus
@@ -677,12 +742,11 @@ sub EventProcessingRoommate {
                     ShadingProcessingDriveCommand( $hash, $shuttersDev, 1 );
                 }
                 elsif (
-                       !$FHEM::Automation::ShuttersControl::shutters->getIsDay
+                       !$getIsDay
                     && IsAfterShuttersTimeBlocking($shuttersDev)
                     && (   $getModeDown eq 'home'
                         || $getModeDown eq 'always' )
-                    && $FHEM::Automation::ShuttersControl::shutters->getDown ne
+                    && $getDown ne 'roommate'
-                    'roommate'
                   )
                 {
                     $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
@@ -720,11 +784,7 @@ sub EventProcessingRoommate {
                         $hash, $shuttersDev, $posValue );
                 }
                 elsif (
-                    (
+                       ( $getIsDay || $getUp eq 'roommate' )
-                        $FHEM::Automation::ShuttersControl::shutters->getIsDay
-                        || $FHEM::Automation::ShuttersControl::shutters->getUp
-                        eq 'roommate'
-                    )
                     && IsAfterShuttersTimeBlocking($shuttersDev)
                     && (   $getModeUp eq 'home'
                         || $getModeUp eq 'always' )
@@ -806,11 +866,9 @@ sub EventProcessingRoommate {
             'absent'
             && ( $FHEM::Automation::ShuttersControl::ascDev
                 ->getAutoShuttersControlEvening eq 'on'
-                || $FHEM::Automation::ShuttersControl::shutters->getDown eq
+                || $getDown eq 'roommate' )
-                'roommate' )
             && ( IsAfterShuttersManualBlocking($shuttersDev)
-                || $FHEM::Automation::ShuttersControl::shutters->getDown eq
+                || $getDown eq 'roommate' )
-                'roommate' )
           )
         {
             $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
@@ -840,9 +898,8 @@ sub EventProcessingRoommate {
         }
         elsif (
             $event eq 'absent'
-            && (  !$FHEM::Automation::ShuttersControl::shutters->getIsDay
+            && (  !$getIsDay
-                || $FHEM::Automation::ShuttersControl::shutters->getDown eq
+                || $getDown eq 'roommate'
-                'roommate'
                 || $FHEM::Automation::ShuttersControl::shutters->getShadingMode
                 eq 'absent'
                 || $FHEM::Automation::ShuttersControl::shutters->getModeUp eq
@@ -851,16 +908,12 @@ sub EventProcessingRoommate {
                 'absent' )
           )
         {
-            Log3( $name, 4,
+            ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate absent: $shuttersDev"
             );
 
             if (
-                (
+                   $getIsDay
-                       $FHEM::Automation::ShuttersControl::shutters->getIsDay
-                    || $FHEM::Automation::ShuttersControl::shutters->getUp eq
-                    'roommate'
-                )
                 && $FHEM::Automation::ShuttersControl::shutters->getIfInShading
                 && !$FHEM::Automation::ShuttersControl::shutters
                 ->getQueryShuttersPos(
@@ -870,7 +923,7 @@ sub EventProcessingRoommate {
                 eq 'absent'
               )
             {
-                Log3( $name, 4,
+                ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate Shading: $shuttersDev"
                 );
 
@@ -882,17 +935,11 @@ sub EventProcessingRoommate {
                     $FHEM::Automation::ShuttersControl::shutters->getShadingPos
                 );
             }
-            elsif (
+            elsif (( !$getIsDay || $getDown eq 'roommate' )
-                (
-                      !$FHEM::Automation::ShuttersControl::shutters->getIsDay
-                    || $FHEM::Automation::ShuttersControl::shutters->getDown eq
-                    'roommate'
-                )
                 && $getModeDown eq 'absent'
-                && $getRoommatesStatus eq 'absent'
+                && $getRoommatesStatus eq 'absent' )
-              )
             {
-                Log3( $name, 4,
+                ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate Down: $shuttersDev"
                 );
 
@@ -904,12 +951,12 @@ sub EventProcessingRoommate {
                     $FHEM::Automation::ShuttersControl::shutters->getClosedPos
                 );
             }
-            elsif ($FHEM::Automation::ShuttersControl::shutters->getIsDay
+            elsif ($getIsDay
                 && $FHEM::Automation::ShuttersControl::shutters->getModeUp eq
                 'absent'
                 && $getRoommatesStatus eq 'absent' )
             {
-                Log3( $name, 4,
+                ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate Up: $shuttersDev"
                 );
 
@@ -920,7 +967,7 @@ sub EventProcessingRoommate {
                     $FHEM::Automation::ShuttersControl::shutters->getOpenPos );
             }
 
-            Log3( $name, 4,
+            ::Log3( $name, 4,
 "AutoShuttersControl ($name) - EventProcessingRoommate NICHTS: $shuttersDev"
             );
         }
@@ -957,6 +1004,7 @@ sub EventProcessingResidents {
                 && $FHEM::Automation::ShuttersControl::shutters
                 ->getSelfDefenseMode ne 'off'
                 || $getModeDown eq 'absent'
+
 #                     || $getModeDown eq 'always' )       Wird zu Testzwecken auskommentiert, siehe #90 Github
                 || ( $FHEM::Automation::ShuttersControl::shutters
                     ->getShadingMode eq 'absent'
@@ -974,13 +1022,17 @@ sub EventProcessingResidents {
                     && (
                         $FHEM::Automation::ShuttersControl::shutters
                         ->getSelfDefenseMode eq 'absent'
-                        || ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
+                        || (
+                            CheckIfShuttersWindowRecOpen($shuttersDev) == 2
                             && $FHEM::Automation::ShuttersControl::shutters
                             ->getSelfDefenseMode eq 'gone'
-                            && $FHEM::Automation::ShuttersControl::shutters
+                            && ( $FHEM::Automation::ShuttersControl::shutters
                                 ->getShuttersPlace eq 'terrace'
+                                || $FHEM::Automation::ShuttersControl::shutters
+                                ->getShuttersPlace eq 'EG_window' )
                             && $FHEM::Automation::ShuttersControl::shutters
-                            ->getSelfDefenseMode ne 'off' )
+                            ->getSelfDefenseMode ne 'off'
+                        )
                     )
                   )
                 {
@@ -1031,11 +1083,14 @@ sub EventProcessingResidents {
                         $FHEM::Automation::ShuttersControl::shutters
                           ->getLastPos );
                 }
-                elsif ( $getModeDown eq 'absent'        # || $getModeDown eq 'always' )   Wird zu Testzwecken auskommentiert, siehe #90 Github
+                elsif (
+                    $getModeDown eq
+                    'absent' # || $getModeDown eq 'always' )   Wird zu Testzwecken auskommentiert, siehe #90 Github
                     && !$FHEM::Automation::ShuttersControl::shutters->getIsDay
                     && IsAfterShuttersTimeBlocking($shuttersDev)
                     && $FHEM::Automation::ShuttersControl::shutters
-                    ->getRoommatesStatus eq 'none' )
+                    ->getRoommatesStatus eq 'none'
+                  )
                 {
                     $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
                         'residents absent');
@@ -1095,6 +1150,8 @@ sub EventProcessingResidents {
                 ->getRoommatesStatus eq 'none'
                 && (   $getModeDown eq 'home'
                     || $getModeDown eq 'always' )
+                && $FHEM::Automation::ShuttersControl::ascDev
+                ->getAutoShuttersControlEvening eq 'on'
                 && $getResidentsLastStatus ne 'asleep'
                 && $getResidentsLastStatus ne 'awoken'
                 && IsAfterShuttersTimeBlocking($shuttersDev)
@@ -1178,7 +1235,7 @@ sub EventProcessingResidents {
                 ->getSelfDefenseState
               )
             {
-                RemoveInternalTimer(
+                ::RemoveInternalTimer(
                     $FHEM::Automation::ShuttersControl::shutters
                       ->getSelfDefenseAbsentTimerhash )
                   if ( $getResidentsLastStatus eq 'absent'
@@ -1242,6 +1299,8 @@ sub EventProcessingResidents {
                 ->getRoommatesStatus eq 'none'
                 && (   $getModeUp eq 'home'
                     || $getModeUp eq 'always' )
+                && $FHEM::Automation::ShuttersControl::ascDev
+                ->getAutoShuttersControlMorning eq 'on'
                 && IsAfterShuttersTimeBlocking($shuttersDev)
                 && !$FHEM::Automation::ShuttersControl::shutters->getIfInShading
                 && !$FHEM::Automation::ShuttersControl::shutters
@@ -1304,6 +1363,7 @@ sub EventProcessingWind {
 
     my $name = $hash->{NAME};
     $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
+    my $targetPos = $FHEM::Automation::ShuttersControl::shutters->getLastPos;
 
     my $reading =
       $FHEM::Automation::ShuttersControl::ascDev->getWindSensorReading
@@ -1355,29 +1415,38 @@ sub EventProcessingWind {
             {
                 $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
                     'wind un-protected');
-                $FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
+
-                    (
+                if ( $FHEM::Automation::ShuttersControl::shutters->getIsDay
-                          $FHEM::Automation::ShuttersControl::shutters->getIsDay
+                    && !$FHEM::Automation::ShuttersControl::shutters
-                        ? $FHEM::Automation::ShuttersControl::shutters
+                    ->getIfInShading
-                          ->getLastPos
+                    && $FHEM::Automation::ShuttersControl::shutters->getLastPos
-                        : (
+                    == $FHEM::Automation::ShuttersControl::shutters
+                    ->getShadingPos )
+                {
+                    $targetPos =
+                      $FHEM::Automation::ShuttersControl::shutters->getOpenPos;
+                }
+                else {
+                    $targetPos =
+                      $FHEM::Automation::ShuttersControl::shutters->getLastPos;
+                }
+
+                if ( !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) {
+                    $targetPos = (
                         $FHEM::Automation::ShuttersControl::shutters
                           ->getPrivacyDownStatus == 2
                         ? $FHEM::Automation::ShuttersControl::shutters
                           ->getPrivacyDownPos
-                            : (
-                                $FHEM::Automation::ShuttersControl::shutters
-                                  ->getSleepPos > 0
-                                ? $FHEM::Automation::ShuttersControl::shutters
-                                  ->getSleepPos
                         : $FHEM::Automation::ShuttersControl::shutters
                           ->getClosedPos
-                            )
-                        )
-                    )
                     );
+                }
+
                 $FHEM::Automation::ShuttersControl::shutters
                   ->setWindProtectionStatus('unprotected');
+
+                $FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
+                    $targetPos);
             }
 
             FHEM::Automation::ShuttersControl::ASC_Debug(
@@ -1431,8 +1500,8 @@ sub EventProcessingBrightness {
                 (
                     (
                         (
-                            int( gettimeofday() / 86400 ) == int(
+                            int( ::gettimeofday() / 86400 ) == int(
-                                computeAlignTime(
+                                ::computeAlignTime(
                                     '24:00',
                                     $FHEM::Automation::ShuttersControl::shutters
                                       ->getTimeUpEarly
@@ -1453,8 +1522,8 @@ sub EventProcessingBrightness {
                             )
                         )
                         || (
-                            int( gettimeofday() / 86400 ) == int(
+                            int( ::gettimeofday() / 86400 ) == int(
-                                computeAlignTime(
+                                ::computeAlignTime(
                                     '24:00',
                                     $FHEM::Automation::ShuttersControl::shutters
                                       ->getTimeUpWeHoliday
@@ -1467,8 +1536,8 @@ sub EventProcessingBrightness {
                             ->getTimeUpWeHoliday ne '01:25'
                         )
                     )
-                    && int( gettimeofday() / 86400 ) == int(
+                    && int( ::gettimeofday() / 86400 ) == int(
-                        computeAlignTime(
+                        ::computeAlignTime(
                             '24:00',
                             $FHEM::Automation::ShuttersControl::shutters
                               ->getTimeUpLate
@@ -1477,8 +1546,8 @@ sub EventProcessingBrightness {
 
                     || (
                         (
-                            int( gettimeofday() / 86400 ) != int(
+                            int( ::gettimeofday() / 86400 ) != int(
-                                computeAlignTime(
+                                ::computeAlignTime(
                                     '24:00',
                                     $FHEM::Automation::ShuttersControl::shutters
                                       ->getTimeUpEarly
@@ -1499,8 +1568,8 @@ sub EventProcessingBrightness {
                             )
                         )
                         || (
-                            int( gettimeofday() / 86400 ) != int(
+                            int( ::gettimeofday() / 86400 ) != int(
-                                computeAlignTime(
+                                ::computeAlignTime(
                                     '24:00',
                                     $FHEM::Automation::ShuttersControl::shutters
                                       ->getTimeUpWeHoliday
@@ -1513,8 +1582,8 @@ sub EventProcessingBrightness {
                             ->getTimeUpWeHoliday ne '01:25'
                         )
                     )
-                    && int( gettimeofday() / 86400 ) != int(
+                    && int( ::gettimeofday() / 86400 ) != int(
-                        com