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

fix bug then privacyDownPos and night drive with window open

Browse Source
This commit is contained in:
Marko Oldenburg 2020-05-12 22:40:17 +02:00
parent ce5fb58b34
commit 20191f4565
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
73_AutoShuttersControl.pm
View File

@ -1142,9 +1142,14 @@ sub EventProcessingWindowRec {
if ( if (
$match =~ m{[Cc]lose|true}xms $match =~ m{[Cc]lose|true}xms
&& IsAfterShuttersTimeBlocking($shuttersDev) && IsAfterShuttersTimeBlocking($shuttersDev)
&& ( $shutters->getStatus == $shutters->getVentilatePos && (
$shutters->getStatus == $shutters->getVentilatePos
|| $shutters->getStatus == $shutters->getComfortOpenPos || $shutters->getStatus == $shutters->getComfortOpenPos
|| $shutters->getStatus == $shutters->getOpenPos ) || $shutters->getStatus == $shutters->getOpenPos
|| ( $shutters->getStatus == $shutters->getPrivacyDownPos
&& $shutters->getPrivacyDownStatus == 0
&& !$shutters->getIsDay )
)
&& ( $shutters->getVentilateOpen eq 'on' && ( $shutters->getVentilateOpen eq 'on'
|| $ascDev->getAutoShuttersControlComfort eq 'on' ) || $ascDev->getAutoShuttersControlComfort eq 'on' )
) )
@ -2250,12 +2255,12 @@ sub EventProcessingBrightness {
sub EventProcessingShadingBrightness { sub EventProcessingShadingBrightness {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $reading = $shutters->getBrightnessReading; my $reading = $shutters->getBrightnessReading;
my $outTemp = $shutters->getOutTemp; my $outTemp = $shutters->getOutTemp;
$outTemp = $ascDev->getOutTemp $outTemp = $ascDev->getOutTemp
if ($outTemp == -100); if ( $outTemp == -100 );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness" "AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness"
@ -2328,8 +2333,8 @@ sub EventProcessingTwilightDevice {
if ( $events =~ m{(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)}xms ) { if ( $events =~ m{(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)}xms ) {
my $name = $device; my $name = $device;
my $outTemp = $shutters->getOutTemp; my $outTemp = $shutters->getOutTemp;
$outTemp = $ascDev->getOutTemp $outTemp = $ascDev->getOutTemp
if ($outTemp == -100); if ( $outTemp == -100 );
my ( $azimuth, $elevation ); my ( $azimuth, $elevation );
$azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' ); $azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' );
@ -2581,11 +2586,13 @@ sub ShadingProcessing {
) )
&& ( $shutters->getShadingMode eq 'always' && ( $shutters->getShadingMode eq 'always'
|| $shutters->getShadingMode eq $homemode ) || $shutters->getShadingMode eq $homemode )
&& ( $shutters->getModeUp eq 'always' && (
$shutters->getModeUp eq 'always'
|| $shutters->getModeUp eq $homemode || $shutters->getModeUp eq $homemode
|| ( $shutters->getModeUp eq 'home' || ( $shutters->getModeUp eq 'home'
&& $homemode ne 'asleep' ) && $homemode ne 'asleep' )
|| $shutters->getModeUp eq 'off' ) || $shutters->getModeUp eq 'off'
)
&& ( && (
( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2 ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < 2
|| ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos ) || ( !$shutters->getQueryShuttersPos( $shutters->getShadingPos )