From c100542c5836bbf7c1f389404b9b37317ccefef5 Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Sun, 5 Sep 2021 19:08:55 +0000 Subject: [PATCH] 76_SolarForecast.pm: contrib 0.55.1 git-svn-id: https://svn.fhem.de/fhem/trunk@24920 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/DS_Starter/76_SolarForecast.pm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/fhem/contrib/DS_Starter/76_SolarForecast.pm b/fhem/contrib/DS_Starter/76_SolarForecast.pm index 3b05dd4f2..5c767af64 100644 --- a/fhem/contrib/DS_Starter/76_SolarForecast.pm +++ b/fhem/contrib/DS_Starter/76_SolarForecast.pm @@ -5134,13 +5134,12 @@ END0 my $pos_left = $consumer_start; for my $c0 (@consumers) { - my ($cons,$im,$start,$end) = split (':', $c0); - # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $cons"); + # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $c0"); my $cname = ConsumerVal ($hash, $c0, "name", ""); # Name des Consumerdevices my $cicon = ConsumerVal ($hash, $c0, "icon", ""); # Icon des Consumerdevices - $ret .= ''; + $ret .= ''; #$ret .= FW_makeImage($cicon,$cname); $ret .= ''; $ret .= ' '; @@ -5182,11 +5181,10 @@ END3 my $consumer_style = 'flowg inactive_out'; for my $c1 (@consumers) { - my ($cons,$im,$start,$end) = split (':', $c1); - # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $cons"); + # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $c1"); my $power = ConsumerVal ($hash, $c1, "power", 0); - my $currentPower = ReadingsNum($name, "consumer${cons}_currentPower", 0); + my $currentPower = ReadingsNum($name, "consumer${c1}_currentPower", 0); my $p = $currentPower; $p = (($currentPower / $power) * 100) if ($power > 0); @@ -5196,7 +5194,7 @@ END3 my $consumer_color = ""; $consumer_color = 'style="stroke: #'.substr(Color::pahColor(0,50,100,$p,[0,255,0, 127,255,0, 255,255,0, 255,127,0, 255,0,0]),0,6).';"' if($p > 0); - $ret .= qq{}; + $ret .= qq{}; $pos_left += ($consumer_distance * 2); } @@ -5214,12 +5212,11 @@ END3 $pos_left = ($consumer_start * 2) - 50; for my $c2 (@consumers) { - my ($cons,$im,$start,$end) = split (':', $c2); - # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $cons"); + # Log3 ($name, 1, "$name - Energieflussgrafik, Consumer to show -> $c2"); - my $power = sprintf("%.1f",ReadingsNum($name, "consumer${cons}_currentPower", 0)); + my $power = sprintf("%.1f",ReadingsNum($name, "consumer${c2}_currentPower", 0)); - $ret .= qq{$power}; + $ret .= qq{$power}; $pos_left += ($consumer_distance * 2); }