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

change version number

Browse Source
This commit is contained in:
Marko Oldenburg 2020-05-21 11:24:28 +02:00
parent b440b1b96e
commit 419bba1e74
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
73_AutoShuttersControl.pm
View File

@ -2258,7 +2258,10 @@ 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 = ( $shutters->getOutTemp != -100 ? $shutters->getOutTemp : $ascDev->getOutTemp ); my $outTemp =
( $shutters->getOutTemp != -100
? $shutters->getOutTemp
: $ascDev->getOutTemp );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness" "AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness"
@ -2333,12 +2336,12 @@ sub EventProcessingTwilightDevice {
my $outTemp = $ascDev->getOutTemp; my $outTemp = $ascDev->getOutTemp;
my ( $azimuth, $elevation ); my ( $azimuth, $elevation );
$azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' ); $azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' );
$elevation = $2 if ( $1 eq 'elevation' || $1 eq 'SunAlt' ); $elevation = $2 if ( $1 eq 'elevation' || $1 eq 'SunAlt' );
$azimuth = $ascDev->getAzimuth $azimuth = $ascDev->getAzimuth
if ( !defined($azimuth) && !$azimuth ); if ( !defined($azimuth) && !$azimuth );
$elevation = $ascDev->getElevation $elevation = $ascDev->getElevation
if ( !defined($elevation) && !$elevation ); if ( !defined($elevation) && !$elevation );
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
@ -2349,10 +2352,10 @@ sub EventProcessingTwilightDevice {
for my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { for my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
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 $outTemp = $shutters->getOutTemp
if ( $shutters->getOutTemp != -100 ); if ( $shutters->getOutTemp != -100 );
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
@ -2903,9 +2906,11 @@ sub EventProcessingExternalTriggerDevice {
$shutters->setLastDrive('external trigger device inactive'); $shutters->setLastDrive('external trigger device inactive');
$shutters->setNoDelay(1); $shutters->setNoDelay(1);
$shutters->setExternalTriggerState(1); $shutters->setExternalTriggerState(1);
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet(
$hash,
$shuttersDev,
( (
$shutters->getIsDay $shutters->getIsDay
? $triggerPosInactive ? $triggerPosInactive
: $shutters->getClosedPos : $shutters->getClosedPos
) )
@ -3764,17 +3769,17 @@ sub _IsDay {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $brightnessMinVal = my $brightnessMinVal = (
( $shutters->getBrightnessMinVal > -1 $shutters->getBrightnessMinVal > -1
? $shutters->getBrightnessMinVal ? $shutters->getBrightnessMinVal
: $ascDev->getBrightnessMinVal : $ascDev->getBrightnessMinVal
); );
my $brightnessMaxVal = my $brightnessMaxVal = (
( $shutters->getBrightnessMaxVal > -1 $shutters->getBrightnessMaxVal > -1
? $shutters->getBrightnessMaxVal ? $shutters->getBrightnessMaxVal
: $ascDev->getBrightnessMaxVal : $ascDev->getBrightnessMaxVal
); );
my $isday = ( ShuttersSunrise( $shuttersDev, 'unix' ) > my $isday = ( ShuttersSunrise( $shuttersDev, 'unix' ) >
ShuttersSunset( $shuttersDev, 'unix' ) ? 1 : 0 ); ShuttersSunset( $shuttersDev, 'unix' ) ? 1 : 0 );
@ -3787,8 +3792,8 @@ sub _IsDay {
( (
( (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
computeAlignTime( '24:00', computeAlignTime( '24:00', $shutters->getTimeUpEarly )
$shutters->getTimeUpEarly ) / 86400 / 86400
) )
&& !IsWe() && !IsWe()
) )
@ -3803,18 +3808,16 @@ sub _IsDay {
) )
) )
&& int( gettimeofday() / 86400 ) == int( && int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00', $shutters->getTimeUpLate ) / computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400
86400
) )
) )
|| ( || (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
computeAlignTime( '24:00', $shutters->getTimeDownEarly ) / computeAlignTime( '24:00', $shutters->getTimeDownEarly ) /
86400 86400
) )
&& int( gettimeofday() / 86400 ) == int( && int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00', $shutters->getTimeDownLate ) / computeAlignTime( '24:00', $shutters->getTimeDownLate ) / 86400
86400
) )
) )
) )
@ -9554,7 +9557,7 @@ sub getBlockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.9.18", "version": "v0.9.19",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],