mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RSSI fixed

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@865 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2011-03-15 16:27:31 +00:00
parent 091c790f03
commit ca66d6e64d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
FHEM/00_HMLAN.pm
View File

@@ -255,21 +255,21 @@ HMLAN_Parse($$)
{ {
my ($hash, $rmsg) = @_; my ($hash, $rmsg) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $rssi;
my $ll5 = GetLogLevel($name,5); my $ll5 = GetLogLevel($name,5);
my ($src, $status, $msec, $d2, $rssi, $msg);
my $dmsg = $rmsg; my $dmsg = $rmsg;
Log $ll5, "HMLAN $rmsg"; Log $ll5, "HMLAN $rmsg";
if($rmsg =~ m/^E(......),(....),(........),(..),(....),(.*)/) { if($rmsg =~ m/^E(......),(....),(........),(..),(....),(.*)/) {
my ($src, $d1, $msec, $d2, $rssi, $msg) = ($src, $status, $msec, $d2, $rssi, $msg) =
($1, $2, $3, $4, $5, $6); ($1, $2, $3, $4, $5, $6);
$dmsg = sprintf("A%02X%s", length($msg)/2, uc($msg)); $dmsg = sprintf("A%02X%s", length($msg)/2, uc($msg));
$hash->{uptime} = HMLAN_uptime($msec); $hash->{uptime} = HMLAN_uptime($msec);
} elsif($rmsg =~ m/^R(........),(....),(........),(..),(....),(.*)/) { } elsif($rmsg =~ m/^R(........),(....),(........),(..),(....),(.*)/) {
my ($src, $status, $msec, $d2, $rssi, $msg) = ($src, $status, $msec, $d2, $rssi, $msg) =
($1, $2, $3, $4, $5, $6); ($1, $2, $3, $4, $5, $6);
$dmsg = sprintf("A%02X%s", length($msg)/2, uc($msg)); $dmsg = sprintf("A%02X%s", length($msg)/2, uc($msg));
$dmsg .= "NACK" if($status !~ m/...1/); $dmsg .= "NACK" if($status !~ m/...1/);
@@ -301,6 +301,7 @@ HMLAN_Parse($$)
$hash->{RAWMSG} = $rmsg; $hash->{RAWMSG} = $rmsg;
my %addvals = (RAWMSG => $rmsg); my %addvals = (RAWMSG => $rmsg);
if(defined($rssi)) { if(defined($rssi)) {
$rssi = hex($rssi)-65536;
$hash->{RSSI} = $rssi; $hash->{RSSI} = $rssi;
$addvals{RSSI} = $rssi; $addvals{RSSI} = $rssi;
} }