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

add more conditions to delaydrive

Browse Source
This commit is contained in:
Marko Oldenburg 2019-09-20 14:03:13 +02:00
parent ce425067b7
commit e76092fce4
1 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
73_AutoShuttersControl.pm
View File

@ -584,7 +584,7 @@ sub Set($$@) {
} }
elsif ( lc $cmd eq 'renewtimer' ) { elsif ( lc $cmd eq 'renewtimer' ) {
return "usage: $cmd" if ( @args > 1 ); return "usage: $cmd" if ( @args > 1 );
CreateSunRiseSetShuttersTimer($hash,$args[0]); CreateSunRiseSetShuttersTimer( $hash, $args[0] );
} }
elsif ( lc $cmd eq 'scanforshutters' ) { elsif ( lc $cmd eq 'scanforshutters' ) {
return "usage: $cmd" if ( @args != 0 ); return "usage: $cmd" if ( @args != 0 );
@ -647,7 +647,7 @@ sub Set($$@) {
. join( ',', @{ $hash->{helper}{shuttersList} } ) . join( ',', @{ $hash->{helper}{shuttersList} } )
. ' renewTimer:' . ' renewTimer:'
. join( ',', @{ $hash->{helper}{shuttersList} } ) . join( ',', @{ $hash->{helper}{shuttersList} } )
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' ); if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' );
$list .= ' createNewNotifyDev:noArg' $list .= ' createNewNotifyDev:noArg'
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out'
and AttrVal( $name, 'ASC_expert', 0 ) == 1 ); and AttrVal( $name, 'ASC_expert', 0 ) == 1 );
@ -2413,10 +2413,13 @@ sub ShuttersCommandSet($$$) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
if ( if (
$posValue != $shutters->getShadingPos $posValue != $shutters->getShadingPos
or ( $posValue == $shutters->getShadingPos or (
and CheckIfShuttersWindowRecOpen($shuttersDev) == 2 $posValue == $shutters->getShadingPos
and $shutters->getShuttersPlace eq 'terrace' and CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace'
and ( $shutters->getLockOut eq 'soft'
or $shutters->getLockOut eq 'hard' )
) )
and ( and (
( (
@ -3759,21 +3762,22 @@ sub IsWeTomorrow() {
} }
sub _SetCmdFn($) { sub _SetCmdFn($) {
my $h = shift; my $h = shift;
my $shuttersDev = $h->{shuttersDev}; my $shuttersDev = $h->{shuttersDev};
my $posValue = $h->{posValue}; my $posValue = $h->{posValue};
my $idleDetectionValue = $shutters->getIdleDetectionValue; my $idleDetectionValue = $shutters->getIdleDetectionValue;
my $idleDetection = $shutters->getIdleDetection; my $idleDetection = $shutters->getIdleDetection;
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
$shutters->setLastDrive( $h->{lastDrive} ) $shutters->setLastDrive( $h->{lastDrive} )
if ( defined( $h->{lastDrive} ) ); if ( defined( $h->{lastDrive} ) );
return return
unless ( $shutters->getASCenable eq 'on' unless (
$shutters->getASCenable eq 'on'
and $ascDev->getASCenable eq 'on' and $ascDev->getASCenable eq 'on'
and ($idleDetection =~ /^$idleDetectionValue$/ and ( $idleDetection =~ /^$idleDetectionValue$/
or $idleDetection eq 'none') or $idleDetection eq 'none' )
); );
if ( $shutters->getStatus != $posValue ) { if ( $shutters->getStatus != $posValue ) {
@ -3845,10 +3849,10 @@ sub _averageBrightness(@) {
sub _perlCodeCheck($) { sub _perlCodeCheck($) {
my $exec = shift; my $exec = shift;
my $val = undef; my $val = undef;
if ( $exec =~ /^\{(.+)\}$/ ) { if ( $exec =~ /^\{(.+)\}$/ ) {
$val = main::AnalyzePerlCommand(undef, $1); $val = main::AnalyzePerlCommand( undef, $1 );
} }
return $val; return $val;
@ -4719,27 +4723,32 @@ sub getTempSensorReading {
sub _getIdleDetectionReading { sub _getIdleDetectionReading {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{reading} return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
->{reading}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} ) $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
< 2 ->{LASTGETTIME} ) < 2
); );
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} = $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME}
int( gettimeofday() ); = int( gettimeofday() );
my ( $reading, $value ) = my ( $reading, $value ) =
FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev}, FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev},
'ASC_Shutter_IdleDetection', 'none' ); 'ASC_Shutter_IdleDetection', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
# READING:VALUE # READING:VALUE
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{reading} = $reading; $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{reading} =
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value} = $value; $reading;
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value} =
$value;
return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{reading}; return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
->{reading};
} }
sub getIdleDetectionValue { sub getIdleDetectionValue {
@ -4748,16 +4757,20 @@ sub getIdleDetectionValue {
return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value} return $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{LASTGETTIME} ) $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
< 2 ->{LASTGETTIME} ) < 2
); );
$shutters->_getIdleDetectionReading; $shutters->_getIdleDetectionReading;
return ( return (
defined( $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value} ) defined(
$self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}
->{value}
)
? $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value} ? $self->{ $self->{shuttersDev} }->{ASC_Shutter_IdleDetection}->{value}
: 'none' : 'none'
); );