FHEM/mod-Weather
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

dev #23

Merged
marko merged 3 commits from dev into testing 2023-01-05 17:36:16 +00:00
Conversation 0 Commits 3 Files Changed 2 +47 -17
2 changed files with 47 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controls_Weather.txt
View File

@ -1,4 +1,4 @@
UPD 2023-01-05_08:17:10 55320 FHEM/59_Weather.pm
UPD 2023-01-05_08:20:31 55320 FHEM/59_Weather.pm
UPD 2023-01-04_16:37:24 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-05_08:05:28 32255 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-05_17:01:28 33191 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-04_16:37:24 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm

60
lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
View File

@ -671,10 +671,26 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
'rain1h' => $data->{list}->[$i]->{rain}->{'1h'},
'rain3h' => $data->{list}->[$i]->{rain}->{'3h'},
'snow1h' => $data->{list}->[$i]->{snow}->{'1h'},
'snow3h' => $data->{list}->[$i]->{snow}->{'3h'},
'rain1h' => (
$data->{list}->[$i]->{rain}->{'1h'}
? $data->{list}->[$i]->{rain}->{'1h'}
: 0
),
'rain3h' => (
$data->{list}->[$i]->{rain}->{'3h'}
? $data->{list}->[$i]->{rain}->{'3h'}
: 0
),
'snow1h' => (
$data->{list}->[$i]->{snow}->{'1h'}
? $data->{list}->[$i]->{snow}->{'1h'}
: 0
),
'snow3h' => (
$data->{list}->[$i]->{snow}->{'3h'}
? $data->{list}->[$i]->{snow}->{'1h'}
: 0
),
}
);
@ -711,11 +727,11 @@ sub _FillSelfHashWithWeatherResponseForOnecallCurrent {
sprintf( "%.1f", ( $data->{current}->{wind_gust} * 3.6 ) ) + 0.5
),
'wind_direction' => $data->{current}->{wind_deg},
'rain_1h' => $data->{rain}->{'1h'},
'cloudCover' => $data->{current}->{clouds},
'code' => $codes{ $data->{current}->{weather}->[0]->{id} },
'iconAPI' => $data->{current}->{weather}->[0]->{icon},
'condition' =>
'rain_1h' => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ),
'cloudCover' => $data->{current}->{clouds},
'code' => $codes{ $data->{current}->{weather}->[0]->{id} },
'iconAPI' => $data->{current}->{weather}->[0]->{icon},
'condition' =>
encode_utf8( $data->{current}->{weather}->[0]->{description} ),
'sunsetTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M",
@ -836,9 +852,15 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
),
'cloudCover' => $data->{daily}->[$i]->{clouds},
'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
'rain' => $data->{daily}->[$i]->{rain},
'snow' => $data->{daily}->[$i]->{snow},
'uvi' => $data->{daily}->[$i]->{uvi},
'rain' => (
$data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain}
: 0
),
'snow' => (
$data->{daily}->[$i]->{snow} ? $data->{daily}->[$i]->{snow}
: 0
),
'uvi' => $data->{daily}->[$i]->{uvi},
},
);
@ -896,9 +918,17 @@ sub _FillSelfHashWithWeatherResponseForOnecallHourly {
'wind_direction' => $data->{hourly}->[$i]->{wind_deg},
'cloudCover' => $data->{hourly}->[$i]->{clouds},
'code' => $codes{ $data->{hourly}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon},
'rain1h' => $data->{hourly}->[$i]->{rain}->{'1h'},
'snow1h' => $data->{hourly}->[$i]->{snow}->{'1h'},
'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
$data->{hourly}->[$i]->{rain}->{'1h'}
? $data->{hourly}->[$i]->{rain}->{'1h'}
: 0
),
'snow1h' => (
$data->{hourly}->[$i]->{snow}->{'1h'}
? $data->{hourly}->[$i]->{snow}->{'1h'}
: 0
),
'uvi' => $data->{hourly}->[$i]->{uvi},
'visibility' => int(
sprintf( "%.1f", $data->{hourly}->[$i]->{visibility} ) + 0.5