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

fhem.pl: reformat to 80-char

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11655 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-06-13 16:52:23 +00:00
parent 8313f00991
commit 6a3349ce24
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/fhem.pl
View File

@ -4093,7 +4093,8 @@ readingsBulkUpdate($$$@)
if( $attreocr ) { if( $attreocr ) {
if( my $attrtocr = $hash->{".attrtocr"} ) { if( my $attrtocr = $hash->{".attrtocr"} ) {
$update_timestamp = $changed if( $attrtocr && grep($reading =~ m/^$_$/, @{$attrtocr}) ); $update_timestamp = $changed
if( $attrtocr && grep($reading =~ m/^$_$/, @{$attrtocr}) );
} }
} }
@ -4106,13 +4107,15 @@ readingsBulkUpdate($$$@)
($reading=~ m/^$l$/) ? $_ : undef} @{$hash->{".attraggr"}}; ($reading=~ m/^$l$/) ? $_ : undef} @{$hash->{".attraggr"}};
if(@v) { if(@v) {
# e.g. power:20:linear:avg # e.g. power:20:linear:avg
my (undef, $duration, $method, $function, $holdTime) = split(":", $v[0], 5); my (undef,$duration,$method,$function,$holdTime) = split(":", $v[0], 5);
my $ts; my $ts;
if(defined($readings->{".ts"})) { if(defined($readings->{".ts"})) {
$ts= $readings->{".ts"}; $ts= $readings->{".ts"};
} else { } else {
require "TimeSeries.pm"; require "TimeSeries.pm";
$ts= TimeSeries->new( { method => $method, autoreset => $duration, holdTime => $holdTime } ); $ts= TimeSeries->new( { method => $method,
autoreset => $duration,
holdTime => $holdTime } );
$readings->{".ts"}= $ts; $readings->{".ts"}= $ts;
# access from command line: # access from command line:
# { $defs{"myClient"}{READINGS}{"myValue"}{".ts"}{max} } # { $defs{"myClient"}{READINGS}{"myValue"}{".ts"}{max} }
@ -4130,7 +4133,8 @@ readingsBulkUpdate($$$@)
} }
setReadingsVal($hash, $reading, $value, $hash->{".updateTimestamp"}) if( $update_timestamp ); setReadingsVal($hash, $reading, $value, $hash->{".updateTimestamp"})
if($update_timestamp);
my $rv = "$reading: $value"; my $rv = "$reading: $value";
if($changed) { if($changed) {