Merge branch 'master' into devel

This commit is contained in:
Marko Oldenburg 2020-07-04 11:22:14 +02:00
commit c6b76320a4
2 changed files with 8 additions and 9 deletions

View File

@ -1,9 +1,9 @@
UPD 2020-07-03_13:18:05 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-03_13:36:46 177776 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-07-04_11:19:49 97041 FHEM/73_AutoShuttersControl.pm
UPD 2020-07-04_11:21:49 177739 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-03_11:29:10 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-03_11:29:10 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-03_12:48:24 17908 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-07-04_11:19:49 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-07-04_11:19:49 30710 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-07-04_11:19:49 17908 lib/FHEM/Automation/ShuttersControl/Shading.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-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm

View File

@ -4307,10 +4307,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 ) {