From 3f8397a6a2aed859ebbc0d49bbc86726c23beacd Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sat, 4 Jul 2020 11:14:14 +0200 Subject: [PATCH] fix drive condition for ASCenable and idleDetection --- controls_AutoShuttersControl.txt | 12 ++++++------ lib/FHEM/Automation/ShuttersControl.pm | 10 ++++++---- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index ddfdff1..7421f37 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,12 +1,12 @@ -UPD 2020-07-02_14:58:15 96885 FHEM/73_AutoShuttersControl.pm -UPD 2020-07-02_18:02:10 188567 lib/FHEM/Automation/ShuttersControl.pm +UPD 2020-07-04_11:01:19 96885 FHEM/73_AutoShuttersControl.pm +UPD 2020-07-04_11:13:41 188533 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm -UPD 2020-07-02_14:58:15 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm -UPD 2020-07-02_14:47:17 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm +UPD 2020-07-04_11:01:19 2493 lib/FHEM/Automation/ShuttersControl/Roommate.pm +UPD 2020-07-04_11:01:19 30157 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2020-06-22_09:41:40 11454 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm -UPD 2020-06-22_09:41:40 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2020-06-30_12:47:15 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm +UPD 2020-07-03_11:29:10 52390 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2020-06-22_09:41:40 3972 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm diff --git a/lib/FHEM/Automation/ShuttersControl.pm b/lib/FHEM/Automation/ShuttersControl.pm index e5de277..5dbad8b 100644 --- a/lib/FHEM/Automation/ShuttersControl.pm +++ b/lib/FHEM/Automation/ShuttersControl.pm @@ -4612,10 +4612,9 @@ sub _SetCmdFn { return if ( - $shutters->getASCenable eq 'off' - && $ascDev->getASCenable eq 'off' - && ( $idleDetection !~ m{^$idleDetectionValue$}xms - || $idleDetection ne 'none' ) + $shutters->getASCenable eq 'off' + || $ascDev->getASCenable eq 'off' + || $idleDetection !~ m{^$idleDetectionValue$}xms ); if ( $shutters->getStatus != $posValue ) { @@ -5040,4 +5039,7 @@ sub _CheckShuttersConditionsForShadingFn { readingsEndUpdate( $shuttersDevHash, 1 ); } + + + 1;