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

change Attribut ASC_ExternalTriggerDevice to ASC_ExternalTrigger

Browse Source
This commit is contained in:
Marko Oldenburg 2019-11-05 13:44:40 +01:00
parent 804bfbf80b
commit 8bd2ad315c
1 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
73_AutoShuttersControl.pm
View File

@ -250,7 +250,7 @@ my %userAttrList = (
'ASC_DriveUpMaxDuration' => '-', 'ASC_DriveUpMaxDuration' => '-',
'ASC_WindProtection:on,off' => '-', 'ASC_WindProtection:on,off' => '-',
'ASC_RainProtection:on,off' => '-', 'ASC_RainProtection:on,off' => '-',
'ASC_ExternalTriggerDevice' => '-' 'ASC_ExternalTrigger' => '-'
); );
my %posSetCmds = ( my %posSetCmds = (
@ -477,7 +477,7 @@ sub Notify($$) {
{ # Kommt ein globales Event und beinhaltet folgende Syntax wird die Funktion zur Verarbeitung aufgerufen { # Kommt ein globales Event und beinhaltet folgende Syntax wird die Funktion zur Verarbeitung aufgerufen
if ( if (
grep grep
/^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAstroModeMorning|.*ASC_AutoAstroModeMorningHorizon|.*ASC_AutoAstroModeEvening|.*ASC_AutoAstroModeEveningHorizon|.*ASC_Time_Up_Early|.*ASC_Time_Up_Late|.*ASC_Time_Down_Early|.*ASC_Time_Down_Late|.*ASC_autoAstroModeMorning|.*ASC_autoAstroModeMorningHorizon|.*ASC_PrivacyDownValue_beforeNightClose|.*ASC_PrivacyUpValue_beforeDayOpen|.*ASC_autoAstroModeEvening|.*ASC_autoAstroModeEveningHorizon|.*ASC_Roommate_Device|.*ASC_WindowRec|.*ASC_residentsDev|.*ASC_rainSensor|.*ASC_windSensor|.*ASC_BrightnessSensor|.*ASC_twilightDevice|.*ASC_ExternalTriggerDevice)(\s.*|$)/, /^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAstroModeMorning|.*ASC_AutoAstroModeMorningHorizon|.*ASC_AutoAstroModeEvening|.*ASC_AutoAstroModeEveningHorizon|.*ASC_Time_Up_Early|.*ASC_Time_Up_Late|.*ASC_Time_Down_Early|.*ASC_Time_Down_Late|.*ASC_autoAstroModeMorning|.*ASC_autoAstroModeMorningHorizon|.*ASC_PrivacyDownValue_beforeNightClose|.*ASC_PrivacyUpValue_beforeDayOpen|.*ASC_autoAstroModeEvening|.*ASC_autoAstroModeEveningHorizon|.*ASC_Roommate_Device|.*ASC_WindowRec|.*ASC_residentsDev|.*ASC_rainSensor|.*ASC_windSensor|.*ASC_BrightnessSensor|.*ASC_twilightDevice|.*ASC_ExternalTrigger)(\s.*|$)/,
@{$events} @{$events}
) )
{ {
@ -522,7 +522,7 @@ sub EventProcessingGeneral($$$) {
EventProcessingTwilightDevice( $hash, $device, $events ) EventProcessingTwilightDevice( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_twilightDevice' ); if ( $deviceAttr eq 'ASC_twilightDevice' );
EventProcessingExternalTriggerDevice( $hash, $device, $events ) EventProcessingExternalTriggerDevice( $hash, $device, $events )
if ( $deviceAttr eq 'ASC_ExternalTriggerDevice' ); if ( $deviceAttr eq 'ASC_ExternalTrigger' );
$shutters->setShuttersDev($device) $shutters->setShuttersDev($device)
if ( $deviceAttr eq 'ASC_BrightnessSensor' ); if ( $deviceAttr eq 'ASC_BrightnessSensor' );
@ -542,7 +542,7 @@ sub EventProcessingGeneral($$$) {
} }
else { # alles was kein Devicenamen mit übergeben hat landet hier else { # alles was kein Devicenamen mit übergeben hat landet hier
if ( $events =~ if ( $events =~
m#^ATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSensor|ASC_windSensor|ASC_BrightnessSensor|ASC_ExternalTriggerDevice|ASC_twilightDevice)\s(.*)$# m#^ATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSensor|ASC_windSensor|ASC_BrightnessSensor|ASC_ExternalTrigger|ASC_twilightDevice)\s(.*)$#
) )
{ # wurde den Attributen unserer Rolläden ein Wert zugewiesen ? { # wurde den Attributen unserer Rolläden ein Wert zugewiesen ?
AddNotifyDev( $hash, $3, $1, $2 ) if ( $3 ne 'none' ); AddNotifyDev( $hash, $3, $1, $2 ) if ( $3 ne 'none' );
@ -550,7 +550,7 @@ m#^ATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSenso
"AutoShuttersControl ($name) - EventProcessing: ATTR" ); "AutoShuttersControl ($name) - EventProcessing: ATTR" );
} }
elsif ( $events =~ elsif ( $events =~
m#^DELETEATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSensor|ASC_windSensor|ASC_BrightnessSensor|ASC_ExternalTriggerDevice|ASC_twilightDevice)$# m#^DELETEATTR\s(.*)\s(ASC_Roommate_Device|ASC_WindowRec|ASC_residentsDev|ASC_rainSensor|ASC_windSensor|ASC_BrightnessSensor|ASC_ExternalTrigger|ASC_twilightDevice)$#
) )
{ # wurde das Attribut unserer Rolläden gelöscht ? { # wurde das Attribut unserer Rolläden gelöscht ?
Log3( $name, 4, Log3( $name, 4,
@ -2859,6 +2859,8 @@ sub RenewSunRiseSetShuttersTimer($) {
AttrVal( $name, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne AttrVal( $name, 'ASC_PrivacyDownTime_beforNightClose', 'none' ) ne
'none' ); 'none' );
delFromDevAttrList( $name, 'ASC_PrivacyDownTime_beforNightClose' ); delFromDevAttrList( $name, 'ASC_PrivacyDownTime_beforNightClose' );
delFromDevAttrList( $name, 'ASC_ExternalTriggerDevice' );
} }
} }
@ -3101,9 +3103,9 @@ sub CreateNewNotifyDev($) {
AddNotifyDev( $hash, AttrVal( $_, 'ASC_BrightnessSensor', 'none' ), AddNotifyDev( $hash, AttrVal( $_, 'ASC_BrightnessSensor', 'none' ),
$_, 'ASC_BrightnessSensor' ) $_, 'ASC_BrightnessSensor' )
if ( AttrVal( $_, 'ASC_BrightnessSensor', 'none' ) ne 'none' ); if ( AttrVal( $_, 'ASC_BrightnessSensor', 'none' ) ne 'none' );
AddNotifyDev( $hash, AttrVal( $_, 'ASC_ExternalTriggerDevice', 'none' ), AddNotifyDev( $hash, AttrVal( $_, 'ASC_ExternalTrigger', 'none' ),
$_, 'ASC_BrightnessSensor' ) $_, 'ASC_BrightnessSensor' )
if ( AttrVal( $_, 'ASC_ExternalTriggerDevice', 'none' ) ne 'none' ); if ( AttrVal( $_, 'ASC_ExternalTrigger', 'none' ) ne 'none' );
$shuttersList = $shuttersList . ',' . $_; $shuttersList = $shuttersList . ',' . $_;
} }
@ -5479,41 +5481,41 @@ sub getShadingWaitingPeriod {
sub getExternalTriggerDevice { sub getExternalTriggerDevice {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{device} ->{device}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{LASTGETTIME} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{LASTGETTIME}
= int( gettimeofday() ); = int( gettimeofday() );
my ( $device, $reading, $valueActive, $valueInactive, $posActive, my ( $device, $reading, $valueActive, $valueInactive, $posActive,
$posInactive ) $posInactive )
= FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev}, = FHEM::AutoShuttersControl::GetAttrValues( $self->{shuttersDev},
'ASC_ExternalTriggerDevice', 'none' ); 'ASC_ExternalTrigger', 'none' );
### erwartetes Ergebnis ### erwartetes Ergebnis
# DEVICE:READING VALUEACTIVE:VALUEINACTIVE POSACTIVE:POSINACTIVE # DEVICE:READING VALUEACTIVE:VALUEINACTIVE POSACTIVE:POSINACTIVE
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{device} = $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{device} =
$device; $device;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{reading} = $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{reading} =
$reading; $reading;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{valueactive} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{valueactive}
= $valueActive; = $valueActive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{valueinactive} = $valueInactive; ->{valueinactive} = $valueInactive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{posactive} = $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posactive} =
$posActive; $posActive;
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice}->{posinactive} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}->{posinactive}
= ( $posInactive ne 'none' ? $posInactive : $shutters->getLastPos ); = ( $posInactive ne 'none' ? $posInactive : $shutters->getLastPos );
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{device}; ->{device};
} }
@ -5521,100 +5523,100 @@ sub getExternalTriggerDevice {
sub getExternalTriggerReading { sub getExternalTriggerReading {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{reading} ->{reading}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{reading}; ->{reading};
} }
sub getExternalTriggerValueActive { sub getExternalTriggerValueActive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{valueactive} ->{valueactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{valueactive}; ->{valueactive};
} }
sub getExternalTriggerValueInactive { sub getExternalTriggerValueInactive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{valueinactive} ->{valueinactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{valueinactive}; ->{valueinactive};
} }
sub getExternalTriggerPosActive { sub getExternalTriggerPosActive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{posactive} ->{posactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{posactive}; ->{posactive};
} }
sub getExternalTriggerPosInactive { sub getExternalTriggerPosInactive {
my $self = shift; my $self = shift;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{posinactive} ->{posinactive}
if ( if (
exists( exists(
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ->{LASTGETTIME}
) )
and ( gettimeofday() - and ( gettimeofday() -
$self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{LASTGETTIME} ) < 2 ->{LASTGETTIME} ) < 2
); );
$shutters->getExternalTriggerDevice; $shutters->getExternalTriggerDevice;
return $self->{ $self->{shuttersDev} }->{ASC_ExternalTriggerDevice} return $self->{ $self->{shuttersDev} }->{ASC_ExternalTrigger}
->{posinactive}; ->{posinactive};
} }