From 9d487f29f22adaf2c0d6d143e6626533dbdfaec3 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Sun, 4 Feb 2024 09:03:38 +0000
Subject: [PATCH] 10_ZWave.pm: move _export decoding to preserve unit (Forum
 #136912)

git-svn-id: https://svn.fhem.de/fhem/trunk@28473 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_ZWave.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index fa1892742..a327fcb68 100644
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -1848,9 +1848,6 @@ ZWave_meterParse($$)
   my $meter_type_text = ($meter_type > $#meter_type_text ?
                        "UNKNOWN_${meter_type}" : $meter_type_text[$meter_type]);
 
-  my $rate_type = ($v1 >> 5) & 0x3; # ("undef","_import", "_export")
-  $meter_type_text .= "_export" if($meter_type == 1 && $rate_type == 2); #136912
-
   my $precision = ($v2>>5) & 0x7; # 3 bits
   my $scale     = ($v2>>3) & 0x3; # 2 bits, meaning unit
   my $size      =  $v2     & 0x7; # 3 bits
@@ -1867,6 +1864,8 @@ ZWave_meterParse($$)
     $meter_type_text = "powerFactor";
     $unit_text = "";
   }
+  my $rate_type = ($v1 >> 5) & 0x3; # ("undef","_import", "_export")
+  $meter_type_text .= "_export" if($meter_type == 1 && $rate_type == 2); #136912
 
   my $mv = hex(substr($v3, 0, 2*$size));
   $mv = ($mv >> 31 ? $mv - 2 ** 32 : $mv) if($size == 4);