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

fix little shading bugs

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-23 18:25:17 +02:00
parent 987827a088
commit f3953e00b4
1 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
73_AutoShuttersControl.pm
View File

@@ -1814,12 +1814,7 @@ sub EventProcessingTwilightDevice($@) {
. ' WindProtection: ' . ' WindProtection: '
. $shutters->getWindProtectionStatus ); . $shutters->getWindProtectionStatus );
if ( if (and $ascDev->getAutoShuttersControlShading eq 'on'
(
$shutters->getShadingMode eq 'always'
or $shutters->getShadingMode eq $homemode
)
and $ascDev->getAutoShuttersControlShading eq 'on'
and $shutters->getRainProtectionStatus eq 'unprotected' and $shutters->getRainProtectionStatus eq 'unprotected'
and $shutters->getWindProtectionStatus eq 'unprotected' and $shutters->getWindProtectionStatus eq 'unprotected'
) )
@@ -1910,7 +1905,8 @@ sub ShadingProcessing($@) {
or ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) < or ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) <
( $shutters->getShadingWaitingPeriod / 2 ) ( $shutters->getShadingWaitingPeriod / 2 )
or not IsAfterShuttersTimeBlocking($shuttersDev) or not IsAfterShuttersTimeBlocking($shuttersDev)
or not IsAfterShuttersManualBlocking($shuttersDev) ); or not IsAfterShuttersManualBlocking($shuttersDev)
or $shutters->getShadingMode eq 'off' );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - Shading Processing, Rollladen: " "AutoShuttersControl ($name) - Shading Processing, Rollladen: "
@@ -1937,13 +1933,10 @@ sub ShadingProcessing($@) {
or $azimuth > $winPosMax or $azimuth > $winPosMax
) )
and $shutters->getShadingStatus ne 'out' and $shutters->getShadingStatus ne 'out'
and $getStatus != $getShadingPos
) )
{ {
$shutters->setShadingLastStatus('in');
$shutters->setShadingStatus('out'); $shutters->setShadingStatus('out');
$shutters->setLastDrive('shading out');
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getLastPos );
ASC_Debug( 'ShadingProcessing: ' ASC_Debug( 'ShadingProcessing: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
@@ -1954,8 +1947,7 @@ sub ShadingProcessing($@) {
"AutoShuttersControl ($name) - Shading Processing - Es ist Sonnenuntergang vorbei oder die Aussentemperatur unterhalb der Shading Temperatur " "AutoShuttersControl ($name) - Shading Processing - Es ist Sonnenuntergang vorbei oder die Aussentemperatur unterhalb der Shading Temperatur "
); );
} }
elsif ( $azimuth < $winPosMin
if ( $azimuth < $winPosMin
or $azimuth > $winPosMax or $azimuth > $winPosMax
or $elevation < $shutters->getShadingMinElevation or $elevation < $shutters->getShadingMinElevation
or $elevation > $shutters->getShadingMaxElevation or $elevation > $shutters->getShadingMaxElevation
@@ -6264,7 +6256,7 @@ sub getblockAscDrivesAfterManual {
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.19", "version": "v0.6.19",
"x_developmentversion": "v0.6.19.10", "x_developmentversion": "v0.6.19.11",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],