Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

19_Revolt: Remove avgpower reading which seemingly never worked correct.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@17440 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
gernot-h 2018-09-30 20:36:39 +00:00
parent f6d56ff387
commit ed127e699c
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FHEM/19_Revolt.pm
View File

@ -43,7 +43,7 @@ sub Revolt_Define($$)
AssignIoPort($hash); AssignIoPort($hash);
my $name = $a[0]; my $name = $a[0];
$attr{$name}{"event-aggregator"} = "power::none:median:120,energy::none:median:120,avgpower::none:median:120" if(!defined($attr{$name}{"event-aggregator"})); $attr{$name}{"event-aggregator"} = "power::none:median:120,energy::none:median:120" if(!defined($attr{$name}{"event-aggregator"}));
$attr{$name}{"stateFormat"} = "P: power E: energy V: voltage C: current Pf: pf" if(!defined($attr{$name}{"stateFormat"})); $attr{$name}{"stateFormat"} = "P: power E: energy V: voltage C: current Pf: pf" if(!defined($attr{$name}{"stateFormat"}));
return undef; return undef;
@ -126,10 +126,7 @@ sub Revolt_Parse($$)
my $timediff = gettimeofday() - str2time($def->{READINGS}{".lastenergy"}{TIME}); my $timediff = gettimeofday() - str2time($def->{READINGS}{".lastenergy"}{TIME});
if (($lastval != $energy) && (($energy - $lastval) < (3.65 * ($timediff / 3600.0)))) { if (($lastval != $energy) && (($energy - $lastval) < (3.65 * ($timediff / 3600.0)))) {
my $avg = (($energy - $lastval) * 1000.0 * 3600.0) / $timediff;
readingsBulkUpdate($def, ".lastenergy", $energy, 1); readingsBulkUpdate($def, ".lastenergy", $energy, 1);
readingsBulkUpdate($def, "avgpower", sprintf("%.2f", $avg), 1);
#Log3 $def,3, "$name:timediff $timediff, lastval $lastval, energy $energy, avg $avg";
} }
readingsBulkUpdate($def, "state", "active", 0); readingsBulkUpdate($def, "state", "active", 0);
@ -178,7 +175,6 @@ sub Revolt_Parse($$)
<a name="RevoltReadings"></a> <a name="RevoltReadings"></a>
<b>Readings</b> <b>Readings</b>
<ul> <ul>
<li>avgpower [W]</li>
<li>energy [kWh]</li> <li>energy [kWh]</li>
<li>power [W]</li> <li>power [W]</li>
<li>voltage [V]</li> <li>voltage [V]</li>