From 2faaf75d07a542c97dbacdc21df285277b9d7ff3 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Thu, 15 May 2014 08:32:35 +0000 Subject: [PATCH] delay device setup in HMLAN git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5866 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/00_HMLAN.pm | 2 +- FHEM/10_CUL_HM.pm | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/FHEM/00_HMLAN.pm b/FHEM/00_HMLAN.pm index ae4f4c4a0..ec3a885d6 100755 --- a/FHEM/00_HMLAN.pm +++ b/FHEM/00_HMLAN.pm @@ -407,7 +407,7 @@ sub HMLAN_Write($$$) {######################################################### Log3 $hash, 5, "HMLAN: Skip ACK"; return; } -# my $IDHM = '+'.$dst.',01,00,F1EF'; #used by HMconfig - meanning?? +# my $IDHM = '+'.$dst.',01,00,F1EF'; # used by HMconfig - meaning?? # my $IDadd = '+'.$dst; # guess: add ID? # my $IDack = '+'.$dst.',02,00,'; # guess: ID acknowledge # my $IDack = '+'.$dst.',FF,00,'; # guess: ID acknowledge diff --git a/FHEM/10_CUL_HM.pm b/FHEM/10_CUL_HM.pm index 62fdc693b..7610d3ea1 100755 --- a/FHEM/10_CUL_HM.pm +++ b/FHEM/10_CUL_HM.pm @@ -322,23 +322,22 @@ sub CUL_HM_updateConfig($){ my $actCycle = AttrVal($name,"actCycle",undef); CUL_HM_ActAdd($id,$actCycle) if ($actCycle );#add 2 ActionDetect? # --- set default attributes if missing --- - if ( $hash->{helper}{role}{dev} - && $st ne "virtual"){ - $attr{$name}{expert} = AttrVal($name,"expert" ,"2_full"); - $attr{$name}{autoReadReg}= AttrVal($name,"autoReadReg","4_reqStatus"); + if ($hash->{helper}{role}{dev}){ + if( $st ne "virtual"){ + $attr{$name}{expert} = AttrVal($name,"expert" ,"2_full"); + $attr{$name}{autoReadReg}= AttrVal($name,"autoReadReg","4_reqStatus"); + CUL_HM_hmInitMsg($hash); + } + if (CUL_HM_getRxType($hash)&0x02){#burst dev must restrict retries! + $attr{$name}{msgRepeat} = 1 if (!$attr{$name}{msgRepeat}); + } } CUL_HM_Attr("attr",$name,"expert",$attr{$name}{expert}) if ($attr{$name}{expert});#need update after readings are available - if ($chn eq "03" && $md =~ /(-TC|ROTO_ZEL-STG-RM-FWT|HM-CC-RT-DN)/){ $attr{$name}{stateFormat} = "last:trigLast"; } - - if ( $hash->{helper}{role}{dev} && CUL_HM_getRxType($hash)&0x02){#burst dev - #burst devices must restrict retries! - $attr{$name}{msgRepeat} = 1 if (!$attr{$name}{msgRepeat}); - } # -+-+-+-+-+ add default web-commands my $webCmd; $webCmd = AttrVal($name,"webCmd",undef); @@ -718,7 +717,8 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN my @p; if (!($rxt & ~0x04)){@p = ("00","01","FE1F");}#config only elsif($rxt & 0x10) {@p = ("00","01","1E"); }#lazyConfig - else {@p = ("00","01","1E"); } + else {@p = ("00","01","00"); } +# else {@p = ("00","01","1E"); } if (AttrVal($hash->{NAME},"aesCommReq",0)){ $p[0] = sprintf("%02X",($p[0] + 1)); $p[2] = ($p[2]eq "")?"1E":$p[2];