From e94cb2686bd6569bcdb69020fb3f60daf9b2b43a Mon Sep 17 00:00:00 2001 From: moises <> Date: Fri, 7 Sep 2018 22:07:24 +0000 Subject: [PATCH] 38_netatmo: removed rain sum readings git-svn-id: https://svn.fhem.de/fhem/trunk@17294 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/38_netatmo.pm | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index f86307017..6167b46d1 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 38_netatmo: removed rain sum readings - feature: 00_MYSENSORS: FOTA (thanks Beta-User), gateway fix (thanks Sidey) - new: 12_HProtocolGateway / 12_HProtocolTank - bugfix: 72_XiaomiDevice: remove unused battery readings for new fans diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm index 1b057a7fd..f55c2d995 100644 --- a/fhem/FHEM/38_netatmo.pm +++ b/fhem/FHEM/38_netatmo.pm @@ -11,7 +11,7 @@ # # ############################################################################## -# Release 19 / 2018-08-14 +# Release 20 / 2018-09-09 package main; @@ -3407,13 +3407,13 @@ netatmo_parseReadings($$;$) $reading = sprintf( "%.1f", $reading); } - if($reading ne "undefined" && $rname eq "rain" && $reading > 0) - { - my $rain_sum = ReadingsVal($name,"rain_sum",0); - $rain_sum += $reading; - readingsSingleUpdate($hash,"rain_sum",$rain_sum,1); - Log3 $name, 2, $name.": summed rain ".$reading." (to ".$rain_sum.")"; - } + # if($reading ne "undefined" && $rname eq "rain" && $reading > 0) + # { + # my $rain_sum = ReadingsVal($name,"rain_sum",0); + # $rain_sum += $reading; + # readingsSingleUpdate($hash,"rain_sum",$rain_sum,1); + # Log3 $name, 2, $name.": summed rain ".$reading." (to ".$rain_sum.")"; + # } push(@{$readings}, [$time, $rname, $reading]) if($reading ne "undefined"); @@ -3600,14 +3600,14 @@ netatmo_parseGlobal($$) } if(defined($devicedata->{dashboard_data}{sum_rain_24})) { - my $rain_day = ReadingsVal($device->{NAME},"rain_day",0); - if($devicedata->{dashboard_data}{sum_rain_24} < $rain_day) - { - my $rain_total = ReadingsVal($device->{NAME},"rain_total",0); - $rain_total += $rain_day; - readingsSingleUpdate($device,"rain_total",$rain_total,1); - Log3 $name, 1, $device->{NAME}.": added rain ".$rain_day." (to ".$rain_total.")"; - } + #my $rain_day = ReadingsVal($device->{NAME},"rain_day",0); + # if($devicedata->{dashboard_data}{sum_rain_24} < $rain_day) + # { + # my $rain_total = ReadingsVal($device->{NAME},"rain_total",0); + # $rain_total += $rain_day; + # readingsSingleUpdate($device,"rain_total",$rain_total,1); + # Log3 $name, 1, $device->{NAME}.": added rain ".$rain_day." (to ".$rain_total.")"; + # } readingsBeginUpdate($device); $device->{".updateTimestamp"} = FmtDateTime($devicedata->{dashboard_data}{time_utc}); readingsBulkUpdate( $device, "rain_day", $devicedata->{dashboard_data}{sum_rain_24}, 1 );