From 6b9fb7d0f4a0c1569a4252911a99c9bcfdeb1ac1 Mon Sep 17 00:00:00 2001 From: jpawlowski Date: Mon, 10 Apr 2017 10:51:05 +0000 Subject: [PATCH] UConv: allow UV index to be rounded git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@13960 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/UConv.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/FHEM/UConv.pm b/FHEM/UConv.pm index 96ce23142..209d6762c 100644 --- a/FHEM/UConv.pm +++ b/FHEM/UConv.pm @@ -267,11 +267,14 @@ sub direction2compasspoint($;$) { ### # Power: convert uW/cm2 (micro watt per square centimeter) to UV-Index -sub uwpscm2uvi($) { - my ($data) = @_; +sub uwpscm2uvi($;$) { + my ( $data, $rnd ) = @_; # Forum topic,44403.msg501704.html#msg501704 - return int( ( $data - 100 ) / 450 + 1 ); + return int( ( $data - 100 ) / 450 + 1 ) unless ( defined($rnd) ); + + $rnd = 0 unless ( defined($rnd) ); + return roundX( ( ( $data - 100 ) / 450 + 1 ), $rnd ); } # Power: convert UV-Index to uW/cm2 (micro watt per square centimeter) @@ -493,7 +496,7 @@ sub decimal_mark ($$) { sub roundX($;$) { my ( $v, $n ) = @_; - $n = 1 unless ($n); + $n = 1 unless ( defined($n) ); return sprintf( "%.${n}f", $v ); }