From b89605d4388aead00d6df0ad898ff4e4786e2ac5 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Sat, 31 Jan 2015 12:50:35 +0000 Subject: [PATCH] updated: 55_GDS: changed GDS_Undef contrib/55_InfoPanel: changed btIP_Undef git-svn-id: https://svn.fhem.de/fhem/trunk@7794 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_GDS.pm | 9 +-------- fhem/contrib/InfoPanel/55_InfoPanel.pm | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm index fb5f285d7..9b68dae47 100644 --- a/fhem/FHEM/55_GDS.pm +++ b/fhem/FHEM/55_GDS.pm @@ -131,15 +131,8 @@ sub GDS_Undef($$) { my ($hash, $arg) = @_; my $name = $hash->{NAME}; RemoveInternalTimer($hash); - # check if last gds device my $url = '/gds'; - my $gdsPresent = 0; - foreach my $def (sort keys %defs) { - $gdsPresent += 1 if($defs{$def}{TYPE} eq "GDS"); - last if $gdsPresent == 2; - } - # if last gds device, remove FWEXT - $data{FWEXT}{$url} = undef if $gdsPresent == 1; + $data{FWEXT}{$url} = undef if int(devspec2array('TYPE=GDS')) == 1; return undef; } diff --git a/fhem/contrib/InfoPanel/55_InfoPanel.pm b/fhem/contrib/InfoPanel/55_InfoPanel.pm index 5705fb490..d96d66dcf 100644 --- a/fhem/contrib/InfoPanel/55_InfoPanel.pm +++ b/fhem/contrib/InfoPanel/55_InfoPanel.pm @@ -78,6 +78,7 @@ sub btIP_getURL; sub InfoPanel_Initialize($) { my ($hash) = @_; $hash->{DefFn} = "btIP_Define"; + $hash->{UndefFn} = "btIP_Undef"; #$hash->{AttrFn} = "btIP_Attr"; $hash->{AttrList} = "autoreload:1,0 bg bgcolor refresh size title tmin"; $hash->{SetFn} = "btIP_Set"; @@ -108,6 +109,14 @@ sub btIP_Define($$) { return undef; } +sub btIP_Undef($$) { + my ($hash, $arg) = @_; + # check if last device + my $url = '/btip'; + $data{FWEXT}{$url} = undef if int(devspec2array('TYPE=InfoPanel')) == 1; + return undef; +} + sub btIP_Set { my ($hash, @a) = @_;