From 8dbd08d07962abeb699042d642a4c0d87517fa6a Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Fri, 13 Nov 2020 15:36:42 +0000
Subject: [PATCH] 76_SMAPortal: contrib 9.9.9

git-svn-id: https://svn.fhem.de/fhem/trunk@23148 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/DS_Starter/76_SMAPortal.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/fhem/contrib/DS_Starter/76_SMAPortal.pm b/fhem/contrib/DS_Starter/76_SMAPortal.pm
index 6f2f52ba1..f4e31ee4d 100644
--- a/fhem/contrib/DS_Starter/76_SMAPortal.pm
+++ b/fhem/contrib/DS_Starter/76_SMAPortal.pm
@@ -998,7 +998,7 @@ sub GetSetData {                       ## no critic 'complexity'
   ### Verbraucher schalten
   #######################################
   if($setp ne "none") {                                   
-      my ($serial,$id,$oid,$h);
+      my ($serial,$id,$oid,$h,$oname);
       
       my ($gcval, $pvval, $lval) = split "#",$setp; 
       
@@ -1008,6 +1008,7 @@ sub GetSetData {                       ## no critic 'complexity'
               $serial = $hash->{HELPER}{CONSUMER}{$key}{SerialNumber};
               $id     = $hash->{HELPER}{CONSUMER}{$key}{SUSyID};
               $oid    = $hash->{HELPER}{CONSUMER}{$key}{ConsumerOid};
+			  $oname  = decode("utf8", $hash->{HELPER}{CONSUMER}{$key}{DeviceOrigName});
           }
       }
       my $plantOid = $hash->{HELPER}{PLANTOID};
@@ -1026,7 +1027,7 @@ sub GetSetData {                       ## no critic 'complexity'
                       'DataAcceptance'            => "[…]",
                       '0'                         => qq{"true"},
                       '1'                         => qq{"false"},
-                      'PowerConsumerName'         => qq{"$h"},
+                      'PowerConsumerName'         => qq{"$oname"},
                       'Priority'                  => qq{"1"},
                       'RbTimeframeTypeEnergyPv_0' => qq{"pv"},
                       'MaxPriceAllowedValue'      => qq{"0,1283000000"},
@@ -2922,9 +2923,10 @@ sub extractConsumerMasterdata {
       $consumers{"${i}_ConsumerLfd"}  = $i;
       my $cn                          = $consumers{"${i}_ConsumerName"};          # Verbrauchername
       next if(!$cn);
-      $cn                             = replaceJunkSigns($cn);
+      $cn                             = replaceJunkSigns($cn);                    # Verbrauchername gemäß Readingreguarien verändern
       
       $hcon{$i}{DeviceName}           = $cn;
+	  $hcon{$i}{DeviceOrigName}       = encode("utf8", $c->{'DeviceName'});       # der originale Verbrauchername
       $hcon{$i}{ConsumerOid}          = $consumers{"${i}_ConsumerOid"};
       $hcon{$i}{SerialNumber}         = $c->{'SerialNumber'};
       $hcon{$i}{SUSyID}               = $c->{'SUSyID'};