2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00

73_AutoShuttersControl: fix absent Event and ModeDown absent bug

git-svn-id: https://svn.fhem.de/fhem/trunk@17897 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2018-12-05 08:13:29 +00:00
parent 7f1942ee28
commit de599f7ac9
2 changed files with 9 additions and 6 deletions

View File

@ -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)

View File

@ -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 );
@ -1613,7 +1614,7 @@ sub SunSetShuttersAfterTimerFn($) {
if (
$shutters->getModeDown eq $homemode
or ( $shutters->getModeDown eq 'absent'
and $homemode eq 'gone')
and $homemode eq 'gone' )
or $shutters->getModeDown eq 'always'
)
{
@ -1637,7 +1638,7 @@ sub SunRiseShuttersAfterTimerFn($) {
if (
$shutters->getModeUp eq $homemode
or ( $shutters->getModeUp eq 'absent'
and $homemode eq 'gone')
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 );