delete IsDay from ShadingFn
This commit is contained in:
parent
beeef8ccf3
commit
ff69349147
@ -1746,8 +1746,7 @@ sub EventProcessingShadingBrightness($@) {
|
|||||||
. ' WindProtection: '
|
. ' WindProtection: '
|
||||||
. $shutters->getWindProtectionStatus );
|
. $shutters->getWindProtectionStatus );
|
||||||
|
|
||||||
if ( IsDay($shuttersDev)
|
if ( $ascDev->getAutoShuttersControlShading eq 'on'
|
||||||
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' )
|
||||||
{
|
{
|
||||||
@ -1768,14 +1767,6 @@ sub EventProcessingShadingBrightness($@) {
|
|||||||
. ' - Alle Bedingungen zur weiteren Beschattungsverarbeitung sind erfüllt. Es wird nun die eigentliche Beschattungsfunktion aufgerufen'
|
. ' - 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'
|
$shutters->getShadingMode eq 'always'
|
||||||
or $shutters->getShadingMode eq $homemode
|
or $shutters->getShadingMode eq $homemode
|
||||||
)
|
)
|
||||||
and IsDay($shuttersDev)
|
|
||||||
and $ascDev->getAutoShuttersControlShading eq 'on'
|
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'
|
||||||
@ -1853,13 +1843,6 @@ sub EventProcessingTwilightDevice($@) {
|
|||||||
. ' - Alle Bedingungen zur weiteren Beschattungsverarbeitung sind erfüllt. Es wird nun die Beschattungsfunktion ausgeführt'
|
. ' - 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,
|
Log3( $name, 4,
|
||||||
"AutoShuttersControl ($name) - Shading Processing, Rollladen: "
|
"AutoShuttersControl ($name) - Shading Processing, Rollladen: "
|
||||||
. $shuttersDev
|
. $shuttersDev
|
||||||
@ -1956,7 +1935,6 @@ sub ShadingProcessing($@) {
|
|||||||
if (
|
if (
|
||||||
(
|
(
|
||||||
$outTemp < $shutters->getShadingMinOutsideTemperature - 3
|
$outTemp < $shutters->getShadingMinOutsideTemperature - 3
|
||||||
or not IsDay($shuttersDev)
|
|
||||||
or $azimuth < $winPosMin
|
or $azimuth < $winPosMin
|
||||||
or $azimuth > $winPosMax
|
or $azimuth > $winPosMax
|
||||||
)
|
)
|
||||||
@ -6267,7 +6245,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.7",
|
"x_developmentversion": "v0.6.19.8",
|
||||||
"author": [
|
"author": [
|
||||||
"Marko Oldenburg <leongaultier@gmail.com>"
|
"Marko Oldenburg <leongaultier@gmail.com>"
|
||||||
],
|
],
|
||||||
|
Loading…
Reference in New Issue
Block a user