add Average with three Datasets

This commit is contained in:
Marko Oldenburg
2019-09-02 14:34:42 +02:00
parent 0128f07505
commit e3c63a0a93

View File

@ -720,6 +720,7 @@ sub ShuttersDeviceScan($) {
$shutters->setShadingLastStatus( $shutters->setShadingLastStatus(
( $shutters->getStatus != $shutters->getShadingPos ? 'in' : 'out' ) ( $shutters->getStatus != $shutters->getShadingPos ? 'in' : 'out' )
); );
$shutters->setPushBrightnessInArray( $shutters->getBrightness );
readingsSingleUpdate( $defs{$_}, 'ASC_Enable', 'on', 0 ) readingsSingleUpdate( $defs{$_}, 'ASC_Enable', 'on', 0 )
if ( ReadingsVal( $_, 'ASC_Enable', 'none' ) eq 'none' ); if ( ReadingsVal( $_, 'ASC_Enable', 'none' ) eq 'none' );
} }
@ -1863,10 +1864,13 @@ sub EventProcessingShadingBrightness($@) {
Brightness: " . $1 Brightness: " . $1
); );
## Brightness Wert in ein Array schieben zur Berechnung eines Average Wertes
$shutters->setPushBrightnessInArray($1);
ASC_Debug( 'EventProcessingShadingBrightness: ' ASC_Debug( 'EventProcessingShadingBrightness: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Nummerischer Brightness-Wert wurde erkannt. Der Wert ist: ' . ' - Nummerischer Brightness-Wert wurde erkannt. Der Brightness Average Wert ist: '
. $1 . $shutters->getBrightnessAverage
. ' RainProtection: ' . ' RainProtection: '
. $shutters->getRainProtectionStatus . $shutters->getRainProtectionStatus
. ' WindProtection: ' . ' WindProtection: '
@ -1883,7 +1887,6 @@ sub EventProcessingShadingBrightness($@) {
$shuttersDev, $shuttersDev,
$ascDev->getAzimuth, $ascDev->getAzimuth,
$ascDev->getElevation, $ascDev->getElevation,
$1,
$outTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
@ -1956,7 +1959,6 @@ sub EventProcessingTwilightDevice($@) {
$shuttersDev, $shuttersDev,
$azimuth, $azimuth,
$elevation, $elevation,
$shutters->getBrightness,
$outTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
@ -1976,12 +1978,12 @@ sub ShadingProcessing($@) {
### angleMinus ist $shutters->getShadingAngleLeft ### angleMinus ist $shutters->getShadingAngleLeft
### anglePlus ist $shutters->getShadingAngleRight ### anglePlus ist $shutters->getShadingAngleRight
### winPos ist die Fensterposition $shutters->getDirection ### winPos ist die Fensterposition $shutters->getDirection
my ( my ( $hash, $shuttersDev, $azimuth, $elevation, $outTemp,
$hash, $shuttersDev, $azimuth, $elevation, $brightness, $winPos, $angleMinus, $anglePlus )
$outTemp, $winPos, $angleMinus, $anglePlus = @_;
) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $brightness = $shutters->getBrightnessAverage;
ASC_Debug( ASC_Debug(
'ShadingProcessing: ' 'ShadingProcessing: '
@ -3697,6 +3699,13 @@ sub ASC_Debug($) {
); );
} }
sub _averageBrightness(@) {
my @input = @_;
use List::Util qw(sum);
return int( sum(@input) / @input );
}
###################################### ######################################
###################################### ######################################
########## Begin der Klassendeklarierungen für OOP (Objektorientierte Programmierung) ######################### ########## Begin der Klassendeklarierungen für OOP (Objektorientierte Programmierung) #########################
@ -4259,6 +4268,37 @@ sub setRainProtectionStatus { # Werte protected, unprotected
return 0; return 0;
} }
sub setPushBrightnessInArray {
my ( $self, $value ) = @_;
unshift(
@{ $self->{ $self->{shuttersDev} }->{BrightnessAverageArray}->{VAL} },
$value
);
pop( @{ $self->{ $self->{shuttersDev} }->{BrightnessAverageArray}->{VAL} } )
if (
scalar(
@{
$self->{ $self->{shuttersDev} }->{BrightnessAverageArray}->{VAL}
}
) > 3
);
}
sub getBrightnessAverage {
my $self = shift;
return &FHEM::AutoShuttersControl::_averageBrightness(
@{$self->{ $self->{shuttersDev} }->{BrightnessAverageArray}->{VAL}} )
if (
scalar(
@{
$self->{ $self->{shuttersDev} }->{BrightnessAverageArray}->{VAL}
}
) > 0
);
}
sub getShadingStatus { # Werte für value = in, out, in reserved, out reserved sub getShadingStatus { # Werte für value = in, out, in reserved, out reserved
my $self = shift; my $self = shift;
@ -6545,7 +6585,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.30", "version": "v0.6.31",
"x_developmentversion": "v0.6.19.34", "x_developmentversion": "v0.6.19.34",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"