From a74d53ec309e85d296318b8e50652a80da3bffb0 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sun, 21 Jun 2015 17:10:29 +0000 Subject: [PATCH] 00_HMLAN: convert to real load display git-svn-id: https://svn.fhem.de/fhem/trunk@8795 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMLAN.pm | 6 +++--- fhem/FHEM/10_CUL_HM.pm | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm index 665937e71..3db2e773b 100755 --- a/fhem/FHEM/00_HMLAN.pm +++ b/fhem/FHEM/00_HMLAN.pm @@ -300,11 +300,11 @@ sub HMLAN_UpdtMsgLoad($$) {#################################################### if ($hash->{helper}{q}{loadLast} != $t){ $hash->{helper}{q}{loadLast} = $t; - my (undef,@a) = split("/",$hash->{msgLoadHistory}); - @a = ($hash->{msgLoadCurrent},@a); + my (undef,@a) = split(": ",$hash->{msgLoadHistory}); + @a = ($hash->{msgLoadCurrent},split("/",$a[0])); $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 # one a while if (ReadingsVal($name,"cond","") =~ m /(Warning-HighLoad|ERROR-Overload)/){ diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 9c37aefb5..fbe76321f 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -7433,7 +7433,7 @@ sub CUL_HM_UpdtCentralState($){ $state .= "$ioN:$cnd,"; } else{ # handling CUL - my $st = InternalVal($ioN,"STATE","unknown"); + my $st = ReadingsVal($ioN,"state","unknown"); $state .= "$ioN:".($st ne "Initialized"?$st:"ok").","; } if (AttrVal($ioN,"hmId","") ne $defs{$name}{DEF}){ @@ -7442,7 +7442,7 @@ sub CUL_HM_UpdtCentralState($){ } }; $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 # assign IO device