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

merge with devel

Browse Source
This commit is contained in:
Marko Oldenburg 2019-09-02 14:37:08 +02:00
commit 50a7b70f6a
1 changed files with 122 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
73_AutoShuttersControl.pm
View File

@ -60,6 +60,7 @@ use strict;
use warnings; use warnings;
use POSIX; use POSIX;
use utf8; use utf8;
use Encode;
use FHEM::Meta; use FHEM::Meta;
use GPUtils qw(GP_Import GP_Export); use GPUtils qw(GP_Import GP_Export);
use Data::Dumper; #only for Debugging use Data::Dumper; #only for Debugging
@ -262,6 +263,7 @@ my %posSetCmds = (
HM485 => 'level', HM485 => 'level',
SELVECommeo => 'position', SELVECommeo => 'position',
SELVE => 'position', SELVE => 'position',
EnOcean => 'position',
); );
my $shutters = new ASC_Shutters(); my $shutters = new ASC_Shutters();
@ -485,6 +487,10 @@ sub Notify($$) {
} }
} }
elsif ( grep /^($posReading):\s\d+$/, @{$events} ) { elsif ( grep /^($posReading):\s\d+$/, @{$events} ) {
ASC_Debug( 'Notify: '
. ' ASC_Pos_Reading Event vom Rollo wurde erkannt '
. ' - RECEIVED EVENT: '
. Dumper $events);
EventProcessingShutters( $hash, $devname, join( ' ', @{$events} ) ); EventProcessingShutters( $hash, $devname, join( ' ', @{$events} ) );
} }
else { else {
@ -714,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' );
} }
@ -1015,7 +1022,14 @@ sub EventProcessingWindowRec($@) {
{ {
$shutters->setLastDrive('ventilate - window open'); $shutters->setLastDrive('ventilate - window open');
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->getVentilatePos ); $shutters->setDriveCmd(
(
(
$shutters->getShuttersPlace eq 'terrace'
and $shutters->getSubTyp eq 'twostate'
) ? $shutters->getOpenPos : $shutters->getVentilatePos
)
);
} }
elsif ( $match =~ /[Oo]pen/ elsif ( $match =~ /[Oo]pen/
and $shutters->getSubTyp eq 'threestate' ) and $shutters->getSubTyp eq 'threestate' )
@ -1039,7 +1053,13 @@ sub EventProcessingWindowRec($@) {
if ( defined($posValue) and $posValue ) { if ( defined($posValue) and $posValue ) {
$shutters->setLastDrive($setLastDrive); $shutters->setLastDrive($setLastDrive);
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd($posValue); $shutters->setDriveCmd(
(
$shutters->getShuttersPlace eq 'terrace'
? $shutters->getOpenPos
: $posValue
)
);
} }
} }
} }
@ -1063,13 +1083,14 @@ sub EventProcessingRoommate($@) {
my $getModeUp = $shutters->getModeUp; my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown; my $getModeDown = $shutters->getModeDown;
my $getRoommatesStatus = $shutters->getRoommatesStatus;
my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus; my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus;
my $posValue; my $posValue;
if ( if (
( $1 eq 'home' or $1 eq 'awoken' ) ( $1 eq 'home' or $1 eq 'awoken' )
and ( $shutters->getRoommatesStatus eq 'home' and ( $getRoommatesStatus eq 'home'
or $shutters->getRoommatesStatus eq 'awoken' ) or $getRoommatesStatus eq 'awoken' )
and $ascDev->getAutoShuttersControlMorning eq 'on' and $ascDev->getAutoShuttersControlMorning eq 'on'
and IsAfterShuttersManualBlocking($shuttersDev) and IsAfterShuttersManualBlocking($shuttersDev)
) )
@ -1109,7 +1130,7 @@ sub EventProcessingRoommate($@) {
$getRoommatesLastStatus eq 'absent' $getRoommatesLastStatus eq 'absent'
or $getRoommatesLastStatus eq 'gone' or $getRoommatesLastStatus eq 'gone'
) )
and $shutters->getRoommatesStatus eq 'home' and $getRoommatesStatus eq 'home'
) )
{ {
if ( if (
@ -1196,8 +1217,7 @@ sub EventProcessingRoommate($@) {
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( elsif (
$getModeDown eq 'absent' $1 eq 'absent'
and $1 eq 'absent'
and ( not $shutters->getIsDay and ( not $shutters->getIsDay
or $shutters->getShadingMode eq 'absent' ) or $shutters->getShadingMode eq 'absent' )
) )
@ -1212,7 +1232,10 @@ sub EventProcessingRoommate($@) {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( not $shutters->getIsDay ) { elsif ( not $shutters->getIsDay
and $getModeDown eq 'absent'
and $getRoommatesStatus eq 'absent' )
{
$posValue = $shutters->getClosedPos; $posValue = $shutters->getClosedPos;
$shutters->setLastDrive('roommate absent'); $shutters->setLastDrive('roommate absent');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
@ -1369,14 +1392,15 @@ sub EventProcessingResidents($@) {
and not $shutters->getSelfDefenseAbsent and not $shutters->getSelfDefenseAbsent
and $shutters->getSelfDefenseAbsentTimerrun ); and $shutters->getSelfDefenseAbsentTimerrun );
if ( $shutters->getStatus == $shutters->getClosedPos ) { if ( $shutters->getStatus == $shutters->getClosedPos
and $shutters->getIsDay )
{
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
if ( if (
CheckIfShuttersWindowRecOpen($shuttersDev) == 2 CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' and $shutters->getShuttersPlace eq 'terrace'
and ( $getModeUp eq 'absent' and ( $getModeUp eq 'absent'
or $getModeUp eq 'off' ) or $getModeUp eq 'off' )
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
); );
$shutters->setLastDrive('selfDefense inactive'); $shutters->setLastDrive('selfDefense inactive');
@ -1829,10 +1853,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: '
@ -1849,7 +1876,6 @@ sub EventProcessingShadingBrightness($@) {
$shuttersDev, $shuttersDev,
$ascDev->getAzimuth, $ascDev->getAzimuth,
$ascDev->getElevation, $ascDev->getElevation,
$1,
$outTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
@ -1895,7 +1921,7 @@ sub EventProcessingTwilightDevice($@) {
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
. $name . $name
. ' - Passendes Event wurde erkannt. Verarbeitung über alle Rolllos beginnt' . ' - Passendes Event wurde erkannt. Verarbeitung über alle Rollos beginnt'
); );
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
@ -1922,7 +1948,6 @@ sub EventProcessingTwilightDevice($@) {
$shuttersDev, $shuttersDev,
$azimuth, $azimuth,
$elevation, $elevation,
$shutters->getBrightness,
$outTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
@ -1942,12 +1967,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: '
@ -2268,13 +2293,18 @@ sub EventProcessingShutters($@) {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
ASC_Debug( 'EventProcessingShutters: '
. ' Fn wurde durch Notify aufgerufen da ASC_Pos_Reading Event erkannt wurde '
. ' - RECEIVED EVENT: '
. Dumper $events);
if ( $events =~ m#.*:\s(\d+)# ) { if ( $events =~ m#.*:\s(\d+)# ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
$ascDev->setPosReading; $ascDev->setPosReading;
ASC_Debug( 'EventProcessingShutters: ' ASC_Debug( 'EventProcessingShutters: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Event vom Rolllo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.' . ' - Event vom Rollo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.'
. ' Int von gettimeofday: ' . ' Int von gettimeofday: '
. int( gettimeofday() ) . int( gettimeofday() )
. ' Last Position Timestamp: ' . ' Last Position Timestamp: '
@ -2312,6 +2342,11 @@ sub EventProcessingShutters($@) {
); );
} }
} }
ASC_Debug( 'EventProcessingShutters: '
. ' Fn wurde durlaufen und es sollten Debugausgaben gekommen sein. '
. ' !!!Wenn nicht!!! wurde der Event nicht korrekt als Nummerisch erkannt. '
);
} }
# Sub für das Zusammensetzen der Rolläden Steuerbefehle # Sub für das Zusammensetzen der Rolläden Steuerbefehle
@ -2587,19 +2622,23 @@ sub SunSetShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeDown eq 'always' or $shutters->getModeDown eq 'always'
) )
and (
$ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseExclude eq 'on'
or (
$ascDev->getSelfDefense eq 'on'
and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' )
)
)
) )
{ {
if ( $shutters->getPrivacyDownStatus == 1 ) { if ( $shutters->getPrivacyDownStatus == 1 ) {
$shutters->setPrivacyDownStatus(2); $shutters->setPrivacyDownStatus(2);
$shutters->setLastDrive('privacy position'); $shutters->setLastDrive('privacy position');
ShuttersCommandSet( ShuttersCommandSet( $hash, $shuttersDev,
$hash, $shutters->getPrivacyDownPos );
$shuttersDev,
PositionValueWindowRec(
$shuttersDev, $shutters->getPrivacyDownPos
)
);
} }
else { else {
$shutters->setPrivacyDownStatus(0); $shutters->setPrivacyDownStatus(0);
@ -2634,6 +2673,13 @@ sub SunRiseShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeUp eq 'always' or $shutters->getModeUp eq 'always'
) )
and (
$ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseExclude eq 'on'
or ( $ascDev->getSelfDefense eq 'on'
and $ascDev->getResidentsStatus ne 'absent'
and $ascDev->getResidentsStatus ne 'gone' )
)
) )
{ {
@ -2649,9 +2695,12 @@ sub SunRiseShuttersAfterTimerFn($) {
$ascDev->getSelfDefense eq 'off' $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
or ( $ascDev->getSelfDefense eq 'on' or (
$ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0 and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
and $ascDev->getResidentsStatus eq 'home' ) and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' )
)
) )
) )
{ {
@ -3595,7 +3644,7 @@ sub _SetCmdFn($) {
ASC_Debug( 'FnSetCmdFn: ' ASC_Debug( 'FnSetCmdFn: '
. $shuttersDev . $shuttersDev
. ' - Rolllo wird gefahren, aktuelle Position: ' . ' - Rollo wird gefahren, aktuelle Position: '
. $shutters->getStatus . $shutters->getStatus
. ', Zielposition: ' . ', Zielposition: '
. $posValue . $posValue
@ -3633,7 +3682,17 @@ sub ASC_Debug($) {
my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) ); my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) );
print( print(
"\n" . 'ASC_DEBUG!!! ' . $debugTimestamp . ' - ' . $debugMsg . "\n" ); encode_utf8(
"\n" . 'ASC_DEBUG!!! ' . $debugTimestamp . ' - ' . $debugMsg . "\n"
)
);
}
sub _averageBrightness(@) {
my @input = @_;
use List::Util qw(sum);
return int( sum(@input) / @input );
} }
###################################### ######################################
@ -4198,6 +4257,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;
@ -6484,7 +6574,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.28", "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>"