From 6d7f465141121f8235d1125f990ec99e2a08ae06 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Mon, 15 Jul 2013 17:35:17 +0000 Subject: [PATCH] informId patch from justme1968 git-svn-id: https://svn.fhem.de/fhem/trunk@3427 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_weblink.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/98_weblink.pm b/fhem/FHEM/98_weblink.pm index a35fc1d85..5d1645fae 100755 --- a/fhem/FHEM/98_weblink.pm +++ b/fhem/FHEM/98_weblink.pm @@ -186,6 +186,7 @@ weblink_FwFn($$$$) push @devices, [@device]; } else { foreach my $d (sort keys %defs) { + next if( IsIgnored($d) ); next if( $d !~ m/$device[0]/); push @devices, [$d,$device[1]]; } @@ -222,8 +223,8 @@ weblink_FwFn($$$$) $m = $mapping->{$name.".".$n} if( defined($mapping) && defined($mapping->{$name.".".$n}) ); $m =~ s/\$NAME/$name/g; $ret .= "
$m
";; - $ret .= "
$v
"; - $ret .= "
$t
" if( $show_time ); + $ret .= "
$v
"; + $ret .= "
$t
" if( $show_time ); } } } @@ -546,7 +547,7 @@ weblink_WriteGplot($) define MyPlot weblink fileplot <logdevice>:<gnuplot-file>:<logfile>
define MyPlot weblink dbplot <logdevice>:<gnuplot-file>
define systemCommands weblink cmdList pair:Pair:set+cul2+hmPairForSec+60 restart:Restart:shutdown+restart update:UpdateCheck:update+check
- define wl_SystemStatus weblink readings sysstat *nostate *notime {{ 'load' => 'Systemauslastung in %', 'temperature' => 'Systemtemperatur in &deg;;C'}}
+ define wl_SystemStatus weblink readings sysstat *nostate *notime {{ 'load' => 'Systemauslastung', 'temperature' => 'Systemtemperatur in &deg;;C'}}
define wlHeizung weblink readings t1:temperature t2:temperature t3:temperature *notime {{ 't1.temperature' => 'Vorlauf', 't2.temperature' => 'R&uuml;;cklauf', 't3.temperature' => 'Zirkulation'}}