From 744e907d1ef06ad590cab9454704230d362350c2 Mon Sep 17 00:00:00 2001
From: pest <>
Date: Mon, 28 May 2007 22:07:59 +0000
Subject: [PATCH] Pest: Forgot to check in changes of 60_EM.pm to make
 62_EMEM.pm work. Now it's in.

git-svn-id: https://svn.fhem.de/fhem/trunk@69 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/60_EM.pm   |  2 +-
 fhem/FHEM/62_EMEM.pm | 11 +----------
 fhem/HISTORY         |  3 +++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/fhem/FHEM/60_EM.pm b/fhem/FHEM/60_EM.pm
index 3887cb971..1363a798a 100755
--- a/fhem/FHEM/60_EM.pm
+++ b/fhem/FHEM/60_EM.pm
@@ -21,7 +21,7 @@ EM_Initialize($)
 
 # Provider
   $hash->{WriteFn} = "EM_Write";
-  $hash->{Clients} = ":EMWZ:";
+  $hash->{Clients} = ":EMWZ:EMEM:";
 
 # Consumer
   $hash->{DefFn}   = "EM_Define";
diff --git a/fhem/FHEM/62_EMEM.pm b/fhem/FHEM/62_EMEM.pm
index 56c3c7e23..ef3c98695 100755
--- a/fhem/FHEM/62_EMEM.pm
+++ b/fhem/FHEM/62_EMEM.pm
@@ -37,12 +37,11 @@ EMEM_GetStatus($)
 
   my $d = IOWrite($hash, sprintf("7a%02x", $dnr-1));
   if(!defined($d)) {
-    my $msg = "EMWZ $name read error";
+    my $msg = "EMEM $name read error";
     Log GetLogLevel($name,2), $msg;
     return $msg;
   }
 
-
   if($d eq ((pack('H*',"00") x 45) . pack('H*',"FF") x 6)) {
     my $msg = "EMEM no device no. $dnr present";
     Log GetLogLevel($name,2), $msg;
@@ -50,13 +49,6 @@ EMEM_GetStatus($)
   }
 
   my $pulses=w($d,13);
-  my $ec=w($d,49) / 10;
-  if($ec != 0) {
-    my $msg = "EMEM read error";
-    Log GetLogLevel($name,2), $msg;
-    return $msg;
-  }
-
   my $iec = 1000;
   my $cur_power = $pulses / 100;
 
@@ -72,7 +64,6 @@ EMEM_GetStatus($)
   $vals{"power"} = sprintf("%.3f", $cur_power);
   $vals{"alarm_PA"} = w($d,45) . " Watt";
   $vals{"price_CF"} = sprintf("%.3f", w($d,47)/10000);
-  $vals{"RperKW_EC"} = $ec;
 
   my $tn = TimeNow();
   my $idx = 0;
diff --git a/fhem/HISTORY b/fhem/HISTORY
index bf23e221b..e8799d53c 100644
--- a/fhem/HISTORY
+++ b/fhem/HISTORY
@@ -104,3 +104,6 @@
 - Pest, Mon May 28 19:39:22 MEST 2007
   - Added 62_EMEM.pm to support EM1000-EM devices.
   - doc: Update of commandref.htm (typos and EMEM).
+
+- Pest, Mon May 29 00:07:00 MEST 2007
+  - check-in changes of 60_EM.pm to make EMEM work.