From 3fea70d919e1b037aef38b96a504cc4e702133c0 Mon Sep 17 00:00:00 2001
From: pest <>
Date: Mon, 18 Jun 2007 18:08:00 +0000
Subject: [PATCH] - Pest Jun 18, 20:06:23 MEST 2007   - 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
---
 fhem/FHEM/62_EMEM.pm | 16 ++++++++--------
 fhem/HISTORY         |  3 +++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/62_EMEM.pm b/fhem/FHEM/62_EMEM.pm
index d0aa97446..3d45a3977 100755
--- a/fhem/FHEM/62_EMEM.pm
+++ b/fhem/FHEM/62_EMEM.pm
@@ -60,13 +60,13 @@ EMEM_GetStatus($)
   }
 
   my %vals;
-  $vals{"5min_pulses"} = $pulses;
-  $vals{"energy"} = sprintf("%0.3f kWh/h", dw($d,33) / $iec);
-  $vals{"energy_today"} = sprintf("%0.3f kWh/d", dw($d,37) / $iec);
-  $vals{"energy_total"} = sprintf("%0.3f kWh (total)", dw($d,41) / $iec);
-  $vals{"power"} = sprintf("%.3f", $cur_power);
-  $vals{"alarm_PA"} = w($d,45) . " Watt";
-  $vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000);
+  $vals{"5min_pulses"}        = $pulses;
+  $vals{"energy_kWh_h"}       = sprintf("%0.3f", dw($d,33) / $iec);
+  $vals{"energy_today_kWh_d"} = sprintf("%0.3f", dw($d,37) / $iec);
+  $vals{"energy_total_kWh"}   = sprintf("%0.3f", dw($d,41) / $iec);
+  $vals{"power_kW"}           = sprintf("%.3f", $cur_power);
+  $vals{"alarm_PA_W"}         = w($d,45);
+  $vals{"price_CF"}           = sprintf("%.3f", w($d,47)/10000);
 
 
   my $tn = TimeNow();
@@ -83,7 +83,7 @@ EMEM_GetStatus($)
   }
 
   $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};
 }
diff --git a/fhem/HISTORY b/fhem/HISTORY
index b40372841..d2bc6b8fd 100644
--- a/fhem/HISTORY
+++ b/fhem/HISTORY
@@ -116,3 +116,6 @@
 
 - Pest Jun 12, 21:33:00 MEST 2007
   - 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.