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

add lockState Timer support

Browse Source
This commit is contained in:
Marko Oldenburg
2017-01-09 21:30:12 +01:00
parent 4cce22bd05
commit 27d426de73
2 changed files with 81 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
73_NUKIBridge.pm
View File

@@ -46,7 +46,7 @@ use JSON;
use HttpUtils; use HttpUtils;
my $version = "0.4.4"; my $version = "0.4.5patch1";
@@ -113,6 +113,7 @@ sub NUKIBridge_Define($$) {
$hash->{TOKEN} = $token; $hash->{TOKEN} = $token;
$hash->{VERSION} = $version; $hash->{VERSION} = $version;
$hash->{helper}{aliveCount} = 0; $hash->{helper}{aliveCount} = 0;
$hash->{helper}{checkLockState} = 0;
@@ -126,7 +127,7 @@ sub NUKIBridge_Define($$) {
if( $init_done ) { if( $init_done ) {
NUKIBridge_firstRun($hash) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); NUKIBridge_firstRun($hash) if( ($hash->{HOST}) and ($hash->{TOKEN}) );
} else { } else {
InternalTimer( gettimeofday()+15, "NUKIBridge_firstRun", $hash, 0 ) if( ($hash->{HOST}) and ($hash->{TOKEN}) ); InternalTimer( gettimeofday()+15, 'NUKIBridge_firstRun', $hash, 0 ) if( ($hash->{HOST}) and ($hash->{TOKEN}) );
} }
$modules{NUKIBridge}{defptr}{$hash->{HOST}} = $hash; $modules{NUKIBridge}{defptr}{$hash->{HOST}} = $hash;
@@ -164,7 +165,8 @@ sub NUKIBridge_Attr(@) {
elsif( $cmd eq "del" ) { elsif( $cmd eq "del" ) {
readingsSingleUpdate ( $hash, "state", "active", 1 ); readingsSingleUpdate ( $hash, "state", "active", 1 );
NUKIBridge_GetCheckBridgeAlive($hash); InternalTimer( gettimeofday()+5, 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
InternalTimer( gettimeofday()+10, 'NUKIBridge_LockStateTimer', $hash, 1 );
Log3 $name, 3, "NUKIBridge ($name) - enabled"; Log3 $name, 3, "NUKIBridge ($name) - enabled";
} }
} }
@@ -177,7 +179,8 @@ sub NUKIBridge_Attr(@) {
elsif( $cmd eq "del" ) { elsif( $cmd eq "del" ) {
readingsSingleUpdate ( $hash, "state", "active", 1 ); readingsSingleUpdate ( $hash, "state", "active", 1 );
NUKIBridge_GetCheckBridgeAlive($hash); InternalTimer( gettimeofday()+5, 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
InternalTimer( gettimeofday()+10, 'NUKIBridge_LockStateTimer', $hash, 1 );
Log3 $name, 3, "NUKIBridge ($name) - delete disabledForIntervals"; Log3 $name, 3, "NUKIBridge ($name) - delete disabledForIntervals";
} }
} }
@@ -272,14 +275,14 @@ sub NUKIBridge_GetCheckBridgeAlive($) {
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
RemoveInternalTimer($hash); RemoveInternalTimer($hash,'NUKIBridge_GetCheckBridgeAlive');
Log3 $name, 4, "NUKIBridge ($name) - NUKIBridge_GetCheckBridgeAlive"; Log3 $name, 4, "NUKIBridge ($name) - NUKIBridge_GetCheckBridgeAlive";
if( !IsDisabled($name) ) { if( !IsDisabled($name) ) {
NUKIBridge_Call($hash,$hash,"info",undef,undef); NUKIBridge_Call($hash,$hash,'info',undef,undef);
InternalTimer( gettimeofday()+15+int(rand(15)), "NUKIBridge_GetCheckBridgeAlive", $hash, 1 ); InternalTimer( gettimeofday()+15+int(rand(15)), 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
Log3 $name, 4, "NUKIBridge ($name) - Call InternalTimer for NUKIBridge_GetCheckBridgeAlive"; Log3 $name, 4, "NUKIBridge ($name) - Call InternalTimer for NUKIBridge_GetCheckBridgeAlive";
} }
} }
@@ -290,9 +293,10 @@ sub NUKIBridge_firstRun($) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
RemoveInternalTimer($hash); RemoveInternalTimer($hash,'NUKIBridge_firstRun');
NUKIBridge_Call($hash,$hash,"list",undef,undef) if( !IsDisabled($name) ); NUKIBridge_Call($hash,$hash,'list',undef,undef) if( !IsDisabled($name) );
NUKIBridge_GetCheckBridgeAlive($hash); InternalTimer( gettimeofday()+15, 'NUKIBridge_GetCheckBridgeAlive', $hash, 1 );
InternalTimer( gettimeofday()+60, 'NUKIBridge_LockStateTimer', $hash, 1 );
return undef; return undef;
} }
@@ -438,7 +442,14 @@ sub NUKIBridge_ResponseProcessing($$$) {
$decode_json = decode_json($json); $decode_json = decode_json($json);
if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" ) { if( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" and $hash->{helper}{checkLockState} == 1 ) {
NUKIBridge_LockStateResponse($hash,$json);
$hash->{helper}{checkLockState} = 0;
Log3 $name, 5, "NUKIBridge ($name) - Run NUKIBridge_LockStateResponse with Path:$path and JSON-Data: $json";
}
elsif( ref($decode_json) eq "ARRAY" and scalar(@{$decode_json}) > 0 and $path eq "list" and $hash->{helper}{checkLockState} == 0 ) {
NUKIBridge_Autocreate($hash,$decode_json); NUKIBridge_Autocreate($hash,$decode_json);
NUKIBridge_Call($hash,$hash,"info",undef,undef) if( !IsDisabled($name) ); NUKIBridge_Call($hash,$hash,"info",undef,undef) if( !IsDisabled($name) );
@@ -455,7 +466,7 @@ sub NUKIBridge_ResponseProcessing($$$) {
NUKIBridge_InfoProcessing($hash,$decode_json); NUKIBridge_InfoProcessing($hash,$decode_json);
} else { } else {
Log3 $name, 5, "NUKIDevice ($name) - Rückgabe Path nicht korrekt: $json"; Log3 $name, 5, "NUKIBridge ($name) - Rückgabe Path nicht korrekt: $json";
return; return;
} }
@@ -686,6 +697,62 @@ sub NUKIBridge_CallBlocking($$$) {
return ($decode_json); return ($decode_json);
} }
sub NUKIBridge_LockStateTimer($) {
my ($hash) = @_;
my $name = $hash->{NAME};
RemoveInternalTimer($hash,'NUKIBridge_LockStateTimer');
Log3 $name, 4, "NUKIBridge ($name) - NUKIBridge_LockStateTimer";
if( !IsDisabled($name) and ReadingsVal($name,'bridgeType','Hardware') eq 'Software' ) {
if( ReadingsVal($name,'smartlockCount',0) > 0 and $hash->{helper}{checkLockState} == 0 ) {
NUKIBridge_Call($hash,$hash,'list',undef,undef) if( ReadingsVal($name,'state','not connected') eq "connected" );
$hash->{helper}{checkLockState} = 1 ;
}
InternalTimer( gettimeofday()+7, 'NUKIBridge_LockStateTimer', $hash, 1 );
Log3 $name, 4, "NUKIBridge ($name) - Call InternalTimer for NUKIBridge_LockStateTimer";
}
}
sub NUKIBridge_LockStateResponse($$) {
my ($hash,$json) = @_;
my $name = $hash->{NAME};
my $nukiId;
my $nukiSmartlock;
my $decode_json;
my %response_hash;
my $dname;
my $dhash;
$decode_json = decode_json($json);
foreach $nukiSmartlock (@{$decode_json}) {
if( ref($nukiSmartlock->{lastKnownState}) eq "HASH" ) {
if ( defined( $modules{NUKIDevice}{defptr} ) ) {
while ( my ( $key, $value ) = each %{ $modules{NUKIDevice}{defptr} } ) {
$dhash = $modules{NUKIDevice}{defptr}{$key};
$dname = $dhash->{NAME};
$nukiId = InternalVal( $dname, "NUKIID", undef );
next if ( !$nukiId or $nukiId ne $nukiSmartlock->{nukiId} );
Log3 $name, 4, "NUKIDevice ($dname) - Received LockState for matching NukiID $nukiId at device $dname";
%response_hash = ('state'=>$nukiSmartlock->{lastKnownState}{state}, 'stateName'=>$nukiSmartlock->{lastKnownState}{stateName},'batteryCritical'=>$nukiSmartlock->{lastKnownState}{batteryCritical},'timestamp'=>$nukiSmartlock->{lastKnownState}{timestamp});
NUKIDevice_Parse($dhash,encode_json \%response_hash);
}
}
}
}
}

4
74_NUKIDevice.pm
View File

@@ -33,7 +33,7 @@ use warnings;
use JSON; use JSON;
#use Time::HiRes qw(gettimeofday); #use Time::HiRes qw(gettimeofday);
my $version = "0.4.4"; my $version = "0.4.5patch1";
@@ -356,7 +356,7 @@ sub NUKIDevice_Parse($$) {
my($hash,$result) = @_; my($hash,$result) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
Log3 $name, 5, "NUKIDevice ($name) - Parse with result: $result";
######################################### #########################################
####### Errorhandling ############# ####### Errorhandling #############