Merge pull request 'testing' (#136) from testing into main

Reviewed-on: #136
2025-01-21 16:31:26 +00:00
parent 72298746ab d4626a068b
commit 2351e5b9db
4 changed files with 73 additions and 19 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,44 @@
-### fix: remove experimental features change copyright (HEAD -> patch-remove-eperimental)
+### feat: change version (HEAD -> patch-marvin78)
+>Tue, 21 Jan 2025 17:18:12 +0100
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### feat: https://forum.fhem.de/index.php?topic=136510.0 (origin/patch-marvin78)
+>Sun, 12 Jan 2025 12:56:08 +0100
+
+>Author: Marko Oldenburg (oldenburg@b1-systems.de)
+
+>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
+
+
+
+
+### Corrected some typos and missing spaces
+>Thu, 26 Dec 2024 23:30:36 +0100
+
+>Author: riedel2 (riedel2@yahoo.de)
+
+>Commiter: riedel2 (riedel2@yahoo.de)
+
+
+
+
+### docs: Changelog
+>Sat, 12 Oct 2024 07:40:57 +0200
+
+>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
+
+
+
+
+### fix: remove experimental features change copyright
 >Sat, 12 Oct 2024 07:40:39 +0200

 >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@@ -30,6 +70,16 @@ change selfdefense condition in SunRiseShuttersAfterTimerFn



+### Update 73_AutoShuttersControl.pm
+>Wed, 9 Nov 2022 22:39:07 +0100
+
+>Author: riedel2 (56700949+riedel2@users.noreply.github.com)
+
+>Commiter: GitHub (noreply@github.com)
+
+added 'roommate' option at inline help for ASC_Down
+
+
 ### Update 73_AutoShuttersControl.pm
 >Sat, 5 Nov 2022 21:52:39 +0100

--- a/FHEM/73_AutoShuttersControl.pm
+++ b/FHEM/73_AutoShuttersControl.pm
@@ -1462,7 +1462,7 @@ __END__
  ],
  "release_status": "stable",
  "license": "GPL_2",
-  "version": "v0.99.10",
+  "version": "v1.0.0",
  "author": [
    "Marko Oldenburg <fhemdevelopment@cooltux.net>"
  ],
--- a/controls_AutoShuttersControl.txt
+++ b/controls_AutoShuttersControl.txt
@@ -1,16 +1,16 @@
-UPD 2024-10-12_07:38:48 116314 FHEM/73_AutoShuttersControl.pm
-UPD 2024-10-12_07:35:03 76335 lib/FHEM/Automation/ShuttersControl.pm
-UPD 2024-10-12_07:33:39 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
-UPD 2024-10-12_07:34:12 2675 lib/FHEM/Automation/ShuttersControl/Roommate.pm
-UPD 2024-10-12_07:34:38 31828 lib/FHEM/Automation/ShuttersControl/Shutters.pm
-UPD 2024-10-12_07:34:24 25541 lib/FHEM/Automation/ShuttersControl/Shading.pm
-UPD 2024-10-12_07:33:49 112297 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
-UPD 2024-10-12_07:34:00 40681 lib/FHEM/Automation/ShuttersControl/Helper.pm
-UPD 2024-10-12_07:34:46 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
-UPD 2024-10-12_07:38:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
-UPD 2024-10-12_07:38:06 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
-UPD 2024-10-12_07:37:57 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
-UPD 2024-10-12_07:37:49 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
-UPD 2024-10-12_07:37:43 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
-UPD 2024-10-12_07:33:29 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
-UPD 2024-10-12_07:34:06 7394 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
+UPD 2025-01-21_17:14:55 116498 FHEM/73_AutoShuttersControl.pm
+UPD 2025-01-21_17:12:13 76570 lib/FHEM/Automation/ShuttersControl.pm
+UPD 2024-10-12_09:12:30 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
+UPD 2024-10-12_09:12:30 2675 lib/FHEM/Automation/ShuttersControl/Roommate.pm
+UPD 2024-10-12_09:12:30 31828 lib/FHEM/Automation/ShuttersControl/Shutters.pm
+UPD 2024-10-12_09:12:30 25541 lib/FHEM/Automation/ShuttersControl/Shading.pm
+UPD 2024-10-12_09:12:30 112297 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
+UPD 2024-10-12_09:12:30 40681 lib/FHEM/Automation/ShuttersControl/Helper.pm
+UPD 2024-10-12_09:12:30 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
+UPD 2024-10-12_09:12:30 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
+UPD 2024-10-12_09:12:30 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
+UPD 2024-10-12_09:12:30 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
+UPD 2024-10-12_09:12:30 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
+UPD 2024-10-12_09:12:30 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.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
--- a/lib/FHEM/Automation/ShuttersControl.pm
+++ b/lib/FHEM/Automation/ShuttersControl.pm
@@ -1769,7 +1769,11 @@ sub SetCmdFn {
        || $FHEM::Automation::ShuttersControl::shutters
        ->getWindProtectionStatus eq 'protected'
        || $FHEM::Automation::ShuttersControl::shutters
-        ->getRainProtectionStatus eq 'protected' );
+        ->getRainProtectionStatus eq 'protected'
+        || (   CheckIfShuttersWindowRecOpen($shuttersDev) == 2
+            && $shutters->getStatus == $shutters->getOpenPos
+            && $shutters->getShuttersPlace eq 'terrace'
+            && $shutters->getSelfDefenseMode eq 'off') );

    if ( $shutters->getStatus != $posValue ) {
        $shutters->setLastPos( $shutters->getStatus );