diff --git a/fhem/FHEM/98_DOIF.pm b/fhem/FHEM/98_DOIF.pm index 780db091c..d856a32a8 100644 --- a/fhem/FHEM/98_DOIF.pm +++ b/fhem/FHEM/98_DOIF.pm @@ -4824,7 +4824,7 @@ sub ring $out.= sprintf('\ ',$currColor,$minColor,(defined $lr ? $lr:0),$x1,$y1,$x2,$y2,color($currColor,$lr),color($minColor,$lr)); } - if (defined $innerRing and $innerRing==1 and ref($func) ne "ARRAY") { + if (defined $innerRing and $innerRing and ref($func) ne "ARRAY") { $out.= sprintf('\ ',$minCol,$maxColor,(defined $lr ? $lr:0),100,0,0,0,color($maxColor,$lr),color($minCol,$lr)); } @@ -4844,7 +4844,7 @@ sub ring } $out.=''; - if (defined $innerRing and $innerRing==1) { + if (defined $innerRing and $innerRing) { if (ref($func) eq "ARRAY"){ my $from=0; my $diff=$max-$min; @@ -4852,14 +4852,14 @@ sub ring my $curr=${$func}[$i]; my $color=${$func}[$i+1]; my $to=int(($curr-$min)/$diff*280); - $out.=''; + $out.=sprintf('',($innerRing eq "1" ? "":$innerRing),color($color,$lr)); $out.=describeArc(41, 30, 25.5, $from, $to); $out.=''; $from=$to+2; } } else { $out.=''; - $out.=sprintf('',$minCol,$maxColor,(defined $lr ? $lr:0)); + $out.=sprintf('',($innerRing eq "1" ? "":$innerRing),$minCol,$maxColor,(defined $lr ? $lr:0)); $out.=describeArc(41, 30, 25.5, 0, 280); $out.=''; } @@ -4889,8 +4889,8 @@ sub ring ($icflag ? 53:47),color($currColor,$ln),($icflag ? 9:12),$unitformat,$unit) if (defined $unit); if (defined $minMax and $minMax) { - $out.= sprintf('%s',color($minCol,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$min)); - $out.= sprintf('%s',color($maxColor,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$max)); + $out.= sprintf('%s',color($minCol,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$min)); + $out.= sprintf('%s',color($maxColor,$ln),($minMax eq "1" ? "":$minMax),sprintf($format,$max)); } $out.= '';