FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

76_SMAPortal: contrib 9.9.9

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@23148 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2020-11-13 15:36:42 +00:00
parent 4ee72d099e
commit 8dbd08d079
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/contrib/DS_Starter/76_SMAPortal.pm
View File

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