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

add shutter tempout complete

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-24 12:57:52 +02:00
parent d139f8dd40
commit aa0dc90a2e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
73_AutoShuttersControl.pm
View File

@ -1719,6 +1719,7 @@ sub EventProcessingShadingBrightness($@) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $reading = $shutters->getBrightnessReading; my $reading = $shutters->getBrightnessReading;
my $outTemp = $ascDev->getOutTemp;
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness" "AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness"
@ -1749,13 +1750,14 @@ sub EventProcessingShadingBrightness($@) {
and $shutters->getRainProtectionStatus eq 'unprotected' and $shutters->getRainProtectionStatus eq 'unprotected'
and $shutters->getWindProtectionStatus eq 'unprotected' ) and $shutters->getWindProtectionStatus eq 'unprotected' )
{ {
$outTemp = $shutters->getOutTemp if ( $shutters->getOutTemp != -100 );
ShadingProcessing( ShadingProcessing(
$hash, $hash,
$shuttersDev, $shuttersDev,
$ascDev->getAzimuth, $ascDev->getAzimuth,
$ascDev->getElevation, $ascDev->getElevation,
$1, $1,
$ascDev->getOutTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
$shutters->getShadingAngleRight $shutters->getShadingAngleRight
@ -1788,6 +1790,7 @@ sub EventProcessingTwilightDevice($@) {
if ( $events =~ m#(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)# ) { if ( $events =~ m#(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)# ) {
my $name = $device; my $name = $device;
my ( $azimuth, $elevation ); my ( $azimuth, $elevation );
my $outTemp = $ascDev->getOutTemp;
$azimuth = $2 if ( $1 eq 'azimuth' or $1 eq 'SunAz' ); $azimuth = $2 if ( $1 eq 'azimuth' or $1 eq 'SunAz' );
$elevation = $2 if ( $1 eq 'elevation' or $1 eq 'SunAlt' ); $elevation = $2 if ( $1 eq 'elevation' or $1 eq 'SunAlt' );
@ -1807,6 +1810,7 @@ sub EventProcessingTwilightDevice($@) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
$outTemp = $shutters->getOutTemp if ( $shutters->getOutTemp != -100 );
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
@ -1826,7 +1830,7 @@ sub EventProcessingTwilightDevice($@) {
$azimuth, $azimuth,
$elevation, $elevation,
$shutters->getBrightness, $shutters->getBrightness,
$ascDev->getOutTemp, $outTemp,
$shutters->getDirection, $shutters->getDirection,
$shutters->getShadingAngleLeft, $shutters->getShadingAngleLeft,
$shutters->getShadingAngleRight $shutters->getShadingAngleRight
@ -3762,9 +3766,11 @@ sub getFreezeStatus {
use POSIX qw(strftime); use POSIX qw(strftime);
my $self = shift; my $self = shift;
my $daytime = strftime( "%P", localtime() ); my $daytime = strftime( "%P", localtime() );
my $outTemp = $ascDev->getOutTemp;
$outTemp = $shutters->getOutTemp if ( $shutters->getOutTemp != -100 );
if ( $shutters->getAntiFreeze ne 'off' if ( $shutters->getAntiFreeze ne 'off'
and $ascDev->getOutTemp <= $ascDev->getFreezeTemp ) and $outTemp <= $ascDev->getFreezeTemp )
{ {
if ( $shutters->getAntiFreeze eq 'soft' ) { if ( $shutters->getAntiFreeze eq 'soft' ) {
@ -6257,7 +6263,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.12", "x_developmentversion": "v0.6.19.13",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],