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

bugfix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3501 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-07-25 14:04:46 +00:00
parent 49447484e0
commit a2344e93f5
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/FHEM/10_CUL_HM.pm
View File

@ -181,7 +181,6 @@ sub CUL_HM_updateConfig($){
# it will also be called after each manual definition # it will also be called after each manual definition
# Purpose is to parse attributes and read config # Purpose is to parse attributes and read config
foreach my $name (@{$modules{CUL_HM}{helper}{updtCfgLst}}){ foreach my $name (@{$modules{CUL_HM}{helper}{updtCfgLst}}){
CUL_HM_Attr
my $hash = $defs{$name}; my $hash = $defs{$name};
my $id = $hash->{DEF}; my $id = $hash->{DEF};
my $chn = substr($id."00",6,2); my $chn = substr($id."00",6,2);

17
fhem/FHEM/98_HMinfo.pm
View File

@ -730,7 +730,7 @@ my %tpl = (
,BlJtOff =>"dlyOff" ,BlJtOff =>"dlyOff"
,BlJtOn =>"dlyOff" ,BlJtOn =>"dlyOff"
,BlJtRampOff =>"rampOff" ,BlJtRampOff =>"rampOff"
,BlJtRampOn =>"rampOn" ,BlJtRampOn =>"on"
,BlJtRefOff =>"rampOff" ,BlJtRefOff =>"rampOff"
,BlJtRefOn =>"on" ,BlJtRefOn =>"on"
}} }}
@ -752,17 +752,11 @@ my %tpl = (
,BlJtOff =>"dlyOn" ,BlJtOff =>"dlyOn"
,BlJtOn =>"dlyOn" ,BlJtOn =>"dlyOn"
,BlJtRampOff =>"off" ,BlJtRampOff =>"off"
,BlJtRampOn =>"on" ,BlJtRampOn =>"rampOn"
,BlJtRefOff =>"off" ,BlJtRefOff =>"off"
,BlJtRefOn =>"rampOn" ,BlJtRefOn =>"rampOn"
}} }}
,BlStopUpSh => {p=>"" ,t=>"Blind: stop drive on ,BlStopUpSh => {p=>"" ,t=>"Blind: stop drive on"
reload 10_CUL_HM
reload 98_HMinfo
any key - for short drive up"
,reg=>{ ActionType =>"jmpToTarget" ,reg=>{ ActionType =>"jmpToTarget"
,BlJtDlyOff =>"dlyOn" ,BlJtDlyOff =>"dlyOn"
,BlJtDlyOn =>"refOn" ,BlJtDlyOn =>"refOn"
@ -773,7 +767,6 @@ reload 98_HMinfo
,BlJtRefOff =>"off" ,BlJtRefOff =>"off"
,BlJtRefOn =>"rampOn" ,BlJtRefOn =>"rampOn"
}} }}
); );
sub HMinfo_templateDef(@){##################################################### sub HMinfo_templateDef(@){#####################################################
@ -882,18 +875,16 @@ sub HMinfo_templateChk(@){#####################################################
foreach my $pS (@pNames){ foreach my $pS (@pNames){
($pName,$pTyp) = split(":",$pS); ($pName,$pTyp) = split(":",$pS);
my $replPeer=""; my $replPeer="";
if($pName && (grep !/$pName/,ReadingsVal($aName,"peerList" ,undef))){ if($pName && (grep !/$pName/,ReadingsVal($aName,"peerList" ,undef))){
$replPeer=" no peer:$pName\n"; $replPeer=" no peer:$pName\n";
} }
else{ 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}}){ foreach my $rn (keys%{$tpl{$tmpl}{reg}}){
my $regV = ReadingsVal($aName,"R-$pRnm$rn" ,undef); my $regV = ReadingsVal($aName,"R-$pRnm$rn" ,undef);
$regV = ReadingsVal($aName,".R-$pRnm$rn",undef) if (!defined $regV); $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);
$regV = ReadingsVal($aName,".R-".$rn ,undef) if (!defined $regV); $regV = ReadingsVal($aName,".R-".$rn ,undef) if (!defined $regV);
if (defined $regV){ if (defined $regV){
$regV =~s/ .*//;#strip unit $regV =~s/ .*//;#strip unit
my $tplV = $tpl{$tmpl}{reg}{$rn}; my $tplV = $tpl{$tmpl}{reg}{$rn};

2
fhem/FHEM/HMConfig.pm
View File

@ -474,7 +474,7 @@ my %culHmRegDefine = (
#CC-TC #CC-TC
#--- list 3, link level for actor - mainly in short/long hash, only specials here------------------ #--- 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 ------------------ #--- 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}}, 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}},