From 9a1e006c4714fe63e814d72f0da5f3a56bb57d3e Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Fri, 31 Jan 2014 15:33:10 +0000 Subject: [PATCH] cosmetical git-svn-id: https://svn.fhem.de/fhem/trunk@4776 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 35 ++++++++++++++++++++++++----------- fhem/FHEM/98_HMinfo.pm | 6 +++--- fhem/FHEM/HMConfig.pm | 10 +++++----- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 09be219eb..558f8061a 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -287,18 +287,32 @@ sub CUL_HM_updateConfig($){ my $webCmd; $webCmd = AttrVal($name,"webCmd",undef); if(!defined $webCmd){ - if ($st eq "virtual" ){$webCmd="press short:press long"; + if ($st eq "virtual" ){ + if ($hash->{helper}{fkt} eq "sdLead") {$webCmd="teamCall:alarmOn:alarmOff";} + elsif($hash->{helper}{fkt} eq "vdCtrl") {$webCmd="valvePos";} + elsif($hash->{helper}{fkt} eq "virtThSens"){$webCmd="virtTemp";} + elsif ($hash->{helper}{role}{chn}) {$webCmd="press short:press long";} + else {$webCmd="virtual";} + }elsif((!$hash->{helper}{role}{chn} && $md =~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/) ||$st eq "repeater" - ||$md =~ m/(HM-CC-VD|ROTO_ZEL-STG-RM-FSA)/ ){$webCmd="getConfig"; - }elsif($st eq "blindActuator"){$webCmd="toggle:on:off:up:down:stop:statusRequest"; - }elsif($st eq "dimmer" ){$webCmd="toggle:on:off:up:down:statusRequest"; - }elsif($st eq "switch" ){$webCmd="toggle:on:off:statusRequest"; - }elsif($st eq "smokeDetector"){$webCmd="teamCall:alarmOn:alarmOff:statusRequest"; - }elsif($st eq "keyMatic" ){$webCmd="lock:inhibit on:inhibit off"; - }elsif($md eq "HM-OU-CFM-PL" ){$webCmd="press short:press long" - .($chn eq "02"?":playTone replay":""); + ||$md =~ m/(HM-CC-VD|ROTO_ZEL-STG-RM-FSA)/ ){$webCmd="getConfig:clear msgEvents"; + }elsif($st eq "blindActuator"){ + if ($hash->{helper}{role}{chn}){$webCmd="statusRequest:toggle:on:off:up:down:stop";} + else{ $webCmd="statusRequest:getConfig:clear msgEvents";} + }elsif($st eq "dimmer" ){ + if ($hash->{helper}{role}{chn}){$webCmd="statusRequest:toggle:on:off:up:down";} + else{ $webCmd="statusRequest:getConfig:clear msgEvents";} + }elsif($st eq "switch" ){ + if ($hash->{helper}{role}{chn}){$webCmd="statusRequest:toggle:on:off";} + else{ $webCmd="statusRequest:getConfig:clear msgEvents";} + }elsif($st eq "smokeDetector"){ $webCmd="statusRequest"; + if ($hash->{helper}{fkt} eq "sdLead"){ + $webCmd.="teamCall:alarmOn:alarmOff";} + }elsif($st eq "keyMatic" ){ $webCmd="lock:inhibit on:inhibit off"; + }elsif($md eq "HM-OU-CFM-PL" ){ $webCmd="press short:press long" + .($chn eq "02"?":playTone replay":""); } if (!$hash->{helper}{role}{chn} && $md =~ m/HM-CC-RT-DN/) {$webCmd.=":burstXmit";} @@ -2062,7 +2076,6 @@ sub CUL_HM_parseSDteam(@){#handle SD team events my $dName = CUL_HM_id2Name($dId); my $sHash = CUL_HM_id2Hash($sId); my $sName = CUL_HM_hash2Name($sHash); - my $st = AttrVal($sName,"subType",""); if (AttrVal($sName,"subType","") eq "virtual"){ foreach my $cId (CUL_HM_getAssChnIds($sName)){ my $cHash = CUL_HM_id2Hash($cId); @@ -2381,7 +2394,7 @@ sub CUL_HM_Set($@) { my @vArr = split('\|',$val); foreach (@vArr){ if ($_ =~ m/(.*)\.\.(.*)/ ){ - my @list = map { ($_.".0", $_+0.5) } ($1..$2); + my @list = map { ($_.".0", $_+0.5) } (($1+0)..($2+0)); pop @list; $_ = join(",",@list); } diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index c3c70185e..7a5cc95c7 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -269,9 +269,9 @@ sub HMinfo_paramCheck(@) { #################################################### } my $ret = ""; - $ret .="\n\n no IO device assigned" ."\n ".(join "\n ",sort @noIoDev) if (@noIoDev); - $ret .="\n\n PairedTo missing/unknown" ."\n ".(join "\n ",sort @noID) if (@noID); - $ret .="\n\n PairedTo missmatch to IODev"."\n ".(join "\n ",sort @idMismatch) if (@idMismatch); + $ret .="\n\n no IO device assigned" ."\n ".(join "\n ",sort @noIoDev) if (@noIoDev); + $ret .="\n\n PairedTo missing/unknown" ."\n ".(join "\n ",sort @noID) if (@noID); + $ret .="\n\n PairedTo mismatch to IODev"."\n ".(join "\n ",sort @idMismatch) if (@idMismatch); return $ret; } sub HMinfo_tempList(@) { ###################################################### diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 13e7b8ed3..c464f2f40 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -549,8 +549,8 @@ my $K_actDetID = '000000'; # id of actionDetector # others localResetDis =>{a=> 7 ,s=>1 ,l=>1,min=>0 ,max=>255 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"LocalReset disable",lit=>{off=>0,on=>1}}, - condTxThrhHi =>{a=>135 ,s=>2 ,l=>1,min=>0 ,max=>3000 ,c=>'' ,f=>'' ,u=>'mV' ,d=>0,t=>"threshold high condition"}, - condTxThrhHi =>{a=>139 ,s=>2 ,l=>1,min=>0 ,max=>3000 ,c=>'' ,f=>'' ,u=>'mV' ,d=>0,t=>"threshold high condition"}, + cndTxThrhHi =>{a=>135 ,s=>2 ,l=>1,min=>0 ,max=>3000 ,c=>'' ,f=>'' ,u=>'mV' ,d=>0,t=>"threshold high condition"}, + cndTxThrhLo =>{a=>139 ,s=>2 ,l=>1,min=>0 ,max=>3000 ,c=>'' ,f=>'' ,u=>'mV' ,d=>0,t=>"threshold high condition"}, highHoldTime =>{a=>143 ,s=>1 ,l=>1,min=>60 ,max=>7620 ,c=>'fltCvT60' ,f=>'' ,u=>'s' ,d=>0,t=>"hold time on high state"}, evntRelFltTime =>{a=>145 ,s=>1 ,l=>1,min=>1 ,max=>7620 ,c=>'fltCvT60' ,f=>'' ,u=>'s' ,d=>0,t=>"event filter release time "}, @@ -952,7 +952,7 @@ $culHmRegModel{"ROTO_ZEL-STG-RM-FSA"} = $culHmRegModel{"HM-CC-VD"}; "Schueco_263-xxx02" =>{ transmitTryMax =>1,eventDlyTime =>1}, "Schueco_263-xxx03" =>{ ttJtOn =>1,ttJtOff =>1}, "HM-Sen-RD-O01" =>{ eventFilterTimeB=>1,transmitTryMax =>1,peerNeedsBurst =>1,expectAES =>1 - ,condTxThrhHi =>1,condTxThrhHi =>1,highHoldTime =>1,evntRelFltTime =>1 + ,cndTxThrhHi =>1,cndTxThrhLo =>1,highHoldTime =>1,evntRelFltTime =>1 }, "HM-CC-RT-DN03" =>{ shCtValLo =>1 ,winOpnTemp =>1}, @@ -1272,8 +1272,8 @@ $culHmChanSets{"ROTO_ZEL-STG-RM-FWT02"} = $culHmChanSets{"HM-CC-TC02"}; ,alarmOff =>"" ,teamCall =>"" }, - vdCtrl =>{ valvePos =>""}, - virtThSens =>{ virtTemp =>""} + vdCtrl =>{ valvePos =>"[off|0.0..100.0]"}, + virtThSens =>{ virtTemp =>"[off|-20.0..50.0]"} );