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

Resolve conflicts from Patch merge

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-24 11:36:06 +02:00
commit fcb96d9878
1 changed files with 69 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
73_AutoShuttersControl.pm
View File

@ -13,6 +13,7 @@
# - sledge fix many typo in commandref
# - many User that use with modul and report bugs
# - Christoph (christoph.kaiser.in) Patch that expand RegEx for Window Events
# - Julian (Loredo) expand Residents Events for new Residents functions
#
#
# This script is free software; you can redistribute it and/or modify
@ -840,7 +841,8 @@ sub AddNotifyDev($@) {
%hash = map { ( $_ => 1 ) }
split( ',', "$notifyDev,$dev" );
my $match; # CK: added local variable to save matched event type (open|opened|close|closed|tilt|tilted)
my $match
; # CK: added local variable to save matched event type (open|opened|close|closed|tilt|tilted)
$hash->{NOTIFYDEV} = join( ',', sort keys %hash );
my @devs = split( ',', $dev );
@ -887,10 +889,8 @@ sub EventProcessingWindowRec($@) {
my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME};
if (
$events =~ m#.*state:.*(open(?>ed)?|closed?|tilt(?>ed)?)#
and IsAfterShuttersManualBlocking($shuttersDev)
)
if ( $events =~ m#.*state:.*(open(?>ed)?|closed?|tilt(?>ed)?)#
and IsAfterShuttersManualBlocking($shuttersDev) )
{
$match = $1;
@ -1170,7 +1170,7 @@ sub EventProcessingResidents($@) {
my $reading = $ascDev->getResidentsReading;
my $getResidentsLastStatus = $ascDev->getResidentsLastStatus;
if ( $events =~ m#$reading:\s(absent)# ) {
if ( $events =~ m#$reading:\s((?:pet_[a-z]+)|(?:absent))# ) {
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev);
my $getModeUp = $shutters->getModeUp;
@ -1217,7 +1217,7 @@ sub EventProcessingResidents($@) {
}
}
elsif (
$events =~ m#$reading:\s(home)#
$events =~ m#$reading:\s((?:[a-z]+_)?home)#
and ( $getResidentsLastStatus eq 'absent'
or $getResidentsLastStatus eq 'gone'
or $getResidentsLastStatus eq 'asleep'
@ -2029,7 +2029,15 @@ sub ShadingProcessing($@) {
and $getShadingPos == $getStatus )
{
$shutters->setLastDrive('shading out');
ShuttersCommandSet( $hash, $shuttersDev, ($shutters->getShadingPos == $shutters->getLastPos ? $shutters->getOpenPos : $shutters->getLastPos) );
ShuttersCommandSet(
$hash,
$shuttersDev,
(
$shutters->getShadingPos == $shutters->getLastPos
? $shutters->getOpenPos
: $shutters->getLastPos
)
);
ASC_Debug( 'ShadingProcessing: '
. $shutters->getShuttersDev
@ -3299,11 +3307,14 @@ sub CheckIfShuttersWindowRecOpen($) {
{
return 2;
}
elsif ( $shutters->getWinStatus =~ /tilt/ and $shutters->getSubTyp eq 'threestate' ) # CK: covers: tilt|tilted
elsif ( $shutters->getWinStatus =~ /tilt/
and $shutters->getSubTyp eq 'threestate' ) # CK: covers: tilt|tilted
{
return 1;
}
elsif ( $shutters->getWinStatus =~ /close/ ) { return 0; } # CK: covers: close|closed
elsif ( $shutters->getWinStatus =~ /close/ ) {
return 0;
} # CK: covers: close|closed
}
sub makeReadingName($) {
@ -4676,15 +4687,46 @@ sub getOutTemp {
sub getResidentsStatus {
my $self = shift;
return ReadingsVal( $ascDev->_getResidentsDev, $ascDev->getResidentsReading,
my $val =
ReadingsVal( $ascDev->_getResidentsDev, $ascDev->getResidentsReading,
'none' );
if ( $val =~ m/^(?:(.+)_)?(.+)$/ ) {
return ( $1, $2 ) if (wantarray);
return $1 && $1 eq 'pet' ? 'absent' : $2;
}
elsif (
ReadingsVal( $ascDev->_getResidentsDev, 'homealoneType', '-' ) eq
'PET' )
{
return ( 'pet', 'absent' ) if (wantarray);
return 'absent';
}
else {
return ( undef, $val ) if (wantarray);
return $val;
}
}
sub getResidentsLastStatus {
my $self = shift;
my $val = ReadingsVal( $ascDev->_getResidentsDev, 'lastState', 'none' );
return ReadingsVal( $ascDev->_getResidentsDev, 'lastState', 'none' );
if ( $val =~ m/^(?:(.+)_)?(.+)$/ ) {
return ( $1, $2 ) if (wantarray);
return $1 && $1 eq 'pet' ? 'absent' : $2;
}
elsif (
ReadingsVal( $ascDev->_getResidentsDev, 'lastHomealoneType', '-' ) eq
'PET' )
{
return ( 'pet', 'absent' ) if (wantarray);
return 'absent';
}
else {
return ( undef, $val ) if (wantarray);
return $val;
}
}
sub getAutoShuttersControlShading {