From 135d1dc99a3cf0710b11de951a94072a50e50a3f Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Sun, 13 Nov 2016 10:44:02 +0100 Subject: [PATCH] Timerfunktion wieder aktiviert --- 73_NUKIBridge.pm | 20 ++++++++++---------- 74_NUKIDevice.pm | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/73_NUKIBridge.pm b/73_NUKIBridge.pm index 6cb16cc..86f2279 100644 --- a/73_NUKIBridge.pm +++ b/73_NUKIBridge.pm @@ -46,7 +46,7 @@ use JSON; use HttpUtils; -my $version = "0.3.11"; +my $version = "0.3.15"; @@ -128,11 +128,11 @@ sub NUKIBridge_Define($$) { RemoveInternalTimer($hash); - #if( $init_done ) { - # NUKIBridge_firstRun($hash) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); - #} else { - # InternalTimer( gettimeofday()+15, "NUKIBridge_firstRun", $hash, 0 ) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); - #} + if( $init_done ) { + NUKIBridge_firstRun($hash) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); + } else { + InternalTimer( gettimeofday()+15, "NUKIBridge_firstRun", $hash, 0 ) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); + } $modules{NUKIBridge}{defptr}{$hash->{HOST}} = $hash; @@ -324,7 +324,7 @@ sub NUKIBridge_firstRun($) { RemoveInternalTimer($hash); NUKIBridge_Call($hash,$hash,"list",undef,undef) if( !IsDisabled($name) ); - #InternalTimer( gettimeofday()+3, "NUKIBridge_GetCheckBridgeAlive", $hash, 1 ); + InternalTimer( gettimeofday()+3, "NUKIBridge_GetCheckBridgeAlive", $hash, 0 ); Log3 $name, 4, "NUKIBridge ($name) - Call NUKIBridge_Get" if( !IsDisabled($name) ); @@ -342,8 +342,8 @@ sub NUKIBridge_GetCheckBridgeAlive($) { NUKIBridge_Call($hash,$hash,"info",undef,undef); - #InternalTimer( gettimeofday()+$hash->{INTERVAL}, "NUKIBridge_GetCheckBridgeAlive", $hash, 1 ); - #Log3 $name, 4, "NUKIBridge ($name) - Call InternalTimer for NUKIBridge_GetCheckBridgeAlive"; + InternalTimer( gettimeofday()+$hash->{INTERVAL}, "NUKIBridge_GetCheckBridgeAlive", $hash, 1 ); + Log3 $name, 4, "NUKIBridge ($name) - Call InternalTimer for NUKIBridge_GetCheckBridgeAlive"; } return 1; @@ -370,7 +370,7 @@ sub NUKIBridge_Call($$$$$) { HttpUtils_NonblockingGet( { url => $uri, - timeout => 10, + timeout => 15, hash => $hash, chash => $chash, endpoint => $path, diff --git a/74_NUKIDevice.pm b/74_NUKIDevice.pm index 4a49364..5aa0dd7 100644 --- a/74_NUKIDevice.pm +++ b/74_NUKIDevice.pm @@ -33,7 +33,7 @@ use warnings; use JSON; #use Time::HiRes qw(gettimeofday); -my $version = "0.3.11"; +my $version = "0.3.15"; @@ -120,11 +120,11 @@ sub NUKIDevice_Define($$) { RemoveInternalTimer($hash); - #if( $init_done ) { - # NUKIDevice_GetUpdateInternalTimer($hash); - #} else { - # InternalTimer(gettimeofday()+20, "NUKIDevice_GetUpdateInternalTimer", $hash, 0); - #} + if( $init_done ) { + NUKIDevice_GetUpdateInternalTimer($hash); + } else { + InternalTimer(gettimeofday()+20, "NUKIDevice_GetUpdateInternalTimer", $hash, 0); + } return undef; } @@ -253,12 +253,12 @@ sub NUKIDevice_GetUpdateInternalTimer($) { my $name = $hash->{NAME}; - #NUKIDevice_GetUpdate($hash); - #Log3 $name, 5, "NUKIDevice ($name) - Call NUKIDevice_GetUpdate"; + NUKIDevice_GetUpdate($hash); + Log3 $name, 5, "NUKIDevice ($name) - Call NUKIDevice_GetUpdate"; RemoveInternalTimer($hash); - #InternalTimer(gettimeofday()+$hash->{INTERVAL}, "NUKIDevice_GetUpdateInternalTimer", $hash, 0) if( $hash->{INTERVAL} ); - #Log3 $name, 5, "NUKIDevice ($name) - Call InternalTimer"; + InternalTimer(gettimeofday()+$hash->{INTERVAL}, "NUKIDevice_GetUpdateInternalTimer", $hash, 1) if( $hash->{INTERVAL} ); + Log3 $name, 5, "NUKIDevice ($name) - Call InternalTimer"; } sub NUKIDevice_ReadFromNUKIBridge($@) {