FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

- Pest Jun 18, 20:06:23 MEST 2007

Browse Source 
- in 62_EMEM.pm: Power units removed from value content added to name.


git-svn-id: https://svn.fhem.de/fhem/trunk@78 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
pest 2007-06-18 18:08:00 +00:00
parent a1f822494d
commit 3fea70d919
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fhem/FHEM/62_EMEM.pm
View File

@ -60,13 +60,13 @@ EMEM_GetStatus($)
} }
my %vals; my %vals;
$vals{"5min_pulses"} = $pulses; $vals{"5min_pulses"} = $pulses;
$vals{"energy"} = sprintf("%0.3f kWh/h", dw($d,33) / $iec); $vals{"energy_kWh_h"} = sprintf("%0.3f", dw($d,33) / $iec);
$vals{"energy_today"} = sprintf("%0.3f kWh/d", dw($d,37) / $iec); $vals{"energy_today_kWh_d"} = sprintf("%0.3f", dw($d,37) / $iec);
$vals{"energy_total"} = sprintf("%0.3f kWh (total)", dw($d,41) / $iec); $vals{"energy_total_kWh"} = sprintf("%0.3f", dw($d,41) / $iec);
$vals{"power"} = sprintf("%.3f", $cur_power); $vals{"power_kW"} = sprintf("%.3f", $cur_power);
$vals{"alarm_PA"} = w($d,45) . " Watt"; $vals{"alarm_PA_W"} = w($d,45);
$vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000); $vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000);
my $tn = TimeNow(); my $tn = TimeNow();
@ -83,7 +83,7 @@ EMEM_GetStatus($)
} }
$hash->{STATE} = "$cur_power kWh"; $hash->{STATE} = "$cur_power kWh";
Log GetLogLevel($name,4), "EMEM $name: $cur_power kWh / $vals{energy} kWh/h"; Log GetLogLevel($name,4), "EMEM $name: $cur_power kW / $vals{energy_kWh_h} kWh/h";
return $hash->{STATE}; return $hash->{STATE};
} }

3
fhem/HISTORY
View File

@ -116,3 +116,6 @@
- Pest Jun 12, 21:33:00 MEST 2007 - Pest Jun 12, 21:33:00 MEST 2007
- in 62_EMEM.pm: added energy_today and energy_total - in 62_EMEM.pm: added energy_today and energy_total
- Pest Jun 18, 20:06:23 MEST 2007
- in 62_EMEM.pm: Power units removed from value content added to name.