From 2ffd92ca17afae9f7623e95bf79c8dc4a98ee67e Mon Sep 17 00:00:00 2001
From: klaus-schauer <klaus-schauer@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 17 Mar 2014 18:22:20 +0000
Subject: [PATCH] 10_EnOcean: subType autoMeterReading.01: Serial number is now
 displayed correctly

git-svn-id: https://svn.fhem.de/fhem/trunk@5245 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_EnOcean.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/fhem/FHEM/10_EnOcean.pm b/fhem/FHEM/10_EnOcean.pm
index 587288165..f140c23b2 100755
--- a/fhem/FHEM/10_EnOcean.pm
+++ b/fhem/FHEM/10_EnOcean.pm
@@ -1,6 +1,5 @@
 ##############################################
 # $Id$
-
 package main;
 
 use strict;
@@ -3297,11 +3296,7 @@ EnOcean_Parse($$)
         # $db[0]_bit_7 ... $db[0]_bit_4 is the Tariff info
         # $db[0]_bit_2 is the Data type where 0 = cumulative value kWh,
         # 1 = current value W
-        if ($dataType == 1) {
-          # momentary power
-          push @event, "3:power:$meterReading";
-          push @event, "3:state:$meterReading";
-        } elsif ($db[0] == 0x8F && $manufID eq "00D") {
+        if ($db[0] == 0x8F && $manufID eq "00D") {
           # Eltako, read meter serial number
           my $serialNumber;
           if ($db[0] == 0) {
@@ -3313,7 +3308,11 @@ EnOcean_Parse($$)
             $serialNumber = printf "%4c%01x%01x%01x%01x", $serialNumber,
                             $db[2] >> 4, $db[2] & 0x0F, $db[3] >> 4, $db[3] & 0x0F;
           }
-          push @event, "3:serialNumber:$serialNumber";
+          push @event, "3:serialNumber:$serialNumber";        
+        } elsif ($dataType == 1) {
+          # momentary power
+          push @event, "3:power:$meterReading";
+          push @event, "3:state:$meterReading";
         } else {
           # power consumption
           push @event, "3:energy$channel:$meterReading";