FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-07 06:48:43 +00:00
Code Issues Releases Wiki Activity

47_OBIS: Corrected buffer-glitch

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11029 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
icinger 2016-03-08 19:32:10 +00:00
parent 7ac4b269d6
commit d8212e1df8
1 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/47_OBIS.pm
View File

@ -165,17 +165,16 @@ sub OBIS_Parse($$)
my $rmsg="";
$rmsg = substr($hash->{helper}{BUFFER}, 0, index($hash->{helper}{BUFFER},chr(13).chr(10)));
Log3 $hash,5,"OBIS ($name) - Msg-Parse: $rmsg";
if($rmsg=~/\/.*|\d-\d{1,3}:\d{1,3}.\d{1,3}.\d{1,3}\*\d{1,3}\(.*?\)|!/) {
if($rmsg=~/^([23456789]+)-.*/) {
Log3 $hash,3,"OBIS ($name) - Unknown OBIS-Message, please report: $rmsg";
}
# End of Message
# End of Message
if ($rmsg=~/!.*/) {
$hash->{helper}{EoM}+=1 if ($hash->{helper}{DEVICES}[1]>0);
}
#Version
#Version
if ($rmsg=~ /.*\/(.*)/) {
DevIo_SimpleWrite($hash,$hash->{helper}{DEVICES}[2],undef) if (!$hash->{helper}{DEVICES}[2] eq "");
if (ReadingsVal($name,"Version","") ne $1) {readingsBulkUpdate($hash, "Version" ,$1); }
@ -207,9 +206,9 @@ sub OBIS_Parse($$)
}
}
}
}
$hash->{helper}{BUFFER} = substr($hash->{helper}{BUFFER}, index($hash->{helper}{BUFFER},chr(13).chr(10))+2);;
# $hash->{helper}{BUFFER} =~ s/^.*\r\n(.*)/$1/g;
# Log 3,"Buffer is now: $hash->{helper}{BUFFER}";
if($hash->{helper}{EoM}==1) { last;}
}
readingsEndUpdate($hash,1);
# Log 3,"Size of Buffer: ".length($hash->{helper}{BUFFER});