FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 01:46:08 +00:00
Code Issues Releases Wiki Activity

improve rssi display

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5042 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-02-24 19:34:29 +00:00
parent adaf62819c
commit 61717cbdb3
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_CUL_HM.pm
View File

@ -1861,8 +1861,8 @@ sub CUL_HM_Parse($$) {#########################################################
CUL_HM_ProcessCmdStack($shash) if ($respRemoved); # cont if complete CUL_HM_ProcessCmdStack($shash) if ($respRemoved); # cont if complete
#------------ process events ------------------ #------------ process events ------------------
push @event, "noReceiver:src:$src ".$mFlg.$mTp." $p" if(!@event && !@entities); 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(); push @entities,CUL_HM_pushEvnts();
@entities = CUL_HM_noDup(@entities,$shash->{NAME}); @entities = CUL_HM_noDup(@entities,$shash->{NAME});
@ -3321,7 +3321,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
} }
if($mode eq "manu"){ if($mode eq "manu"){
my $t = $a[2] ne "manu"?$a[2]:ReadingsVal($name,"desired-temp",18); 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" return "temperatur for manu 4.5 to 30.5 C"
if ($t < 4.5 || $t > 30.5); if ($t < 4.5 || $t > 30.5);
$temp = $t*2; $temp = $t*2;
@ -5685,6 +5684,10 @@ sub CUL_HM_noDupInString($) {#return string with no duplicates, comma separated
sub CUL_HM_storeRssi(@){ sub CUL_HM_storeRssi(@){
my ($name,$peerName,$val) = @_; my ($name,$peerName,$val) = @_;
return if (!$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; $defs{$name}{helper}{rssi}{$peerName}{lst} = $val;
my $rssiP = $defs{$name}{helper}{rssi}{$peerName}; my $rssiP = $defs{$name}{helper}{rssi}{$peerName};
$rssiP->{min} = $val if (!$rssiP->{min} || $rssiP->{min} > $val); $rssiP->{min} = $val if (!$rssiP->{min} || $rssiP->{min} > $val);

9
fhem/FHEM/98_HMinfo.pm
View File

@ -662,6 +662,10 @@ sub HMinfo_GetFn($@) {#########################################################
$dispName = $1; $dispName = $1;
$dispDest = (($dest =~ m/^to_rpt_/)?"rep_":"").$dName; $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" push @rssiList,sprintf("%-15s:%-15s %-15s %6.1f %6.1f %6.1f<%6.1f %5s"
,$dName,$dispName,$dispDest ,$dName,$dispName,$dispDest
,$defs{$dName}{helper}{rssi}{$dest}{lst} ,$defs{$dName}{helper}{rssi}{$dest}{lst}
@ -890,9 +894,10 @@ sub HMinfo_GetFn($@) {#########################################################
else{ else{
my @cmdLst = my @cmdLst =
( "help" ( "help"
,"configCheck","param","peerCheck","peerXref" ,"configCheck","param","peerCheck","peerXref"
,"protoEvents","msgStat","rssi" ,"protoEvents","msgStat","rssi"
,"models" ,"models"
,"clear"
,"regCheck","register" ,"regCheck","register"
,"templateList","templateChk" ,"templateList","templateChk"
); );
@ -1013,7 +1018,7 @@ sub HMinfo_SetFn($@) {#########################################################
else{ else{
my @cmdLst = my @cmdLst =
( "autoReadReg","clear" ( "autoReadReg","clear"
,"archConfig:-0,-a","saveConfig","loadConfig","purgeConfig","update" ,"archConfig:-0,-a","saveConfig","loadConfig","purgeConfig","update"
,"cpRegs" ,"cpRegs"
,"tempList tempListTmpl" ,"tempList tempListTmpl"
,"templateDef","templateSet"); ,"templateDef","templateSet");