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

fix Bug additional Timer

Browse Source
This commit is contained in:
Marko Oldenburg
2018-09-06 11:51:08 +02:00
parent 5e7d2da4e8
commit b2a4ae0a08
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
73_AutoShuttersControl.pm
View File

@@ -42,7 +42,7 @@ use warnings;
my $version = "0.1.12_HotFix"; my $version = "0.1.16";
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
@@ -317,7 +317,7 @@ sub Notify($$) {
unless( scalar(@{$hash->{helper}{shuttersList}} ) == 0 ) { unless( scalar(@{$hash->{helper}{shuttersList}} ) == 0 ) {
WriteReadingsShuttersList($hash); WriteReadingsShuttersList($hash);
UserAttributs_Readings_ForShutters($hash,'add'); UserAttributs_Readings_ForShutters($hash,'add');
InternalTimer(gettimeofday() + 5,'AutoShuttersControl::RenewSunRiseSetShuttersTimer',$hash); InternalTimer(gettimeofday() + 3,'AutoShuttersControl::RenewSunRiseSetShuttersTimer',$hash);
} }
} elsif( grep /^partyMode:.off$/,@{$events} ) { } elsif( grep /^partyMode:.off$/,@{$events} ) {
@@ -676,18 +676,19 @@ sub CreateSunRiseSetShuttersTimer($$) {
return if( IsDisabled($name) ); return if( IsDisabled($name) );
my $shuttersSunriseUnixtime; my $shuttersSunriseUnixtime = ShuttersSunrise($hash,$shuttersDev,'unix');
my $shuttersSunsetUnixtime; my $shuttersSunsetUnixtime = ShuttersSunset($hash,$shuttersDev,'unix');
my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0); my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0);
# if( defined($oldFuncHash) and ref($oldFuncHash) eq 'HASH') { if( defined($oldFuncHash) and ref($oldFuncHash) eq 'HASH') {
# $shuttersSunriseUnixtime = (ShuttersSunrise($hash,$shuttersDev,'unix') > $oldFuncHash->{sunrisetime} + 3600 or ShuttersSunrise($hash,$shuttersDev,'unix') == $oldFuncHash->{sunrisetime} ? ShuttersSunrise($hash,$shuttersDev,'unix') : ShuttersSunrise($hash,$shuttersDev,'unix') + 86400 );
# $shuttersSunsetUnixtime = (ShuttersSunset($hash,$shuttersDev,'unix') > $oldFuncHash->{sunsettime} + 3600 or ShuttersSunset($hash,$shuttersDev,'unix') == $oldFuncHash->{sunsettime} ? ShuttersSunset($hash,$shuttersDev,'unix') : ShuttersSunset($hash,$shuttersDev,'unix') + 86400 ); $shuttersSunriseUnixtime = ($shuttersSunriseUnixtime + 86400)
# unless($shuttersSunriseUnixtime > ($oldFuncHash->{sunrisetime} + 3600) or $shuttersSunriseUnixtime == $oldFuncHash->{sunrisetime});
# } else {
$shuttersSunriseUnixtime = ShuttersSunrise($hash,$shuttersDev,'unix'); $shuttersSunsetUnixtime = ($shuttersSunsetUnixtime + 86400)
$shuttersSunsetUnixtime = ShuttersSunset($hash,$shuttersDev,'unix'); unless($shuttersSunsetUnixtime > ($oldFuncHash->{sunsettime} + 3600) or ShuttersSunset($hash,$shuttersDev,'unix') == $oldFuncHash->{sunsettime});
# } }
Log3 $name, 2, "AutoShuttersControl ($name) - CreateSunRiseSetShuttersTimer, neuer Sunset: $shuttersSunsetUnixtime neuer Sunrise: $shuttersSunriseUnixtime"; Log3 $name, 2, "AutoShuttersControl ($name) - CreateSunRiseSetShuttersTimer, neuer Sunset: $shuttersSunsetUnixtime neuer Sunrise: $shuttersSunriseUnixtime";