From 61717cbdb355b885d0fa5be4c1cee8693f5d3e50 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Mon, 24 Feb 2014 19:34:29 +0000 Subject: [PATCH] improve rssi display git-svn-id: https://svn.fhem.de/fhem/trunk@5042 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 9 ++++++--- fhem/FHEM/98_HMinfo.pm | 9 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 6c7fc1086..40f31367a 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1861,8 +1861,8 @@ sub CUL_HM_Parse($$) {######################################################### CUL_HM_ProcessCmdStack($shash) if ($respRemoved); # cont if complete #------------ process events ------------------ push @event, "noReceiver:src:$src ".$mFlg.$mTp." $p" if(!@event && !@entities); - CUL_HM_UpdtReadBulk($shash,1,@event); #events to the channel - + + push @evtEt,[$shash,1,$_] foreach (@event); push @entities,CUL_HM_pushEvnts(); @entities = CUL_HM_noDup(@entities,$shash->{NAME}); @@ -3321,7 +3321,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ } if($mode eq "manu"){ my $t = $a[2] ne "manu"?$a[2]:ReadingsVal($name,"desired-temp",18); - Log 1,"General t:$t a:$a[2]"; return "temperatur for manu 4.5 to 30.5 C" if ($t < 4.5 || $t > 30.5); $temp = $t*2; @@ -5685,6 +5684,10 @@ sub CUL_HM_noDupInString($) {#return string with no duplicates, comma separated sub CUL_HM_storeRssi(@){ my ($name,$peerName,$val) = @_; return if (!$val); + if (AttrVal($peerName,"subType","") eq "virtual"){ + my $h = InternalVal($peerName,"IODev",""); + $peerName = $h->{NAME}; + } $defs{$name}{helper}{rssi}{$peerName}{lst} = $val; my $rssiP = $defs{$name}{helper}{rssi}{$peerName}; $rssiP->{min} = $val if (!$rssiP->{min} || $rssiP->{min} > $val); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 27e0b8e33..2cce87002 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -662,6 +662,10 @@ sub HMinfo_GetFn($@) {######################################################### $dispName = $1; $dispDest = (($dest =~ m/^to_rpt_/)?"rep_":"").$dName; } + if (AttrVal($dName,"subType","") eq "virtual"){ + my $h = InternalVal($dName,"IODev",""); + $dispDest .= "/$h->{NAME}"; + } push @rssiList,sprintf("%-15s:%-15s %-15s %6.1f %6.1f %6.1f<%6.1f %5s" ,$dName,$dispName,$dispDest ,$defs{$dName}{helper}{rssi}{$dest}{lst} @@ -890,9 +894,10 @@ sub HMinfo_GetFn($@) {######################################################### else{ my @cmdLst = ( "help" - ,"configCheck","param","peerCheck","peerXref" + ,"configCheck","param","peerCheck","peerXref" ,"protoEvents","msgStat","rssi" ,"models" + ,"clear" ,"regCheck","register" ,"templateList","templateChk" ); @@ -1013,7 +1018,7 @@ sub HMinfo_SetFn($@) {######################################################### else{ my @cmdLst = ( "autoReadReg","clear" - ,"archConfig:-0,-a","saveConfig","loadConfig","purgeConfig","update" + ,"archConfig:-0,-a","saveConfig","loadConfig","purgeConfig","update" ,"cpRegs" ,"tempList tempListTmpl" ,"templateDef","templateSet");