From 8f24f97e8b23f249bf2a0db7a7cfd05a1898e141 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 29 Aug 2015 17:12:16 +0000 Subject: [PATCH] HMconfig: Bugfix aliesed register for channels git-svn-id: https://svn.fhem.de/fhem/trunk@9158 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 2 +- fhem/FHEM/HMConfig.pm | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 9a35c387f..0356edc24 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -176,6 +176,7 @@ sub CUL_HM_Initialize($) { .$readingFnAttributes ; + CUL_HM_initRegHash(); my @modellist; foreach my $model (keys %{$culHmModel}){ push @modellist,$culHmModel->{$model}{name}; @@ -204,7 +205,6 @@ sub CUL_HM_Initialize($) { RemoveInternalTimer("StatCntRfresh"); InternalTimer(gettimeofday()+3600*20,"CUL_HM_statCntRfresh","StatCntRfresh", 0); - CUL_HM_initRegHash(); $hash->{hmIoMaxDly} = 60;# poll timeout - stop poll and discard $hash->{hmAutoReadScan} = 4; # delay autoConf readings $hash->{helper}{hmManualOper} = 0;# default automode diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 0c93d6054..38af988f0 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -294,8 +294,6 @@ my $K_actDetID = '000000'; # id of actionDetector ,"00E8" => {name=>"HM-LC-Sw1-Pl-DN-R4" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} ,"00E9" => {name=>"HM-LC-Sw1-Pl-DN-R5" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} ,"00EA" => {name=>"HM-ES-PMSw1-DR" ,alias=>"HM-ES-PMSw1-Pl"} -# ,"00EA" => {name=>"HM-ES-PMSw1-DR" ,st=>'powerMeter' ,cyc=>'00:10' ,rxt=>'' ,lst=>'1:2.3.4.5.6,3:1p,4:3p.4p.5p.6p' -# ,chn=>"Sw:1:1,Pwr:2:2,SenPwr:3:3,SenI:4:4,SenU:5:5,SenF:6:6"} ,"00EB" => {name=>"HM-LC-Sw1-Pl-CT-R1" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} ,"00EC" => {name=>"HM-LC-Sw1-Pl-CT-R2" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} ,"00ED" => {name=>"HM-LC-Sw1-Pl-CT-R3" ,st=>'switch' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"",} @@ -1922,7 +1920,7 @@ $culHmChanSets{"HM-CC-RD-O00"} = $culHmChanSets{"HM-LC-Bl1PBU-FM00"}; } $culHmRegModel{$ds} = $culHmRegModel{$ds} if ($culHmRegModel{$ds}); foreach(grep /^$md/,keys %culHmRegChan){ - $culHmChanSets{$ds.substr($_,-2,2)} = $culHmChanSets{$_}; + $culHmRegChan{$ds.substr($_,-2,2)} = $culHmRegChan{$_}; } last; }