FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-07 16:59:18 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: little bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21634 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-04-10 13:44:17 +00:00
parent 76b481b720
commit 4f8678b2bd
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -2510,13 +2510,8 @@ sub ShadingProcessingDriveCommand {
if ( $shutters->getShadingStatus eq 'in'
&& $getShadingPos != $getStatus )
{
if (
# !$shutters->getQueryShuttersPos($getShadingPos)
# && !(
CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $shutters->getShuttersPlace eq 'terrace'
# )
)
if ( !CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $shutters->getShuttersPlace eq 'terrace' )
{
$shutters->setLastDrive('shading in');
ShuttersCommandSet( $hash, $shuttersDev, $getShadingPos );
@ -2953,8 +2948,8 @@ sub CreateSunRiseSetShuttersTimer {
}
else {
CommandDeleteReading( undef, $shuttersDev . ' ASC_Time_PrivacyDriveUp' )
if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' )
ne 'none' );
if ( ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveUp', 'none' ) ne
'none' );
}
## Abfrage für die Sichtschutzfahrt am Abend vor dem eigentlichen kompletten schließen
@ -2966,8 +2961,8 @@ sub CreateSunRiseSetShuttersTimer {
CommandDeleteReading( undef,
$shuttersDev . ' ASC_Time_PrivacyDriveDown' )
if (
ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveDown', 'none' )
ne 'none' );
ReadingsVal( $shuttersDev, 'ASC_Time_PrivacyDriveDown', 'none' ) ne
'none' );
}
## kleine Hilfe für InternalTimer damit ich alle benötigten Variablen an die Funktion übergeben kann welche von Internal Timer aufgerufen wird.
@ -5312,7 +5307,7 @@ sub setShadingStatus {
return
if ( defined($value)
&& exists($self->{ $self->{shuttersDev} }{ShadingStatus}{VAL})
&& exists( $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} )
&& $self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} eq $value );
$self->{ $self->{shuttersDev} }{ShadingStatus}{VAL} = $value
@ -5329,14 +5324,14 @@ sub setShadingLastStatus {
return
if ( defined($value)
&& exists($self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL})
&& exists( $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} )
&& $self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} eq $value );
$self->{ $self->{shuttersDev} }{ShadingLastStatus}{VAL} = $value
if ( defined($value) );
$self->{ $self->{shuttersDev} }{ShadingLastStatus}{TIME} =
int( gettimeofday() )
if ( defined( $self->{ $self->{shuttersDev} }{ShadingLastStatus} ) );
if ( defined( $self->{ $self->{shuttersDev} }{ShadingLastStatus} ) );
$self->{ $self->{shuttersDev} }{ShadingManualDriveStatus}{VAL} = 0
if ( $value eq 'out' );