FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

fhem.pl: fix event-on-change-reading for complex readings (Forum #62190)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12729 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-12-09 12:48:50 +00:00
parent 5ce0495a1a
commit 256303f773
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/fhem.pl
View File

@ -4179,26 +4179,18 @@ readingsBulkUpdate($$$@)
if( $eocr
&& $eocrv[0] =~ m/.*:(.*)/ ) {
my $threshold = $1;
my $ov = $value;
$value =~ s/[^\d\.\-eE]//g; # We expect only numbers here.
my $isNum = looks_like_number($value);
if(!$isNum) { # Forum #41083
$value = $ov;
$value =~ s/[^\d\.\-]//g;
$isNum = looks_like_number($value);
}
if($isNum) {
if($value =~ m/([\d\.\-eE]+)/ && looks_like_number($1)) { #41083, #62190
my $mv = $1;
my $last_value = $hash->{".attreocr-threshold$reading"};
if( !defined($last_value) ) {
$hash->{".attreocr-threshold$reading"} = $value;
} elsif( abs($value-$last_value) < $threshold ) {
$hash->{".attreocr-threshold$reading"} = $mv;
} elsif( abs($mv - $last_value) < $threshold ) {
$eocr = 0;
} else {
$hash->{".attreocr-threshold$reading"} = $value;
$hash->{".attreocr-threshold$reading"} = $mv;
}
}
$value = $ov;
}
# determine if an event should be created: