From 0981c1ecae73dca601a7fc3ba477755eaa31c411 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Thu, 29 Apr 2021 10:32:54 +0000 Subject: [PATCH] 73_AutoShuttersControl: rollback bugfix #1149463 git-svn-id: https://svn.fhem.de/fhem/trunk@24354 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AutoShuttersControl.pm | 6 +++--- .../ShuttersControl/EventProcessingFunctions.pm | 10 ++++++++-- fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm | 12 ++++++------ 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index c13bc5b64..8acffe7ab 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 73_AutoShuttersControl: roolback fix #1149463 - bugfix: 73_AutoShuttersControl: fix logic error in EventProcessing Forum #1149463 - bugfix: 74_GardenaSmartDevice: fix uninitialized value in concatenation diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 471608c7d..6b9f8a627 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -1263,11 +1263,11 @@ sub Initialize { "Rollo", "Control" ], - "release_status": "testing", + "release_status": "stable", "license": "GPL_2", - "version": "v0.10.12", + "version": "v0.10.13", "author": [ - "Marko Oldenburg " + "Marko Oldenburg " ], "x_fhem_maintainer": [ "CoolTux" diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index d9c307eff..f72cd09fd 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -300,8 +300,14 @@ sub EventProcessingWindowRec { $FHEM::Automation::ShuttersControl::shutters->getVentilatePos || $FHEM::Automation::ShuttersControl::shutters->getStatus == $FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos -# || $FHEM::Automation::ShuttersControl::shutters->getStatus == -# $FHEM::Automation::ShuttersControl::shutters->getOpenPos Logikfehler? siehe Forum https://forum.fhem.de/index.php/topic,120390.msg1149463.html#msg1149463 + || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == + $FHEM::Automation::ShuttersControl::shutters->getOpenPos + && $FHEM::Automation::ShuttersControl::shutters->getLastDrive + eq 'ventilate - window open' + && $FHEM::Automation::ShuttersControl::shutters->getSubTyp + eq 'twostate' + && $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen + eq 'on' ) || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == $FHEM::Automation::ShuttersControl::shutters ->getPrivacyDownPos diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm b/fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm index 670962540..33d6c741e 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/Shading.pm @@ -468,15 +468,15 @@ sub ShadingProcessing { || $FHEM::Automation::ShuttersControl::shutters->getShadingMode eq $homemode ) && ( - $FHEM::Automation::ShuttersControl::shutters->getModeUp eq 'always' - || $FHEM::Automation::ShuttersControl::shutters->getModeUp eq + $getModeUp eq 'always' + || $getModeUp eq $homemode - || $FHEM::Automation::ShuttersControl::shutters->getModeUp eq 'off' - || $FHEM::Automation::ShuttersControl::shutters->getModeUp eq + || $getModeUp eq 'off' + || $getModeUp eq 'absent' - || $FHEM::Automation::ShuttersControl::shutters->getModeUp eq + || $getModeUp eq 'gone' - || ( $FHEM::Automation::ShuttersControl::shutters->getModeUp eq + || ( $getModeUp eq 'home' && $homemode ne 'asleep' ) )