From a2344e93f573844ff3dacc1cce76cb511ada34d0 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Thu, 25 Jul 2013 14:04:46 +0000 Subject: [PATCH] bugfix git-svn-id: https://svn.fhem.de/fhem/trunk@3501 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 1 - fhem/FHEM/98_HMinfo.pm | 17 ++++------------- fhem/FHEM/HMConfig.pm | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 0bca61921..63266603f 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -181,7 +181,6 @@ sub CUL_HM_updateConfig($){ # it will also be called after each manual definition # Purpose is to parse attributes and read config foreach my $name (@{$modules{CUL_HM}{helper}{updtCfgLst}}){ - CUL_HM_Attr my $hash = $defs{$name}; my $id = $hash->{DEF}; my $chn = substr($id."00",6,2); diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 8cea78c4a..2692cdc52 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -730,7 +730,7 @@ my %tpl = ( ,BlJtOff =>"dlyOff" ,BlJtOn =>"dlyOff" ,BlJtRampOff =>"rampOff" - ,BlJtRampOn =>"rampOn" + ,BlJtRampOn =>"on" ,BlJtRefOff =>"rampOff" ,BlJtRefOn =>"on" }} @@ -752,17 +752,11 @@ my %tpl = ( ,BlJtOff =>"dlyOn" ,BlJtOn =>"dlyOn" ,BlJtRampOff =>"off" - ,BlJtRampOn =>"on" + ,BlJtRampOn =>"rampOn" ,BlJtRefOff =>"off" ,BlJtRefOn =>"rampOn" }} - ,BlStopUpSh => {p=>"" ,t=>"Blind: stop drive on - - - -reload 10_CUL_HM -reload 98_HMinfo - any key - for short drive up" + ,BlStopUpSh => {p=>"" ,t=>"Blind: stop drive on" ,reg=>{ ActionType =>"jmpToTarget" ,BlJtDlyOff =>"dlyOn" ,BlJtDlyOn =>"refOn" @@ -773,7 +767,6 @@ reload 98_HMinfo ,BlJtRefOff =>"off" ,BlJtRefOn =>"rampOn" }} - ); sub HMinfo_templateDef(@){##################################################### @@ -882,18 +875,16 @@ sub HMinfo_templateChk(@){##################################################### foreach my $pS (@pNames){ ($pName,$pTyp) = split(":",$pS); my $replPeer=""; - if($pName && (grep !/$pName/,ReadingsVal($aName,"peerList" ,undef))){ $replPeer=" no peer:$pName\n"; } else{ - my $pRnm = $pName?($pName."-".($pS eq "long"?"lg":"sh")):""; + my $pRnm = $pName?($pName."-".($pTyp eq "long"?"lg":"sh")):""; foreach my $rn (keys%{$tpl{$tmpl}{reg}}){ my $regV = ReadingsVal($aName,"R-$pRnm$rn" ,undef); $regV = ReadingsVal($aName,".R-$pRnm$rn",undef) if (!defined $regV); $regV = ReadingsVal($aName,"R-".$rn ,undef) if (!defined $regV); $regV = ReadingsVal($aName,".R-".$rn ,undef) if (!defined $regV); - if (defined $regV){ $regV =~s/ .*//;#strip unit my $tplV = $tpl{$tmpl}{reg}{$rn}; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 4da58f72f..5b76e5103 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -474,7 +474,7 @@ my %culHmRegDefine = ( #CC-TC #--- list 3, link level for actor - mainly in short/long hash, only specials here------------------ - lgMultiExec =>{a=>138.5,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"multiple execution per repeat of long trigger" ,lit=>{off=>0,on=>1}}, + lgMultiExec =>{a=>138.5,s=>0.1,l=>3,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"multiple execution per repeat of long trigger" ,lit=>{off=>0,on=>1}}, #--- list 4, link level for Button ------------------ peerNeedsBurst =>{a=> 1.0,s=>0.1,l=>4,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"peer expects burst",lit=>{off=>0,on=>1}},