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

fhem.pl: event-aggregator attribute from Boris (Forum #31856)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7714 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-25 15:24:49 +00:00
parent 720a9e5519
commit d7cc9c4532
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fhem/fhem.pl
View File

@ -36,7 +36,6 @@ use IO::Socket;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
use Errno qw(:POSIX); use Errno qw(:POSIX);
################################################## ##################################################
# Forward declarations # Forward declarations
# #
@ -260,7 +259,7 @@ $modules{Global}{AttrFn} = "GlobalAttr";
use vars qw($readingFnAttributes); use vars qw($readingFnAttributes);
$readingFnAttributes = "event-on-change-reading event-on-update-reading ". $readingFnAttributes = "event-on-change-reading event-on-update-reading ".
"event-min-interval stateFormat"; "event-aggregator event-min-interval stateFormat";
%cmds = ( %cmds = (
@ -3507,6 +3506,12 @@ readingsBeginUpdate($)
$hash->{".attrminint"} = \@a; $hash->{".attrminint"} = \@a;
} }
my $attraggr = AttrVal($name, "event-aggregator", undef);
if($attraggr) {
my @a = split(/,/,$attraggr);
$hash->{".attraggr"} = \@a;
}
my $attreocr= AttrVal($name, "event-on-change-reading", undef); my $attreocr= AttrVal($name, "event-on-change-reading", undef);
if($attreocr) { if($attreocr) {
my @a = split(/,/,$attreocr); my @a = split(/,/,$attreocr);
@ -3633,6 +3638,7 @@ readingsEndUpdate($$)
delete $hash->{".updateTime"}; delete $hash->{".updateTime"};
delete $hash->{".attreour"}; delete $hash->{".attreour"};
delete $hash->{".attreocr"}; delete $hash->{".attreocr"};
delete $hash->{".attraggr"};
delete $hash->{".attrminint"}; delete $hash->{".attrminint"};
@ -3733,8 +3739,39 @@ readingsBulkUpdate($$$@)
$changed = 1 if($eocr); $changed = 1 if($eocr);
} }
} }
} }
if($changed) {
#Debug "Processing $reading: $value";
my @v = grep { my $l = $_;
$l =~ s/:.*//;
($reading=~ m/^$l$/) ? $_ : undef} @{$hash->{".attraggr"}};
if(@v) {
# e.g. power:20:linear:avg
my (undef, $duration, $method, $function) = split(":", $v[0], 4);
my $ts;
if(defined($readings->{".ts"})) {
$ts= $readings->{".ts"};
} else {
require "TimeSeries.pm";
$ts= TimeSeries->new( { method => $method, autoreset => $duration } );
$readings->{".ts"}= $ts;
# access from command line:
# { $defs{"myClient"}{READINGS}{"myValue"}{".ts"}{max} }
#Debug "TimeSeries created.";
}
my $now = $hash->{".updateTime"};
$changed= $ts->elapsed($now);
$value= $ts->{$function} if($changed);
$ts->add($now, $value);
} else {
# If no event-aggregator attribute, then remove stale series if any.
delete $readings->{".ts"};
}
}
setReadingsVal($hash, $reading, $value, $hash->{".updateTimestamp"}); setReadingsVal($hash, $reading, $value, $hash->{".updateTimestamp"});
my $rv = "$reading: $value"; my $rv = "$reading: $value";