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

units for energy removed in Readings

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4774 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
wherzig 2014-01-30 18:36:50 +00:00
parent 7cfab17464
commit 9051841eed
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/46_TRX_WEATHER.pm
View File

@ -1280,7 +1280,8 @@ TRX_WEATHER_Parse($$)
$val .= "ECUR: ".$energy_current." "; $val .= "ECUR: ".$energy_current." ";
$sensor = "energy_current"; $sensor = "energy_current";
readingsBulkUpdate($def, $sensor, $energy_current." ".$i->{units}); #readingsBulkUpdate($def, $sensor, $energy_current." ".$i->{units});
readingsBulkUpdate($def, $sensor, $energy_current);
} }
elsif ($i->{type} eq "energy_ch1") { elsif ($i->{type} eq "energy_ch1") {
my $energy_current = $i->{current}; my $energy_current = $i->{current};
@ -1322,13 +1323,14 @@ TRX_WEATHER_Parse($$)
my $energy_total = $i->{current}; my $energy_total = $i->{current};
if (defined($def->{scale_total}) && defined($def->{add_total})) { if (defined($def->{scale_total}) && defined($def->{add_total})) {
$energy_total = sprintf("%.4f",$energy_total * $def->{scale_total} + $def->{add_total}); $energy_total = sprintf("%.4f",$energy_total * $def->{scale_total} + $def->{add_total});
Log3 $name, 1, "TRX_WEATHER: name=$name device=$device_name energy_total scale_total=".$def->{scale_total}; Log3 $name, 5, "TRX_WEATHER: name=$name device=$device_name energy_total scale_total=".$def->{scale_total};
} }
Log3 $name, 5, "TRX_WEATHER: name=$name device=$device_name energy_total=$energy_total"; Log3 $name, 5, "TRX_WEATHER: name=$name device=$device_name energy_total=$energy_total";
$val .= "ESUM: ".$energy_total." "; $val .= "ESUM: ".$energy_total." ";
$sensor = "energy_total"; $sensor = "energy_total";
readingsBulkUpdate($def, $sensor, $energy_total." ".$i->{units}); #readingsBulkUpdate($def, $sensor, $energy_total." ".$i->{units});
readingsBulkUpdate($def, $sensor, $energy_total);
} }
elsif ($i->{type} eq "weight") { elsif ($i->{type} eq "weight") {
Log3 $name, 5, "TRX_WEATHER: name=$name device=$device_name weight ".$i->{current}; Log3 $name, 5, "TRX_WEATHER: name=$name device=$device_name weight ".$i->{current};