From ca0005c5a5babb0eb840cdb8ee851fecb199a80a Mon Sep 17 00:00:00 2001 From: martinp876 Date: Thu, 8 Aug 2013 15:26:09 +0000 Subject: [PATCH] add lastRain timestamp git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3620 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 15 +++++++++------ fhem/FHEM/98_HMinfo.pm | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index aa6ed5e0f..b663cc5fd 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -898,11 +898,15 @@ sub CUL_HM_Parse($$) {############################## $val = hex($val)/2; } push @event, "state:$val"; - if ($val eq "dry"){ - CUL_HM_UpdtReadSingle($shash,'lastRain', - ReadingsTimestamp($shash,'state',""),0) - if (ReadingsVal($shash,'state',"") eq "rain"); - } + + if ($val eq "rain"){#--- handle lastRain--- + $shash->{helper}{lastRain} = $tn; + } + elsif ($val eq "dry" && $shash->{helper}{lastRain}){ + CUL_HM_UpdtReadSingle($shash,'lastRain',$shash->{helper}{lastRain},0); + delete $shash->{helper}{lastRain}; + } + CUL_HM_UpdtReadSingle($shash,'.level',#store level invisible ($val eq "off"?"0 %":"100 %"),0); @@ -986,7 +990,6 @@ sub CUL_HM_Parse($$) {############################## push @event,"deviceMsg:$vs$target" if($chn ne "00"); push @event,"state:".(($physLvl ne $val." %")?"chn:$vs phys:$physLvl": $vs); - my $eventName = "unknown"; # different names for events $eventName = "switch" if($st eq "switch"); $eventName = "motor" if($st eq "blindActuator"); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index d2fb8f44f..62d4ffebf 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -201,7 +201,7 @@ sub HMinfo_SetFn($$) {######################################################### $filter = shift @a; } - if ($cmd eq "?" ) {##actionImmediate: clear parameter-------------- + if (!$cmd ||$cmd eq "?" ) {##actionImmediate: clear parameter-------------- return "autoReadReg clear configCheck param peerCheck peerXref protoEvents models regCheck register rssi saveConfig update"; } elsif($cmd eq "clear" ) {##actionImmediate: clear parameter--------------