FHEM/mod-NUKI
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

Timerfunktion wieder aktiviert

Browse Source
This commit is contained in:
Marko Oldenburg 2016-11-13 10:44:02 +01:00
parent e07c4bb561
commit 135d1dc99a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
73_NUKIBridge.pm
View File

@ -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,

20
74_NUKIDevice.pm
View File

@ -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($@) {