2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00

initialization order fix

git-svn-id: https://svn.fhem.de/fhem/trunk@5570 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2014-04-19 19:27:02 +00:00
parent f7bb97c3d9
commit 63e8a87c45

View File

@ -172,8 +172,6 @@ JeeLink_Set($@)
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";
JeeLink_SimpleWrite($hash, $arg);
@ -330,11 +328,6 @@ JeeLink_DoInit($)
$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
delete($hash->{XMIT_TIME});
delete($hash->{NR_CMD_LAST_H});
@ -578,10 +571,13 @@ JeeLink_Parse($$$$)
} elsif( $dmsg =~m /JeeNode -- HomeControl -/ ) {
$hash->{MatchList} = \%matchListJeeLink433 if($dmsg =~ m/433MHz/);
$hash->{MatchList} = \%matchListJeeLink868 if($dmsg =~ m/868MHz/);
JeeLink_SimpleWrite($hash, "q1"); # turn quiet mode on
JeeLink_SimpleWrite($hash, "a0"); # turn activity led off
JeeLink_SimpleWrite($hash, "f"); # get RFM frequence config
JeeLink_SimpleWrite($hash, "m"); # show used ram on jeenode
#Reset JeeNode and set quite mode
JeeLink_SimpleWrite($hash, "o");
sleep(2);
JeeLink_SimpleWrite($hash, "q1"); # turn quiet mode on
JeeLink_SimpleWrite($hash, "a0"); # turn activity led off
JeeLink_SimpleWrite($hash, "f"); # get RFM frequence config
JeeLink_SimpleWrite($hash, "m"); # show used ram on jeenode
}
$hash->{STATE} = "Initialized";
}
@ -597,7 +593,7 @@ JeeLink_Parse($$$$)
return;
} elsif( $dmsg =~ m/drecvintr exit/ ) {
JeeLink_SimpleWrite($hash, "ec", 1);
JeeLink_SimpleWrite($hash, "ec");
return;
}
@ -731,9 +727,9 @@ JeeLink_Attr(@)
if( $aName eq "Clients" ) {
$hash->{Clients} = $aVal;
$hash->{Clients} = $clientsJeeLink if( !$hash->{Clients}) ;
} elsif( $aName =~ "MatchList" ) {
} elsif( $aName eq "MatchList" ) {
$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
# Frequenze: Fc =860+ F x0.0050MHz
# LNA Gain [dB] = MAX -6, -14, -20