FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

LUXTRONIK2: Bugfix reset of power estimation on day change

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@5758 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-05-06 04:18:59 +00:00
parent f0cddb4fb1
commit 98b8891fcf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/23_LUXTRONIK2.pm
View File

@ -754,7 +754,7 @@ LUXTRONIK2_UpdateDone($)
if ($a[3] =~ /^(0|5|16)$/ ) { if ($a[3] =~ /^(0|5|16)$/ ) {
$thermalPower = abs($flowTemperature - $returnTemperature) * $a[19] / 866.65; $thermalPower = abs($flowTemperature - $returnTemperature) * $a[19] / 866.65;
$heatPumpPower = AttrVal($name, "heatPumpElectricalPowerWatt", -1); $heatPumpPower = AttrVal($name, "heatPumpElectricalPowerWatt", -1);
$heatPumpPower *= 1 + ($flowTemperature-35) * AttrVal($name, "heatPumpElectricalPowerFactor", 0); $heatPumpPower *= (1 + ($flowTemperature-35) * AttrVal($name, "heatPumpElectricalPowerFactor", 0));
} }
readingsBulkUpdate( $hash, "thermalPower", sprintf "%.1f", $thermalPower); readingsBulkUpdate( $hash, "thermalPower", sprintf "%.1f", $thermalPower);
if ($heatPumpPower >-1 ) { readingsBulkUpdate( $hash, "heatPumpElectricalPowerEstimated", sprintf "%.0f", $heatPumpPower); } if ($heatPumpPower >-1 ) { readingsBulkUpdate( $hash, "heatPumpElectricalPowerEstimated", sprintf "%.0f", $heatPumpPower); }
@ -1602,10 +1602,10 @@ LUXTRONIK2_doStatisticDelta ($$$$$)
my $activeTariff = ReadingsVal($name,"activeTariff",0); my $activeTariff = ReadingsVal($name,"activeTariff",0);
if ( $electricalPower != 0 ) { if ( $electricalPower >0 || ($electricalPower == 0 && $periodSwitch > 0) ) {
my $readingNamePower = $readingName; my $readingNamePower = $readingName;
$readingNamePower =~ s/Hours/Electricity/ ; $readingNamePower =~ s/Hours/Electricity/ ;
if ($electricalPower > 0) { if ($activeTariff > 0) {
foreach (1,2,3,4,5,6,7,8,9) { foreach (1,2,3,4,5,6,7,8,9) {
if ( $previousTariff == $_ ) { if ( $previousTariff == $_ ) {
LUXTRONIK2_doStatisticDeltaSingle ($hash, $readingNamePower."Tariff".$_, $deltaValue * $electricalPower, $factor, $periodSwitch, $showDate); LUXTRONIK2_doStatisticDeltaSingle ($hash, $readingNamePower."Tariff".$_, $deltaValue * $electricalPower, $factor, $periodSwitch, $showDate);
@ -1613,6 +1613,8 @@ LUXTRONIK2_doStatisticDelta ($$$$$)
LUXTRONIK2_doStatisticDeltaSingle ($hash, $readingNamePower."Tariff".$_, 0, $factor, $periodSwitch, $showDate); LUXTRONIK2_doStatisticDeltaSingle ($hash, $readingNamePower."Tariff".$_, 0, $factor, $periodSwitch, $showDate);
} }
} }
} else {
LUXTRONIK2_doStatisticDeltaSingle ($hash, $readingNamePower, $deltaValue * $electricalPower, $factor, $periodSwitch, $showDate);
} }
} }
# Hidden storage of current values for next call(before values) # Hidden storage of current values for next call(before values)