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

Merge pull request 'dev' (#61) from dev into testing 

Reviewed-on: #61
This commit is contained in:
Marko Oldenburg 2023-10-21 09:07:21 +02:00
parent d2e93a6d5a 7d7cbef4ed
commit 530fc01d57
3 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
CHANGELOG.md
View File

@ -1,4 +1,38 @@
### fix: missing perl modules (HEAD -> patch-removePrivatFnDeklaration)
### feat: new reading owmAPICode for original code (HEAD -> patch-createDecimal)
>Tue, 11 Jul 2023 14:10:13 +0200
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
[Ticket: no]
### feat: add human-readable text of daily forecast
>Tue, 6 Jun 2023 08:35:06 +0200
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
add the proper human-readable text description of the daily forecast
[Ticket: no]
### add temperatur reading and fix weblink
>Tue, 23 May 2023 08:08:42 +0200
>Author: Marko Oldenburg (oldenburg@b1-systems.de)
>Commiter: Marko Oldenburg (oldenburg@b1-systems.de)
### fix: missing perl modules
>Sun, 5 Feb 2023 09:26:04 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@ -8,7 +42,7 @@
### fix: failed then Readonly is missing (origin/patch-removePrivatFnDeklaration)
### fix: failed then Readonly is missing
>Sun, 5 Feb 2023 09:20:20 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

2
controls_Weather.txt
View File

@ -1,5 +1,5 @@
UPD 2023-01-29_16:14:48 25809 FHEM/59_Weather.pm
UPD 2023-06-06_07:31:00 34254 lib/FHEM/Core/Weather.pm
UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-06-06_08:24:10 33488 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-07-11_14:08:00 33779 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-06-02_05:03:58 36607 lib/FHEM/APIs/Weather/wundergroundAPI.pm

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

@ -591,6 +591,7 @@ sub _FillSelfHashWithWeatherResponseForWeatherCurrent {
'wind_direction' => $data->{wind}->{deg},
'cloudCover' => $data->{clouds}->{all},
'code' => $codes{ $data->{weather}->[0]->{id} },
'owmAPICode' => $data->{weather}->[0]->{id},
'iconAPI' => $data->{weather}->[0]->{icon},
'sunsetTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M",
@ -670,8 +671,9 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
),
'cloudCover' => $data->{list}->[$i]->{clouds}->{all},
'code' => $codes{ $data->{list}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
'owmAPICode' => $data->{list}->[$i]->{weather}->[0]->{id},
'iconAPI' => $data->{list}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
$data->{list}->[$i]->{rain}->{'1h'}
? $data->{list}->[$i]->{rain}->{'1h'}
: 0
@ -732,6 +734,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallCurrent {
'rain_1h' => ( $data->{rain}->{'1h'} ? $data->{rain}->{'1h'} : 0 ),
'cloudCover' => $data->{current}->{clouds},
'code' => $codes{ $data->{current}->{weather}->[0]->{id} },
'owmAPICode' => $data->{current}->{weather}->[0]->{id},
'iconAPI' => $data->{current}->{weather}->[0]->{icon},
'condition' =>
encode_utf8( $data->{current}->{weather}->[0]->{description} ),
@ -834,8 +837,9 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
$data->{daily}->[$i]->{weather}->[0]->{description}
),
'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
'iconAPI' => $data->{daily}->[$i]->{weather}->[0]->{icon},
'pressure' => int(
'owmAPICode' => $data->{daily}->[$i]->{weather}->[0]->{id},
'iconAPI' => $data->{daily}->[$i]->{weather}->[0]->{icon},
'pressure' => int(
sprintf( "%.1f", $data->{daily}->[$i]->{pressure} ) + 0.5
),
'wind' => int(
@ -854,8 +858,7 @@ sub _FillSelfHashWithWeatherResponseForOnecallDaily {
sprintf( "%.1f", ( $data->{daily}->[$i]->{wind_deg} ) )
),
'cloudCover' => $data->{daily}->[$i]->{clouds},
'code' => $codes{ $data->{daily}->[$i]->{weather}->[0]->{id} },
'rain' => (
'rain' => (
$data->{daily}->[$i]->{rain} ? $data->{daily}->[$i]->{rain}
: 0
),
@ -921,8 +924,9 @@ 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' => (
'owmAPICode' => $data->{hourly}->[$i]->{weather}->[0]->{id},
'iconAPI' => $data->{hourly}->[$i]->{weather}->[0]->{icon},
'rain1h' => (
$data->{hourly}->[$i]->{rain}->{'1h'}
? $data->{hourly}->[$i]->{rain}->{'1h'}
: 0