FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-09 20:57:11 +00:00
Code Issues Releases Wiki Activity

59_Wunderground: Improved value correction for readings wind_gust*, wind_speed*, icon* and N/A values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12991 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-01-06 19:44:54 +00:00
parent 2c7b6719ab
commit 9993a96967
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
fhem/FHEM/59_Wunderground.pm
View File

@ -748,11 +748,46 @@ sub Wunderground_Hash2Readings($$;$) {
$reading .= $r . "_." if ( $r && $r ne "" );
$reading .= $cr;
my $value = $h->{$k};
$value = "" if ( !defined($value) || $value eq "NA" );
$value = "" if ( !defined($value) || $value =~ m/^n\/?a$/i );
if ( $reading eq "icon" || $reading eq "icon_url" ) {
my $sunrise = ReadingsVal( $hash->{NAME}, "sunrise", 0 );
my $sunset = ReadingsVal( $hash->{NAME}, "sunset", 0 );
$sunrise = time_str2num("1970-01-01 $sunrise:00")
if ($sunrise);
$sunset = time_str2num("1970-01-01 $sunset:00")
if ($sunset);
my (
$second, $minute, $hour,
$dayOfMonth, $month, $yearOffset,
$dayOfWeek, $dayOfYear, $daylightSavings
) = localtime();
my $currentTime = ( ( $hour * 3600 ) + ( $minute * 60 ) );
# for icon and icon_url, make sure to add nt_ prefix
# during the night
if ( ( $currentTime > 43200 && $currentTime >= $sunset )
|| ( $currentTime <= 43200 && $currentTime < $sunrise )
)
{
$value = "nt_" . $value if ( $reading eq "icon" );
$value = $1 . "nt_" . $2 . $3
if ( $reading eq "icon_url"
&& $value =~ /^(.*\/)([A-Za-z0-9]+)(\.[a-z]+)$/ );
}
# for icon and icon_url, make sure to remove nt_ prefix
# during the daytime
else {
$value =~ s/^nt_// if ( $reading eq "icon" );
$value =~ s/\/nt_// if ( $reading eq "icon_url" );
}
}
$value = "0"
if ( $reading =~ /^wind(Gust|Speed).*$/
&& $value eq "-9999" );
if ( $reading =~ /^wind_(gust|speed).*$/
&& looks_like_number($value)
&& $value < 0 );
$value =~ s/^(\d+)%$/$1/;