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

delete IsDay from ShadingFn

Browse Source
This commit is contained in:
Marko Oldenburg 2019-06-23 08:30:12 +02:00
parent beeef8ccf3
commit ff69349147
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
73_AutoShuttersControl.pm
View File

@ -1746,8 +1746,7 @@ sub EventProcessingShadingBrightness($@) {
. ' WindProtection: '
. $shutters->getWindProtectionStatus );
if ( IsDay($shuttersDev)
and $ascDev->getAutoShuttersControlShading eq 'on'
if ( $ascDev->getAutoShuttersControlShading eq 'on'
and $shutters->getRainProtectionStatus eq 'unprotected'
and $shutters->getWindProtectionStatus eq 'unprotected' )
{
@ -1768,14 +1767,6 @@ sub EventProcessingShadingBrightness($@) {
. ' - Alle Bedingungen zur weiteren Beschattungsverarbeitung sind erfüllt. Es wird nun die eigentliche Beschattungsfunktion aufgerufen'
);
}
elsif ( $shutters->getShadingStatus eq 'in'
and $shutters->getRainProtectionStatus eq 'unprotected'
and $shutters->getWindProtectionStatus eq 'unprotected' )
{
$shutters->setShadingStatus('out');
$shutters->setShadingLastStatus('in');
ShadingProcessingDriveCommand( $hash, $shuttersDev );
}
}
}
@ -1830,7 +1821,6 @@ sub EventProcessingTwilightDevice($@) {
$shutters->getShadingMode eq 'always'
or $shutters->getShadingMode eq $homemode
)
and IsDay($shuttersDev)
and $ascDev->getAutoShuttersControlShading eq 'on'
and $shutters->getRainProtectionStatus eq 'unprotected'
and $shutters->getWindProtectionStatus eq 'unprotected'
@ -1853,13 +1843,6 @@ sub EventProcessingTwilightDevice($@) {
. ' - Alle Bedingungen zur weiteren Beschattungsverarbeitung sind erfüllt. Es wird nun die Beschattungsfunktion ausgeführt'
);
}
if ( not IsDay($shuttersDev)
and $shutters->getShadingStatus ne 'out' )
{
$shutters->setShadingStatus('out');
$shutters->setShadingLastStatus('in');
}
}
}
}
@ -1909,10 +1892,6 @@ sub ShadingProcessing($@) {
)
);
$shutters->setShadingStatus('out')
if ( not IsDay($shuttersDev)
and $shutters->getShadingStatus ne 'out' );
Log3( $name, 4,
"AutoShuttersControl ($name) - Shading Processing, Rollladen: "
. $shuttersDev
@ -1956,7 +1935,6 @@ sub ShadingProcessing($@) {
if (
(
$outTemp < $shutters->getShadingMinOutsideTemperature - 3
or not IsDay($shuttersDev)
or $azimuth < $winPosMin
or $azimuth > $winPosMax
)
@ -6267,7 +6245,7 @@ sub getblockAscDrivesAfterManual {
"release_status": "under develop",
"license": "GPL_2",
"version": "v0.6.19",
"x_developmentversion": "v0.6.19.7",
"x_developmentversion": "v0.6.19.8",
"author": [
"Marko Oldenburg <leongaultier@gmail.com>"
],