Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

delay device setup in HMLAN

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5866 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-05-15 08:32:35 +00:00
parent 1eaeec5813
commit 2faaf75d07
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/00_HMLAN.pm
View File

@ -407,7 +407,7 @@ sub HMLAN_Write($$$) {#########################################################
Log3 $hash, 5, "HMLAN: Skip ACK"; Log3 $hash, 5, "HMLAN: Skip ACK";
return; 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 $IDadd = '+'.$dst; # guess: add ID?
# my $IDack = '+'.$dst.',02,00,'; # guess: ID acknowledge # my $IDack = '+'.$dst.',02,00,'; # guess: ID acknowledge
# my $IDack = '+'.$dst.',FF,00,'; # guess: ID acknowledge # my $IDack = '+'.$dst.',FF,00,'; # guess: ID acknowledge

18
FHEM/10_CUL_HM.pm
View File

@ -322,23 +322,22 @@ sub CUL_HM_updateConfig($){
my $actCycle = AttrVal($name,"actCycle",undef); my $actCycle = AttrVal($name,"actCycle",undef);
CUL_HM_ActAdd($id,$actCycle) if ($actCycle );#add 2 ActionDetect? CUL_HM_ActAdd($id,$actCycle) if ($actCycle );#add 2 ActionDetect?
# --- set default attributes if missing --- # --- set default attributes if missing ---
if ( $hash->{helper}{role}{dev} if ($hash->{helper}{role}{dev}){
&& $st ne "virtual"){ if( $st ne "virtual"){
$attr{$name}{expert} = AttrVal($name,"expert" ,"2_full"); $attr{$name}{expert} = AttrVal($name,"expert" ,"2_full");
$attr{$name}{autoReadReg}= AttrVal($name,"autoReadReg","4_reqStatus"); $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}) CUL_HM_Attr("attr",$name,"expert",$attr{$name}{expert})
if ($attr{$name}{expert});#need update after readings are available if ($attr{$name}{expert});#need update after readings are available
if ($chn eq "03" && if ($chn eq "03" &&
$md =~ /(-TC|ROTO_ZEL-STG-RM-FWT|HM-CC-RT-DN)/){ $md =~ /(-TC|ROTO_ZEL-STG-RM-FWT|HM-CC-RT-DN)/){
$attr{$name}{stateFormat} = "last:trigLast"; $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 # -+-+-+-+-+ add default web-commands
my $webCmd; my $webCmd;
$webCmd = AttrVal($name,"webCmd",undef); $webCmd = AttrVal($name,"webCmd",undef);
@ -718,7 +717,8 @@ sub CUL_HM_hmInitMsg($){ #define device init msg for HMLAN
my @p; my @p;
if (!($rxt & ~0x04)){@p = ("00","01","FE1F");}#config only if (!($rxt & ~0x04)){@p = ("00","01","FE1F");}#config only
elsif($rxt & 0x10) {@p = ("00","01","1E"); }#lazyConfig 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)){ if (AttrVal($hash->{NAME},"aesCommReq",0)){
$p[0] = sprintf("%02X",($p[0] + 1)); $p[0] = sprintf("%02X",($p[0] + 1));
$p[2] = ($p[2]eq "")?"1E":$p[2]; $p[2] = ($p[2]eq "")?"1E":$p[2];