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

automatisches löschen der Bridge nach letzter Device Instanz löschung, Code Bereinigung

Browse Source
This commit is contained in:
Marko Oldenburg 2015-11-25 21:52:40 +01:00
parent 72afe0656f
commit 4b9457bab3
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
74_AMAD.pm
View File

@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
my $version = "0.9.6"; my $version = "0.9.7";
@ -110,7 +110,7 @@ sub AMAD_Define($$) {
InternalTimer( gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 0 ) if( $hash->{HOST} ); InternalTimer( gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 0 ) if( $hash->{HOST} );
$modules{AMAD}{defptr}{$hash->{HOST}} = $hash; $modules{AMAD}{defptr}{$hash->{HOST}} = $hash;
return undef; return undef;
} }
} }
@ -121,8 +121,8 @@ sub AMAD_Undef($$) {
if( $hash->{BRIDGE} ) { if( $hash->{BRIDGE} ) {
delete $modules{AMAD}{defptr}{BRIDGE}; delete $modules{AMAD}{defptr}{BRIDGE};
my $ret = TcpServer_Close( $hash ); TcpServer_Close( $hash );
} else { } else {
delete $modules{AMAD}{defptr}{$hash->{HOST}}; delete $modules{AMAD}{defptr}{$hash->{HOST}};
RemoveInternalTimer( $hash ); RemoveInternalTimer( $hash );
@ -130,11 +130,10 @@ sub AMAD_Undef($$) {
foreach my $d(sort keys %{$modules{AMAD}{defptr}}) { foreach my $d(sort keys %{$modules{AMAD}{defptr}}) {
my $hash = $modules{AMAD}{defptr}{$d}; my $hash = $modules{AMAD}{defptr}{$d};
my $host = $hash->{HOST}; my $host = $hash->{HOST};
if( $host ) { return if( $host );
my $name = $hash->{NAME}; my $name = $hash->{NAME};
CommandDelete( undef, $name ) if( $hash->{BRIDGE} ); CommandDelete( undef, $name );
}
} }
} }
} }
@ -1013,11 +1012,11 @@ sub AMAD_CommBridge_Read($) {
if( $fhemcmd =~ /^{.*}$/ ) { if( $fhemcmd =~ /^{.*}$/ ) {
response = $fhemCmd if( ReadingsVal( $bname, "expertMode", 0 ) eq "1" ); $response = $fhemCmd if( ReadingsVal( $bname, "expertMode", 0 ) eq "1" );
} else { } else {
response = "header lines: \r\n AMADCommBridge receive no typical FHEM function\r\n FHEM to do nothing\r\n"; $response = "header lines: \r\n AMADCommBridge receive no typical FHEM function\r\n FHEM to do nothing\r\n";
} }
$c = $hash->{CD}; $c = $hash->{CD};
@ -1508,4 +1507,4 @@ sub AMAD_Header2Hash($) {
</ul> </ul>
=end html_DE =end html_DE
=cut =cut