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

fhem.pl: better float check for event-on-change-reading:threshold (Forum #41083)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9286 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-09-22 07:24:46 +00:00
parent b402135568
commit 824b86c72b
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/fhem.pl
View File

@ -3865,9 +3865,9 @@ readingsBulkUpdate($$$@)
my $attreour = $hash->{".attreour"};
# determine whether the reading is listed in any of the attributes
my $eocr = $attreocr && (my @eocrv=grep { my $l = $_;
$l =~ s/:.*//;
($reading=~ m/^$l$/) ? $_ : undef} @{$attreocr});
my $eocr = $attreocr &&
( my @eocrv = grep { my $l = $_; $l =~ s/:.*//;
($reading=~ m/^$l$/) ? $_ : undef} @{$attreocr});
my $eour = $attreour && grep($reading =~ m/^$_$/, @{$attreour});
# check if threshold is given
@ -3875,15 +3875,26 @@ readingsBulkUpdate($$$@)
if( $eocr
&& $eocrv[0] =~ m/.*:(.*)/ ) {
my $threshold = $1;
my $ov = $value;
$value =~ s/[^\d\.\-]//g; # We expect only numbers here.
my $last_value = $hash->{".attreocr-threshold$reading"};
if( !defined($last_value) ) {
$hash->{".attreocr-threshold$reading"} = $value;
} elsif( abs($value-$last_value) < $threshold ) {
$eocr = 0;
$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) {
my $last_value = $hash->{".attreocr-threshold$reading"};
if( !defined($last_value) ) {
$hash->{".attreocr-threshold$reading"} = $value;
} elsif( abs($value-$last_value) < $threshold ) {
$eocr = 0;
} else {
$hash->{".attreocr-threshold$reading"} = $value;
}
} else {
$hash->{".attreocr-threshold$reading"} = $value;
$value = $ov;
}
}