From de599f7ac9f51090d42d59936c362db4d6a6d490 Mon Sep 17 00:00:00 2001 From: LeonGaultier Date: Wed, 5 Dec 2018 08:13:29 +0000 Subject: [PATCH] 73_AutoShuttersControl: fix absent Event and ModeDown absent bug git-svn-id: https://svn.fhem.de/fhem/trunk@17897 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/73_AutoShuttersControl.pm | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index b9753c0a4..41e5683e2 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: fix absent Event and ModeDown absent bug - bugfix: 73_AutoShuttersControl: fix gone then absent bug - feature: 49_SSCam: V7.6.0, The PTZ panel is completed by "Preset" and "Patrol" dropdown lists (for PTZ cams only) diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 4465964d1..c35af51b7 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -982,7 +982,8 @@ sub EventProcessingRoommate($@) { ShuttersCommandSet( $hash, $shuttersDev, $position ); } elsif ( $shutters->getModeDown eq 'absent' - and $1 eq 'absent' ) + and $1 eq 'absent' + and not IsDay( $hash, $shuttersDev ) ) { $shutters->setLastDrive('roommate absent'); ShuttersCommandSet( $hash, $shuttersDev, $shutters->getClosedPos ); @@ -1612,8 +1613,8 @@ sub SunSetShuttersAfterTimerFn($) { if ( $shutters->getModeDown eq $homemode - or ( $shutters->getModeDown eq 'absent' - and $homemode eq 'gone') + or ( $shutters->getModeDown eq 'absent' + and $homemode eq 'gone' ) or $shutters->getModeDown eq 'always' ) { @@ -1636,8 +1637,8 @@ sub SunRiseShuttersAfterTimerFn($) { if ( $shutters->getModeUp eq $homemode - or ( $shutters->getModeUp eq 'absent' - and $homemode eq 'gone') + or ( $shutters->getModeUp eq 'absent' + and $homemode eq 'gone' ) or $shutters->getModeUp eq 'always' ) { @@ -2255,7 +2256,8 @@ sub SetCmdFn($) { my $posValue = $h->{posValue}; $shutters->setShuttersDev($shuttersDev); - $shutters->setLastDrive($h->{lastDrive}) if ( defined($h->{lastDrive}) ); + $shutters->setLastDrive( $h->{lastDrive} ) + if ( defined( $h->{lastDrive} ) ); return unless ( $shutters->getASC != 0 );