FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-05 17:48:44 +00:00
Code Issues Releases Wiki Activity

templist correction

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5366 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-03-29 09:12:24 +00:00
parent 6e274d6eae
commit 3ef0015d65
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/10_CUL_HM.pm
View File

@ -579,7 +579,8 @@ sub CUL_HM_Attr(@) {#################################
} }
} }
} }
elsif ($st eq "blindActuator"){ # elsif ($st eq "blindActuator"){
else{
if ($cmd eq "set"){ if ($cmd eq "set"){
if ($attrVal eq "levelInverse"){# no action if ($attrVal eq "levelInverse"){# no action
} }
@ -591,9 +592,9 @@ sub CUL_HM_Attr(@) {#################################
delete $hash->{helper}{vd}{msgRed}; delete $hash->{helper}{vd}{msgRed};
} }
} }
else{ # else{
return "attribut param not valid for $name"; # return "attribut param not valid for $name";
} # }
} }
elsif($attrName eq "peerIDs"){ elsif($attrName eq "peerIDs"){
if ($cmd eq "set"){ if ($cmd eq "set"){
@ -3864,7 +3865,8 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++
my $pmd = AttrVal(CUL_HM_id2Name($peerDst), "model" , ""); my $pmd = AttrVal(CUL_HM_id2Name($peerDst), "model" , "");
if ($md =~ m/HM-CC-RT-DN/ && $chn eq "05" ){# rt team peers cross from 05 to 04 if ($md =~ m/HM-CC-RT-DN/ && $chn eq "05" ){# rt team peers cross from 05 to 04
$myBtn = $peerBtn = "04"; $myBtn = $peerBtn = "05";
# $myBtn = $peerBtn = "04"; was observed by HM - but reality showes that peering should be team 2 team
$peerChn = "05"; $peerChn = "05";
} }
else{ # normal devices else{ # normal devices

5
fhem/FHEM/98_HMinfo.pm
View File

@ -381,8 +381,9 @@ sub HMinfo_peerCheck(@) { #####################################################
next if ($_ eq "00000000" ||$_ =~m /$devId/); next if ($_ eq "00000000" ||$_ =~m /$devId/);
my $cId = $id; my $cId = $id;
if ($md eq "HM-CC-RT-DN" && $id =~ m/05$/){ # special RT climate if ($md eq "HM-CC-RT-DN" && $id =~ m/05$/){ # special RT climate
$_ =~ s/04$/05/; # have to compare with clima_team, not clima # special removed due to observations of user - RT should peer team2team - korrekt?
$cId =~ s/05$/04/;# will find 04 in peerlist, not 05 # $_ =~ s/04$/05/; # have to compare with clima_team, not clima
# $cId =~ s/05$/04/;# will find 04 in peerlist, not 05
} }
my $pDid = substr($_,0,6); my $pDid = substr($_,0,6);
if (!$modules{CUL_HM}{defptr}{$_} && if (!$modules{CUL_HM}{defptr}{$_} &&

6
fhem/FHEM/HMConfig.pm
View File

@ -1,6 +1,6 @@
############################################## ##############################################
# CUL HomeMatic device configuration data # CUL HomeMatic device configuration data
# $Id: $ # $Id: $Id$
##################################################### #####################################################
# configuration data for CUL_HM -used to split code and configuration # configuration data for CUL_HM -used to split code and configuration
@ -227,8 +227,8 @@ my $K_actDetID = '000000'; # id of actionDetector
"00A2" => {name=>"ROTO_ZEL-STG-RM-FZS-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, #radio-controlled socket adapter switch actuator 1-channel "00A2" => {name=>"ROTO_ZEL-STG-RM-FZS-2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, #radio-controlled socket adapter switch actuator 1-channel
"00A3" => {name=>"HM-LC-Dim1L-Pl-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, "00A3" => {name=>"HM-LC-Dim1L-Pl-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",},
"00A4" => {name=>"HM-LC-Dim1T-Pl-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",}, "00A4" => {name=>"HM-LC-Dim1T-Pl-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",},
"00A5" => {name=>"HM-RC-Sec4-2" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"Btn:1:2,BTN_T:3:3,BTN_A:4:4",},#only 1 and 2 can be peered??? "00A5" => {name=>"HM-RC-Sec4-2" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"armExt:1:1,armInt:2:2,disarm:3:3,light:4:4",},
"00A6" => {name=>"HM-RC-Key4-2" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"Btn:1:2,BTN_T:3:3,BTN_A:4:4",},#only 1 and 2 can be peered??? "00A6" => {name=>"HM-RC-Key4-2" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"lock:1:1,unlock:2:2,open:3:3,light:4:4",},
"00A7" => {name=>"HM-Sen-RD-O" ,st=>'sensRain' ,cyc=>'' ,rxt=>'' ,lst=>'1:1,4:1p' ,chn=>"Rain:1:1,Heating:2:2",},#stc:70 THSensor "00A7" => {name=>"HM-Sen-RD-O" ,st=>'sensRain' ,cyc=>'' ,rxt=>'' ,lst=>'1:1,4:1p' ,chn=>"Rain:1:1,Heating:2:2",},#stc:70 THSensor
"00A8" => {name=>"HM-WDS30-OT2-SM" ,st=>'THSensor' ,cyc=>'12:00' ,rxt=>'c:w:f' ,lst=>'p' ,chn=>"T1:1:1,T2:2:2,T1_T2:3:3,T2_T1:4:4,Event:5:5",}, "00A8" => {name=>"HM-WDS30-OT2-SM" ,st=>'THSensor' ,cyc=>'12:00' ,rxt=>'c:w:f' ,lst=>'p' ,chn=>"T1:1:1,T2:2:2,T1_T2:3:3,T2_T1:4:4,Event:5:5",},
"00A9" => {name=>"HM-PB-6-WM55" ,st=>'remote' ,cyc=>'' ,rxt=>'c' ,lst=>'1,4' ,chn=>"Btn:1:6",}, "00A9" => {name=>"HM-PB-6-WM55" ,st=>'remote' ,cyc=>'' ,rxt=>'c' ,lst=>'1,4' ,chn=>"Btn:1:6",},