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

76_SMAPortal: contrib 1.5.1

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19021 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2019-03-24 20:55:35 +00:00
parent 1a369f9e04
commit 0ff687886d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,6 +141,7 @@ BEGIN {
# Versions History intern # Versions History intern
our %vNotesIntern = ( our %vNotesIntern = (
"1.5.1" => "24.03.2019 fix \$VAR1 problem Forum: #27667.msg922983.html#msg922983 ",
"1.5.0" => "23.03.2019 add consumer data ", "1.5.0" => "23.03.2019 add consumer data ",
"1.4.0" => "22.03.2019 add function extractPlantData, DbLog_split, change L2 Readings ", "1.4.0" => "22.03.2019 add function extractPlantData, DbLog_split, change L2 Readings ",
"1.3.0" => "18.03.2019 change module to use package FHEM::SMAPortal and Meta.pm, new sub setVersionInfo ", "1.3.0" => "18.03.2019 change module to use package FHEM::SMAPortal and Meta.pm, new sub setVersionInfo ",
@ -644,13 +645,14 @@ sub ParseData($) {
if (($livedata_content->{$k} =~ m/ARRAY/i) || ($livedata_content->{$k} =~ m/HASH/i)) { if (($livedata_content->{$k} =~ m/ARRAY/i) || ($livedata_content->{$k} =~ m/HASH/i)) {
Log3 $name, 4, "$name - Livedata content \"$k\": ".($livedata_content->{$k}); Log3 $name, 4, "$name - Livedata content \"$k\": ".($livedata_content->{$k});
if($livedata_content->{$k} =~ m/ARRAY/i) { if($livedata_content->{$k} =~ m/ARRAY/i) {
my $hd0 = Dumper($livedata_content->{$k}[0]); my $hd0 = $livedata_content->{$k}[0];
if(!$hd0) { if(!$hd0) {
next; next;
} }
chomp $hd0; chomp $hd0;
$hd0 =~ s/[;']//g; $hd0 =~ s/[;']//g;
$hd0 = ($hd0 =~ /^undef$/)?"none":$hd0; $hd0 = ($hd0 =~ /^undef$/)?"none":$hd0;
$hd0 = encode("utf8", $hd0);
Log3 $name, 4, "$name - Livedata \"$k\": $hd0"; Log3 $name, 4, "$name - Livedata \"$k\": $hd0";
$new_val = $hd0; $new_val = $hd0;
} }
@ -922,20 +924,20 @@ sub extractWeatherData($$) {
if ($weather->{$k} =~ m/HASH/i) { if ($weather->{$k} =~ m/HASH/i) {
my $ih = $weather->{$k}; my $ih = $weather->{$k};
for my $i (keys %$ih) { for my $i (keys %$ih) {
my $hd0 = Dumper($weather->{$k}{$i}); my $hd0 = $weather->{$k}{$i};
if(!$hd0) { if(!$hd0) {
next; next;
} }
chomp $hd0; chomp $hd0;
$hd0 =~ s/[;']//g; $hd0 =~ s/[;']//g;
$hd0 = ($hd0 =~ /^undef$/)?"none":$hd0; $hd0 = ($hd0 =~ /^undef$/)?"none":$hd0;
$hd0 = encode("utf8", $hd0);
Log3 $name, 4, "$name - Weatherdata \"$k $i\": $hd0"; Log3 $name, 4, "$name - Weatherdata \"$k $i\": $hd0";
next if($i =~ /^WeatherIcon$/); next if($i =~ /^WeatherIcon$/);
$new_val = $hd0; $new_val = $hd0;
if ($new_val) { if ($new_val) {
if($i =~ /^TemperatureSymbol$/) { if($i =~ /^TemperatureSymbol$/) {
$new_val =~ s/.*}([A-Z]).*/°$1/;
$tsymbol = $new_val; $tsymbol = $new_val;
next; next;
} }