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

change version, code style

Browse Source
This commit is contained in:
Marko Oldenburg
2019-05-07 11:34:53 +02:00
parent 6f8175ca88
commit 50f5bd9477
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
73_AutoShuttersControl.pm
View File

@@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.7.1-patchBrightness'; my $version = '0.6.7';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@@ -1431,7 +1431,7 @@ sub EventProcessingBrightness($@) {
. ' getSunrise ist: ' . ' getSunrise ist: '
. $shutters->getSunrise . $shutters->getSunrise
. ' getSunset ist: ' . ' getSunset ist: '
. $shutters->getSunset); . $shutters->getSunset );
if ( if (
( (
@@ -2046,11 +2046,12 @@ sub EventProcessingShutters($@) {
if ( $events =~ m#.*:\s(\d+)# ) { if ( $events =~ m#.*:\s(\d+)# ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
$ascDev->setPosReading; $ascDev->setPosReading;
ASC_Debug( 'EventProcessingShutters: ' ASC_Debug( 'EventProcessingShutters: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Event vom Rolllo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.' . ' - Event vom Rolllo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.'
. ' Int von gettimeofday: ' . int( gettimeofday() ) . ' Int von gettimeofday: '
. int( gettimeofday() )
. ' Last Position Timestamp: ' . ' Last Position Timestamp: '
. $shutters->getLastPosTimestamp . $shutters->getLastPosTimestamp
. ' Drive Up Max Duration: ' . ' Drive Up Max Duration: '
@@ -2058,16 +2059,12 @@ sub EventProcessingShutters($@) {
. ' Last Position: ' . ' Last Position: '
. $shutters->getLastPos . $shutters->getLastPos
. ' aktuelle Position: ' . ' aktuelle Position: '
. $shutters->getStatus . $shutters->getStatus );
);
if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) > if ( ( int( gettimeofday() ) - $shutters->getLastPosTimestamp ) >
$shutters->getDriveUpMaxDuration $shutters->getDriveUpMaxDuration
and ( int( gettimeofday() ) - $shutters->getLastManPosTimestamp ) > and ( int( gettimeofday() ) - $shutters->getLastManPosTimestamp ) >
$shutters->getDriveUpMaxDuration $shutters->getDriveUpMaxDuration )
)
{ {
$shutters->setLastDrive('manual'); $shutters->setLastDrive('manual');
$shutters->setLastDriveReading; $shutters->setLastDriveReading;
@@ -2727,12 +2724,14 @@ sub IsDay($) {
$brightnessMaxVal = $ascDev->getBrightnessMaxVal; $brightnessMaxVal = $ascDev->getBrightnessMaxVal;
} }
##### Nach Sonnenuntergang / Abends ##### Nach Sonnenuntergang / Abends
$respIsDay = ( $respIsDay = (
( (
( $shutters->getBrightness > $brightnessMinVal (
and $isday $shutters->getBrightness > $brightnessMinVal
and not $shutters->getSunset ) and $isday
and not $shutters->getSunset
)
or not $shutters->getSunset or not $shutters->getSunset
) ? 1 : 0 ) ? 1 : 0
) if ( $shutters->getDown eq 'brightness' ); ) if ( $shutters->getDown eq 'brightness' );
@@ -2748,12 +2747,14 @@ sub IsDay($) {
. ' Sunset: ' . ' Sunset: '
. $shutters->getSunset ); . $shutters->getSunset );
##### Nach Sonnenauf / Morgens ##### Nach Sonnenauf / Morgens
$respIsDay = ( $respIsDay = (
( (
( $shutters->getBrightness > $brightnessMaxVal (
and not $isday $shutters->getBrightness > $brightnessMaxVal
and not $shutters->getSunrise ) and not $isday
and not $shutters->getSunrise
)
or $respIsDay or $respIsDay
or $shutters->getSunrise or $shutters->getSunrise
) ? 1 : 0 ) ? 1 : 0