FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

fix -residents come home- typo

Browse Source
This commit is contained in:
Marko Oldenburg 2019-09-22 08:13:34 +02:00
parent 7009423fa9
commit e589864a0a
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
73_AutoShuttersControl.pm
View File

@ -1398,7 +1398,7 @@ sub EventProcessingResidents($@) {
and $shutters->getRoommatesStatus eq 'none' and $shutters->getRoommatesStatus eq 'none'
) )
{ {
$shutters->setLastDrive('residents comin home'); $shutters->setLastDrive('residents come home');
$shutters->setDriveCmd( $shutters->getClosedPos ); $shutters->setDriveCmd( $shutters->getClosedPos );
} }
elsif ( elsif (
@ -3962,17 +3962,17 @@ sub setDriveCmd {
my $offSet; my $offSet;
my $offSetStart; my $offSetStart;
if ( $shutters->getPartyMode eq 'on'
if ( $shutters->getPartyMode eq 'on' and $ascDev->getPartyMode eq 'on' )
and $ascDev->getPartyMode eq 'on' ) { {
$shutters->setDelayCmd($posValue); $shutters->setDelayCmd($posValue);
$ascDev->setDelayCmdReading; $ascDev->setDelayCmdReading;
$shutters->setNoDelay(0); $shutters->setNoDelay(0);
FHEM::AutoShuttersControl::ASC_Debug( 'setDriveCmd: ' FHEM::AutoShuttersControl::ASC_Debug( 'setDriveCmd: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Die Fahrt wird zurückgestellt. Grund kann ein geöffnetes Fenster sein oder ein aktivierter Party Modus' . ' - Die Fahrt wird zurückgestellt. Grund kann ein geöffnetes Fenster sein oder ein aktivierter Party Modus'
); );
} }
else { else {
@ -4007,30 +4007,33 @@ sub setDriveCmd {
and $shutters->getLastDrive eq 'selfDefense active' and $shutters->getLastDrive eq 'selfDefense active'
and $ascDev->getSelfDefense eq 'on' ) and $ascDev->getSelfDefense eq 'on' )
{ {
InternalTimer( gettimeofday() + $shutters->getSelfDefenseAbsentDelay, InternalTimer(
gettimeofday() + $shutters->getSelfDefenseAbsentDelay,
'FHEM::AutoShuttersControl::_SetCmdFn', \%h ); 'FHEM::AutoShuttersControl::_SetCmdFn', \%h );
$shutters->setSelfDefenseAbsent( 1, 0, \%h ); $shutters->setSelfDefenseAbsent( 1, 0, \%h );
} }
elsif ( $offSetStart > 0 and not $shutters->getNoDelay ) { elsif ( $offSetStart > 0 and not $shutters->getNoDelay ) {
InternalTimer( InternalTimer(
gettimeofday() + int( rand($offSet) + $shutters->getDelayStart ), gettimeofday() +
'FHEM::AutoShuttersControl::_SetCmdFn', \%h ); int( rand($offSet) + $shutters->getDelayStart ),
'FHEM::AutoShuttersControl::_SetCmdFn', \%h
);
FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: ' FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - versetztes fahren' ); . ' - versetztes fahren' );
} }
elsif ( $offSetStart < 1 or $shutters->getNoDelay ) { elsif ( $offSetStart < 1 or $shutters->getNoDelay ) {
FHEM::AutoShuttersControl::_SetCmdFn( \%h ); FHEM::AutoShuttersControl::_SetCmdFn( \%h );
FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: ' FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - NICHT versetztes fahren' ); . ' - NICHT versetztes fahren' );
} }
FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: ' FHEM::AutoShuttersControl::ASC_Debug( 'FnSetDriveCmd: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - NoDelay: ' . ' - NoDelay: '
. ( $shutters->getNoDelay ? 'JA' : 'NEIN' ) ); . ( $shutters->getNoDelay ? 'JA' : 'NEIN' ) );
$shutters->setNoDelay(0); $shutters->setNoDelay(0);
return 0; return 0;
} }