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

change shading logic

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-26 11:20:09 +02:00
parent 45b6130bd0
commit 2ce59ed9a5
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
73_AutoShuttersControl.pm
View File

@@ -1418,9 +1418,11 @@ sub EventProcessingRain($@) {
$shutters->setDriveCmd( $shutters->setDriveCmd(
( (
IsDay($shuttersDev) ? $shutters->getLastPos IsDay($shuttersDev) ? $shutters->getLastPos
: ( $shutters->getPrivacyDownStatus == 2 : (
$shutters->getPrivacyDownStatus == 2
? $shutters->getPrivacyDownPos ? $shutters->getPrivacyDownPos
: $shutters->getClosedPos ) : $shutters->getClosedPos
)
) )
); );
$shutters->setRainProtectionStatus('unprotected'); $shutters->setRainProtectionStatus('unprotected');
@@ -1473,9 +1475,11 @@ sub EventProcessingWind($@) {
$shutters->setDriveCmd( $shutters->setDriveCmd(
( (
IsDay($shuttersDev) ? $shutters->getLastPos IsDay($shuttersDev) ? $shutters->getLastPos
: ( $shutters->getPrivacyDownStatus == 2 : (
$shutters->getPrivacyDownStatus == 2
? $shutters->getPrivacyDownPos ? $shutters->getPrivacyDownPos
: $shutters->getClosedPos ) : $shutters->getClosedPos
)
) )
); );
$shutters->setWindProtectionStatus('unprotected'); $shutters->setWindProtectionStatus('unprotected');
@@ -1976,12 +1980,12 @@ sub ShadingProcessing($@) {
my $winPosMin = $winPos - $angleMinus; my $winPosMin = $winPos - $angleMinus;
my $winPosMax = $winPos + $anglePlus; my $winPosMax = $winPos + $anglePlus;
# $shutters->setShadingLastStatus( $shutters->getShadingStatus ) # $shutters->setShadingLastStatus( $shutters->getShadingStatus )
# if ( # if (
# $shutters->getShadingLastStatus ne $shutters->getShadingStatus # $shutters->getShadingLastStatus ne $shutters->getShadingStatus
# and ( $shutters->getShadingStatus eq 'in' # and ( $shutters->getShadingStatus eq 'in'
# or $shutters->getShadingStatus eq 'out' ) # or $shutters->getShadingStatus eq 'out' )
# ); # );
if ( if (
( (
@@ -2023,8 +2027,8 @@ sub ShadingProcessing($@) {
( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp ) ( int( gettimeofday() ) - $shutters->getShadingStatusTimestamp )
> $shutters->getShadingWaitingPeriod > $shutters->getShadingWaitingPeriod
) )
or $azimuth > $winPosMax
); );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - Shading Processing, Rollladen: " "AutoShuttersControl ($name) - Shading Processing, Rollladen: "
. $shuttersDev . $shuttersDev
@@ -6387,7 +6391,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.19", "x_developmentversion": "v0.6.19.20",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],