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

Fix for slow fhem-hosts (data is delivered faster, then it is parsed)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@1784 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig
2012-08-04 08:11:57 +00:00
parent de13ab6cfd
commit 243545e3a1
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
fhem/FHEM/00_TCM.pm
View File

@@ -192,14 +192,16 @@ TCM_Read($)
############################# #############################
if($hash->{MODEL} == 120) { if($hash->{MODEL} == 120) {
if($data =~ m/^A55A(.B.{20})(..)/) {
while($data =~ m/^A55A(.B.{20})(..)/) {
my ($net, $crc) = ($1, $2); my ($net, $crc) = ($1, $2);
my $mycrc = TCM_CSUM($net); my $mycrc = TCM_CSUM($net);
$hash->{PARTIAL} = substr($data, 28); my $rest = substr($data, 28);
if($crc ne $mycrc) { if($crc ne $mycrc) {
Log $ll2, "$name: wrong checksum: got $crc, computed $mycrc" ; Log $ll2, "$name: wrong checksum: got $crc, computed $mycrc" ;
return; $data = $rest;
next;
} }
# Receive Radio Telegram (RRT) # Receive Radio Telegram (RRT)
@@ -219,28 +221,24 @@ TCM_Read($)
TCM_Parse120($hash, $net, 0); TCM_Parse120($hash, $net, 0);
} }
$data = $rest;
}
if(length($data) >= 4) {
} else { $data =~ s/.*A55A/A55A/ if($data !~ m/^A55A/);
if(length($data) >= 4) { $data = "" if($data !~ m/^A55A/);
$data =~ s/.*A55A/A55A/ if($data !~ m/^A55A/);
$data = "" if($data !~ m/^A55A/);
}
$hash->{PARTIAL} = $data;
} }
############################# #############################
} else { # TCM310 / ESP3 } else { # TCM310 / ESP3
if($data =~ m/^55(....)(..)(..)(..)/) {
while($data =~ m/^55(....)(..)(..)(..)/) {
my ($l1, $l2, $t, $crc) = (hex($1), hex($2), $3, $4); my ($l1, $l2, $t, $crc) = (hex($1), hex($2), $3, $4);
my $tlen = 2*(7+$l1+$l2); my $tlen = 2*(7+$l1+$l2);
if(length($data) < $tlen) { last if(length($data) < $tlen);
$hash->{PARTIAL} = $data;
return; my $rest = substr($data, $tlen);
}
$hash->{PARTIAL} = substr($data, $tlen);
$data = substr($data, 0, $tlen); $data = substr($data, 0, $tlen);
my $hdr = substr($data, 2, 8); my $hdr = substr($data, 2, 8);
@@ -250,13 +248,15 @@ TCM_Read($)
my $mycrc = TCM_CRC8($hdr); my $mycrc = TCM_CRC8($hdr);
if($mycrc ne $crc) { if($mycrc ne $crc) {
Log $ll2, "$name: wrong header checksum: got $crc, computed $mycrc" ; Log $ll2, "$name: wrong header checksum: got $crc, computed $mycrc" ;
return; $data = $rest;
next;
} }
$mycrc = TCM_CRC8($mdata . $odata); $mycrc = TCM_CRC8($mdata . $odata);
$crc = substr($data, -2); $crc = substr($data, -2);
if($mycrc ne $crc) { if($mycrc ne $crc) {
Log $ll2, "$name: wrong data checksum: got $crc, computed $mycrc" ; Log $ll2, "$name: wrong data checksum: got $crc, computed $mycrc" ;
return; $data = $rest;
next;
} }
if($t eq "01") { # Radio if($t eq "01") { # Radio
@@ -287,17 +287,16 @@ TCM_Read($)
} }
} else { $data = $rest;
if(length($data) >= 4) {
$data =~ s/.*55/55/ if($data !~ m/^55/);
$data = "" if($data !~ m/^55/);
}
$hash->{PARTIAL} = $data;
} }
if(length($data) >= 4) {
$data =~ s/.*55/55/ if($data !~ m/^55/);
$data = "" if($data !~ m/^55/);
}
} }
$hash->{PARTIAL} = $data;
} }
##################################### #####################################