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

minor enhancements

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5539 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-04-17 07:39:46 +00:00
parent 6881c2ccc1
commit a705405737
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/10_CUL_HM.pm
View File

@ -5384,7 +5384,7 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
$data = ($data>>$pos) & (0xffffffff>>(32-$size)); $data = ($data>>$pos) & (0xffffffff>>(32-$size));
if (!$conversion){ ;# do nothing if (!$conversion){ ;# do nothing
} elsif($conversion eq "lit" ){$data = $reg->{litInv}{$data}?$reg->{litInv}{$data}:"undef lit"; } elsif($conversion eq "lit" ){$data = $reg->{litInv}{$data}?$reg->{litInv}{$data}:"undef lit:$data";
} elsif($conversion eq "fltCvT" ){$data = CUL_HM_CvTflt($data); } elsif($conversion eq "fltCvT" ){$data = CUL_HM_CvTflt($data);
} elsif($conversion eq "fltCvT60"){$data = CUL_HM_CvTflt60($data); } elsif($conversion eq "fltCvT60"){$data = CUL_HM_CvTflt60($data);
} elsif($conversion eq "min2time"){$data = CUL_HM_min2time($data); } elsif($conversion eq "min2time"){$data = CUL_HM_min2time($data);

4
FHEM/98_HMinfo.pm
View File

@ -631,6 +631,7 @@ sub HMinfo_tempListTmpl(@) { ##################################################
} }
return "no entities selected" if (!scalar @el); return "no entities selected" if (!scalar @el);
$tmpl = (!$tmpl)?"":($fName?$fName.":".$tmpl:$tmpl); $tmpl = (!$tmpl)?"":($fName?$fName.":".$tmpl:$tmpl);
my @rs;
foreach my $name (@el){ foreach my $name (@el){
my $tmplDev; my $tmplDev;
if (!$tmpl){ if (!$tmpl){
@ -641,8 +642,9 @@ sub HMinfo_tempListTmpl(@) { ##################################################
} }
my $r = CUL_HM_tempListTmpl($name,$action,$tmplDev); my $r = CUL_HM_tempListTmpl($name,$action,$tmplDev);
$ret .= ($r?$r:"passed:$name")."\n"; push @rs, "$tmplDev -> ".($r?$r:"passed:$name")."\n";
} }
$ret .= join "",sort @rs;
return $ret; return $ret;
} }

2
FHEM/HMConfig.pm
View File

@ -419,7 +419,7 @@ my $K_actDetID = '000000'; # id of actionDetector
brightness =>{a=> 4.0,s=>0.4,l=>0,min=>0 ,max=>15 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"Display brightness"}, brightness =>{a=> 4.0,s=>0.4,l=>0,min=>0 ,max=>15 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"Display brightness"},
energyOpt =>{a=> 8.0,s=>1.0,l=>0,min=>0 ,max=>127 ,c=>'' ,f=>2 ,u=>'s' ,d=>1,t=>"energy Option: Duration of ilumination"}, energyOpt =>{a=> 8.0,s=>1.0,l=>0,min=>0 ,max=>127 ,c=>'' ,f=>2 ,u=>'s' ,d=>1,t=>"energy Option: Duration of ilumination"},
# sec_mdir # sec_mdir
cyclicInfoMsg =>{a=> 9.0,s=>1.0,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"cyclic message" ,lit=>{off=>0,on=>1}}, cyclicInfoMsg =>{a=> 9.0,s=>1.0,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"cyclic message" ,lit=>{off=>0,on=>1}},#General should be 200?
sabotageMsg =>{a=> 16.0,s=>1.0,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"enable sabotage message" ,lit=>{off=>0,on=>1}}, sabotageMsg =>{a=> 16.0,s=>1.0,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"enable sabotage message" ,lit=>{off=>0,on=>1}},
cyclicInfoMsgDis=>{a=> 17.0,s=>1.0,l=>0,min=>0 ,max=>255 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"cyclic message"}, cyclicInfoMsgDis=>{a=> 17.0,s=>1.0,l=>0,min=>0 ,max=>255 ,c=>'' ,f=>'' ,u=>'' ,d=>1,t=>"cyclic message"},
lowBatLimit =>{a=> 18.0,s=>1.0,l=>0,min=>10 ,max=>12 ,c=>'' ,f=>10 ,u=>'V' ,d=>1,t=>"low batterie limit, step .1V"}, lowBatLimit =>{a=> 18.0,s=>1.0,l=>0,min=>10 ,max=>12 ,c=>'' ,f=>10 ,u=>'V' ,d=>1,t=>"low batterie limit, step .1V"},