From abf2d6c119ac1ee5656d8c4508d18e075dde97a7 Mon Sep 17 00:00:00 2001 From: moises <> Date: Thu, 1 Mar 2018 20:14:29 +0000 Subject: [PATCH] 38_netatmo: fix uninitialized log variables git-svn-id: https://svn.fhem.de/fhem/trunk@16304 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/38_netatmo.pm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/38_netatmo.pm b/fhem/FHEM/38_netatmo.pm index 5f7af7233..eabd50546 100644 --- a/fhem/FHEM/38_netatmo.pm +++ b/fhem/FHEM/38_netatmo.pm @@ -38,7 +38,6 @@ my %health_index = ( 0 => "healthy", 4 => "unhealthy", 5 => "unknown", ); - sub netatmo_Initialize($) { @@ -441,7 +440,6 @@ netatmo_Define($$) $hash->{NOTIFYDEV} = "global"; - if( $init_done ) { netatmo_connect($hash) if( $hash->{SUBTYPE} eq "ACCOUNT" ); netatmo_initDevice($hash) if( $hash->{SUBTYPE} eq "DEVICE" ); @@ -1655,7 +1653,7 @@ netatmo_requestDeviceReadings($@) return undef if( !defined($hash->{IODev}) ); - Log3 $name, 5, "$name: requestDeviceReadings start ($id $type $module)"; + Log3 $name, 5, "$name: requestDeviceReadings ($id ".(!$type?"-":$type)." ".(!$module?"-":$module).")"; my $iohash = $hash->{IODev}; $type = $hash->{dataTypes} if( !$type ); @@ -3327,7 +3325,7 @@ netatmo_parseReadings($$;$) } if( $json ) { - $hash->{status} = $json->{status}; + $hash->{status} = $json->{status} if($json->{status}); $hash->{status} = $json->{error}{message} if( $json->{error} ); my $lastupdate = ReadingsVal( $name, ".lastupdate", 0 ); @@ -3369,21 +3367,21 @@ netatmo_parseReadings($$;$) } - if(($rname eq "noise" && int($reading) > 150) || ($rname eq "temperature" && int($reading) > 60) || ($rname eq "humidity" && int($reading) > 100) || ($rname eq "pressure" && int($reading) < 500)) + if($reading ne "undefined" && (($rname eq "noise" && int($reading) > 150) || ($rname eq "temperature" && int($reading) > 60) || ($rname eq "humidity" && int($reading) > 100) || ($rname eq "pressure" && int($reading) < 500))) { Log3 $name, 1, "$name netatmo - invalid reading: $rname: ".Dumper($reading)." \n ".Dumper($reading_names); next; } - if($rname eq "health_idx"){ + if($reading ne "undefined" && $rname eq "health_idx"){ $reading = $health_index{$reading}; } - if($rname =~ /temperature/){ + if($reading ne "undefined" && $rname =~ /temperature/){ $reading = sprintf( "%.1f", $reading); } - if($rname eq "rain" && $reading > 0) + if($reading ne "undefined" && $rname eq "rain" && $reading > 0) { my $rain_sum = ReadingsVal($name,"rain_sum",0); $rain_sum += $reading;