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

00_HMLAN: convert to real load display

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8795 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2015-06-21 17:10:29 +00:00
parent 680ddf13e9
commit a74d53ec30
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/00_HMLAN.pm
View File

@ -300,11 +300,11 @@ sub HMLAN_UpdtMsgLoad($$) {####################################################
if ($hash->{helper}{q}{loadLast} != $t){ if ($hash->{helper}{q}{loadLast} != $t){
$hash->{helper}{q}{loadLast} = $t; $hash->{helper}{q}{loadLast} = $t;
my (undef,@a) = split("/",$hash->{msgLoadHistory}); my (undef,@a) = split(": ",$hash->{msgLoadHistory});
@a = ($hash->{msgLoadCurrent},@a); @a = ($hash->{msgLoadCurrent},split("/",$a[0]));
$hash->{msgLoadHistory} = (60/$HMmlSlice)."min steps: " $hash->{msgLoadHistory} = (60/$HMmlSlice)."min steps: "
.join("/",@a[0...$HMmlSlice-1]); .join("/",@a[0...($HMmlSlice-1)]);
# try to release high-load condition with a dummy message # try to release high-load condition with a dummy message
# one a while # one a while
if (ReadingsVal($name,"cond","") =~ m /(Warning-HighLoad|ERROR-Overload)/){ if (ReadingsVal($name,"cond","") =~ m /(Warning-HighLoad|ERROR-Overload)/){

4
fhem/FHEM/10_CUL_HM.pm
View File

@ -7433,7 +7433,7 @@ sub CUL_HM_UpdtCentralState($){
$state .= "$ioN:$cnd,"; $state .= "$ioN:$cnd,";
} }
else{ # handling CUL else{ # handling CUL
my $st = InternalVal($ioN,"STATE","unknown"); my $st = ReadingsVal($ioN,"state","unknown");
$state .= "$ioN:".($st ne "Initialized"?$st:"ok").","; $state .= "$ioN:".($st ne "Initialized"?$st:"ok").",";
} }
if (AttrVal($ioN,"hmId","") ne $defs{$name}{DEF}){ if (AttrVal($ioN,"hmId","") ne $defs{$name}{DEF}){
@ -7442,7 +7442,7 @@ sub CUL_HM_UpdtCentralState($){
} }
}; };
$state = "IOs_ok" if (!$state); $state = "IOs_ok" if (!$state);
$defs{$name}{STATE} = $state; CUL_HM_UpdtReadSingle($defs{$name},"state",$state,1);
} }
sub CUL_HM_assignIO($){ #check and assign IO sub CUL_HM_assignIO($){ #check and assign IO
# assign IO device # assign IO device