Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

initialization order fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@5570 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-04-19 19:27:02 +00:00
parent 9bcd5dbb27
commit f031eee09d
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
FHEM/36_JeeLink.pm
View File

@ -172,8 +172,6 @@ JeeLink_Set($@)
if($cmd eq "raw") { if($cmd eq "raw") {
#return "\"set JeeLink $cmd\" needs exactly one parameter" if(@_ != 4);
#return "Expecting a even length hex number" if((length($arg)&1) == 1 || $arg !~ m/^[\dA-F]{12,}$/ );
Log3 $name, 4, "set $name $cmd $arg"; Log3 $name, 4, "set $name $cmd $arg";
JeeLink_SimpleWrite($hash, $arg); JeeLink_SimpleWrite($hash, $arg);
@ -330,11 +328,6 @@ JeeLink_DoInit($)
$hash->{STATE} = "Opened"; $hash->{STATE} = "Opened";
#Reset JeeNode and set quite mode
JeeLink_SimpleWrite($hash, "o");
sleep(2);
JeeLink_SimpleWrite($hash, "q1"); # turn quiet mode on
# Reset the counter # Reset the counter
delete($hash->{XMIT_TIME}); delete($hash->{XMIT_TIME});
delete($hash->{NR_CMD_LAST_H}); delete($hash->{NR_CMD_LAST_H});
@ -578,6 +571,9 @@ JeeLink_Parse($$$$)
} elsif( $dmsg =~m /JeeNode -- HomeControl -/ ) { } elsif( $dmsg =~m /JeeNode -- HomeControl -/ ) {
$hash->{MatchList} = \%matchListJeeLink433 if($dmsg =~ m/433MHz/); $hash->{MatchList} = \%matchListJeeLink433 if($dmsg =~ m/433MHz/);
$hash->{MatchList} = \%matchListJeeLink868 if($dmsg =~ m/868MHz/); $hash->{MatchList} = \%matchListJeeLink868 if($dmsg =~ m/868MHz/);
#Reset JeeNode and set quite mode
JeeLink_SimpleWrite($hash, "o");
sleep(2);
JeeLink_SimpleWrite($hash, "q1"); # turn quiet mode on JeeLink_SimpleWrite($hash, "q1"); # turn quiet mode on
JeeLink_SimpleWrite($hash, "a0"); # turn activity led off JeeLink_SimpleWrite($hash, "a0"); # turn activity led off
JeeLink_SimpleWrite($hash, "f"); # get RFM frequence config JeeLink_SimpleWrite($hash, "f"); # get RFM frequence config
@ -597,7 +593,7 @@ JeeLink_Parse($$$$)
return; return;
} elsif( $dmsg =~ m/drecvintr exit/ ) { } elsif( $dmsg =~ m/drecvintr exit/ ) {
JeeLink_SimpleWrite($hash, "ec", 1); JeeLink_SimpleWrite($hash, "ec");
return; return;
} }
@ -731,9 +727,9 @@ JeeLink_Attr(@)
if( $aName eq "Clients" ) { if( $aName eq "Clients" ) {
$hash->{Clients} = $aVal; $hash->{Clients} = $aVal;
$hash->{Clients} = $clientsJeeLink if( !$hash->{Clients}) ; $hash->{Clients} = $clientsJeeLink if( !$hash->{Clients}) ;
} elsif( $aName =~ "MatchList" ) { } elsif( $aName eq "MatchList" ) {
$hash->{MatchList} = $aVal; $hash->{MatchList} = $aVal;
$hash->{MatchList} = \%matchListPCA301 if( !$hash->{Clients} ); $hash->{MatchList} = \%matchListPCA301 if( !$hash->{MatchList} );
} elsif($aName =~ m/^tune/i) { #tune attribute freq / rx:bWidth / rx:rAmpl / rx:sens / tx:deviation / tx:power } elsif($aName =~ m/^tune/i) { #tune attribute freq / rx:bWidth / rx:rAmpl / rx:sens / tx:deviation / tx:power
# Frequenze: Fc =860+ F x0.0050MHz # Frequenze: Fc =860+ F x0.0050MHz
# LNA Gain [dB] = MAX -6, -14, -20 # LNA Gain [dB] = MAX -6, -14, -20