diff --git a/FHEM/10_CUL_HM.pm b/FHEM/10_CUL_HM.pm index abaca5667..b2e06b840 100755 --- a/FHEM/10_CUL_HM.pm +++ b/FHEM/10_CUL_HM.pm @@ -5384,7 +5384,7 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data $data = ($data>>$pos) & (0xffffffff>>(32-$size)); 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 "fltCvT60"){$data = CUL_HM_CvTflt60($data); } elsif($conversion eq "min2time"){$data = CUL_HM_min2time($data); diff --git a/FHEM/98_HMinfo.pm b/FHEM/98_HMinfo.pm index 944a8a079..4dd7553fd 100644 --- a/FHEM/98_HMinfo.pm +++ b/FHEM/98_HMinfo.pm @@ -631,6 +631,7 @@ sub HMinfo_tempListTmpl(@) { ################################################## } return "no entities selected" if (!scalar @el); $tmpl = (!$tmpl)?"":($fName?$fName.":".$tmpl:$tmpl); + my @rs; foreach my $name (@el){ my $tmplDev; if (!$tmpl){ @@ -641,8 +642,9 @@ sub HMinfo_tempListTmpl(@) { ################################################## } 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; } diff --git a/FHEM/HMConfig.pm b/FHEM/HMConfig.pm index 2309a6e36..bce8fb13a 100644 --- a/FHEM/HMConfig.pm +++ b/FHEM/HMConfig.pm @@ -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"}, 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 - 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}}, 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"},