Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

update load estimation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5278 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-22 08:20:27 +00:00
parent 86629a86e6
commit 398e4fbfa9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fhem/FHEM/00_HMLAN.pm
View File

@ -309,11 +309,11 @@ sub HMLAN_UpdtMsgLoad($$) {####################################################
my @tl; my @tl;
$hCap->{sum} = 0; $hCap->{sum} = 0;
for (($t-$HMmlSlice+1)..$t){# we have 6 slices for (($t-$HMmlSlice+1)..$t){# we have 6 slices
push @tl,int($hCap->{$_%$HMmlSlice}/16.8); push @tl,int($hCap->{$_%$HMmlSlice}/450);
$hCap->{sum} += $hCap->{$_%$HMmlSlice}; # need to recalc incase a slice was removed $hCap->{sum} += $hCap->{$_%$HMmlSlice}; # need to recalc incase a slice was removed
} }
$hash->{msgLoadEst} = "1hour:".int($hCap->{sum}/16.8)."% " $hash->{msgLoadEst} = "1hour:".int($hCap->{sum}/450)."% "
.(60/$HMmlSlice)."min steps: ".join("/",reverse @tl); .(60/$HMmlSlice)."min steps: ".join("/",reverse @tl);
#testing only ." :".$hCap->{sum} #testing only ." :".$hCap->{sum}
return; return;
@ -491,6 +491,7 @@ sub HMLAN_Parse($$) {##########################################################
# max speed for devices is 100ms after receive - example:TC # max speed for devices is 100ms after receive - example:TC
my ($mNo,$flg,$type,$src,$dst,$p) = unpack('A2A2A2A6A6A*',$mFld[5]); my ($mNo,$flg,$type,$src,$dst,$p) = unpack('A2A2A2A6A6A*',$mFld[5]);
my $mLen = length($mFld[5])/2;
my $CULinfo = ""; my $CULinfo = "";
Log3 $hash, HMLAN_getVerbLvl ($hash,$src,$dst,"5") Log3 $hash, HMLAN_getVerbLvl ($hash,$src,$dst,"5")
@ -543,8 +544,8 @@ sub HMLAN_Parse($$) {##########################################################
if ($stat & 0x03 && $dst eq $attr{$name}{hmId}){HMLAN_qResp($hash,$src,0);} if ($stat & 0x03 && $dst eq $attr{$name}{hmId}){HMLAN_qResp($hash,$src,0);}
elsif ($stat & 0x08 && $src eq $attr{$name}{hmId}){HMLAN_qResp($hash,$dst,0);} elsif ($stat & 0x08 && $src eq $attr{$name}{hmId}){HMLAN_qResp($hash,$dst,0);}
HMLAN_UpdtMsgLoad($name,((hex($flg)&0x10)?34 #burst=17units *2 HMLAN_UpdtMsgLoad($name,((hex($flg)&0x10)?($mLen*2+880) #burst=17units *2
:2)) #ACK=1 unit *2 :($mLen*2+22))) #ACK=1 unit *2
if (($stat & 0x48) == 8);# reject - but not from repeater if (($stat & 0x48) == 8);# reject - but not from repeater
$hash->{helper}{$dst}{flg} = 0;#got response => unblock sending $hash->{helper}{$dst}{flg} = 0;#got response => unblock sending
@ -564,7 +565,7 @@ sub HMLAN_Parse($$) {##########################################################
} }
} }
else{ else{
HMLAN_UpdtMsgLoad($name,1) HMLAN_UpdtMsgLoad($name,(21))
if ( $letter eq "E" if ( $letter eq "E"
&& (hex($flg)&0x60) == 0x20 # ack but not from repeater && (hex($flg)&0x60) == 0x20 # ack but not from repeater
&& $dst eq $attr{$name}{hmId}); && $dst eq $attr{$name}{hmId});
@ -628,7 +629,7 @@ sub HMLAN_Parse($$) {##########################################################
# prepare dispatch----------- # prepare dispatch-----------
# HM format A<len><msg>:<info>:<RSSI>:<IOname> Info is not used anymore # HM format A<len><msg>:<info>:<RSSI>:<IOname> Info is not used anymore
my $dmsg = sprintf("A%02X%s:$CULinfo:$rssi:$name", my $dmsg = sprintf("A%02X%s:$CULinfo:$rssi:$name",
length($mFld[5])/2, uc($mFld[5])); $mLen, uc($mFld[5]));
my %addvals = (RAWMSG => $rmsg, RSSI => hex($mFld[4])-65536); my %addvals = (RAWMSG => $rmsg, RSSI => hex($mFld[4])-65536);
Dispatch($hash, $dmsg, \%addvals); Dispatch($hash, $dmsg, \%addvals);
} }
@ -737,7 +738,7 @@ sub HMLAN_SimpleWrite(@) {#####################################################
.' ' .$dst .' ' .$dst
.' ' .$p; .' ' .$p;
HMLAN_UpdtMsgLoad($name,(hex($flg)&0x10)?17:1);#burst counts HMLAN_UpdtMsgLoad($name,length($p)/2+20 +(hex($flg)&0x10)?440:0);#burst counts
} }
else{ else{
Log3 $hash, ($hash->{helper}{log}{sys}?0:5), 'HMLAN_Send: '.$name.' I:'.$msg; Log3 $hash, ($hash->{helper}{log}{sys}?0:5), 'HMLAN_Send: '.$name.' I:'.$msg;