FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-23 08:36:24 +00:00
Code Issues Releases Wiki Activity

cosmetical

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4776 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-01-31 15:33:10 +00:00
parent 8112d804b9
commit 9a1e006c47
3 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fhem/FHEM/10_CUL_HM.pm
View File

@ -287,17 +287,31 @@ sub CUL_HM_updateConfig($){
my $webCmd; my $webCmd;
$webCmd = AttrVal($name,"webCmd",undef); $webCmd = AttrVal($name,"webCmd",undef);
if(!defined $webCmd){ 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} && }elsif((!$hash->{helper}{role}{chn} &&
$md =~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/) $md =~ m/(HM-CC-TC|ROTO_ZEL-STG-RM-FWT)/)
||$st eq "repeater" ||$st eq "repeater"
||$md =~ m/(HM-CC-VD|ROTO_ZEL-STG-RM-FSA)/ ){$webCmd="getConfig"; ||$md =~ m/(HM-CC-VD|ROTO_ZEL-STG-RM-FSA)/ ){$webCmd="getConfig:clear msgEvents";
}elsif($st eq "blindActuator"){$webCmd="toggle:on:off:up:down:stop:statusRequest"; }elsif($st eq "blindActuator"){
}elsif($st eq "dimmer" ){$webCmd="toggle:on:off:up:down:statusRequest"; if ($hash->{helper}{role}{chn}){$webCmd="statusRequest:toggle:on:off:up:down:stop";}
}elsif($st eq "switch" ){$webCmd="toggle:on:off:statusRequest"; else{ $webCmd="statusRequest:getConfig:clear msgEvents";}
}elsif($st eq "smokeDetector"){$webCmd="teamCall:alarmOn:alarmOff:statusRequest"; }elsif($st eq "dimmer" ){
}elsif($st eq "keyMatic" ){$webCmd="lock:inhibit on:inhibit off"; if ($hash->{helper}{role}{chn}){$webCmd="statusRequest:toggle:on:off:up:down";}
}elsif($md eq "HM-OU-CFM-PL" ){$webCmd="press short:press long" 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":""); .($chn eq "02"?":playTone replay":"");
} }
if (!$hash->{helper}{role}{chn} if (!$hash->{helper}{role}{chn}
@ -2062,7 +2076,6 @@ sub CUL_HM_parseSDteam(@){#handle SD team events
my $dName = CUL_HM_id2Name($dId); my $dName = CUL_HM_id2Name($dId);
my $sHash = CUL_HM_id2Hash($sId); my $sHash = CUL_HM_id2Hash($sId);
my $sName = CUL_HM_hash2Name($sHash); my $sName = CUL_HM_hash2Name($sHash);
my $st = AttrVal($sName,"subType","");
if (AttrVal($sName,"subType","") eq "virtual"){ if (AttrVal($sName,"subType","") eq "virtual"){
foreach my $cId (CUL_HM_getAssChnIds($sName)){ foreach my $cId (CUL_HM_getAssChnIds($sName)){
my $cHash = CUL_HM_id2Hash($cId); my $cHash = CUL_HM_id2Hash($cId);
@ -2381,7 +2394,7 @@ sub CUL_HM_Set($@) {
my @vArr = split('\|',$val); my @vArr = split('\|',$val);
foreach (@vArr){ foreach (@vArr){
if ($_ =~ m/(.*)\.\.(.*)/ ){ if ($_ =~ m/(.*)\.\.(.*)/ ){
my @list = map { ($_.".0", $_+0.5) } ($1..$2); my @list = map { ($_.".0", $_+0.5) } (($1+0)..($2+0));
pop @list; pop @list;
$_ = join(",",@list); $_ = join(",",@list);
} }

2
fhem/FHEM/98_HMinfo.pm
View File

@ -271,7 +271,7 @@ sub HMinfo_paramCheck(@) { ####################################################
my $ret = ""; my $ret = "";
$ret .="\n\n no IO device assigned" ."\n ".(join "\n ",sort @noIoDev) if (@noIoDev); $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 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 PairedTo mismatch to IODev"."\n ".(join "\n ",sort @idMismatch) if (@idMismatch);
return $ret; return $ret;
} }
sub HMinfo_tempList(@) { ###################################################### sub HMinfo_tempList(@) { ######################################################

10
fhem/FHEM/HMConfig.pm
View File

@ -549,8 +549,8 @@ my $K_actDetID = '000000'; # id of actionDetector
# others # 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}}, 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"}, cndTxThrhHi =>{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"}, 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"}, 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 "}, 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-xxx02" =>{ transmitTryMax =>1,eventDlyTime =>1},
"Schueco_263-xxx03" =>{ ttJtOn =>1,ttJtOff =>1}, "Schueco_263-xxx03" =>{ ttJtOn =>1,ttJtOff =>1},
"HM-Sen-RD-O01" =>{ eventFilterTimeB=>1,transmitTryMax =>1,peerNeedsBurst =>1,expectAES =>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 "HM-CC-RT-DN03" =>{ shCtValLo =>1
,winOpnTemp =>1}, ,winOpnTemp =>1},
@ -1272,8 +1272,8 @@ $culHmChanSets{"ROTO_ZEL-STG-RM-FWT02"} = $culHmChanSets{"HM-CC-TC02"};
,alarmOff =>"" ,alarmOff =>""
,teamCall =>"" ,teamCall =>""
}, },
vdCtrl =>{ valvePos =>"<position>"}, vdCtrl =>{ valvePos =>"[off|0.0..100.0]"},
virtThSens =>{ virtTemp =>"<temp>"} virtThSens =>{ virtTemp =>"[off|-20.0..50.0]"}
); );