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

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

Browse Source 
Reviewed-on: #70
This commit is contained in:
Marko Oldenburg 2025-02-04 20:03:28 +00:00
commit c6b6a12e47
7 changed files with 90 additions and 834 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
CHANGELOG.md
View File

@ -1,4 +1,47 @@
### docs: change versions and add copyright (HEAD -> patch-fixforecast) ### feat: remove DarkSky, change versions remove DarkSkyAPI, no longer supported change Copyright years and versions of OWM API (HEAD -> patch-changeVersion)
>Tue, 4 Feb 2025 21:01:17 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
[Ticket: no]
### docs: changelog
>Tue, 4 Feb 2025 20:53:14 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
[Ticket: no]
### fix: apply patch from stefanru https://forum.fhem.de/index.php?msg=1332884
>Tue, 4 Feb 2025 20:52:52 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
[Ticket: no]
### docs: new CHANGELOG
>Fri, 11 Oct 2024 12:04:37 +0200
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: change versions and add copyright
>Fri, 11 Oct 2024 12:04:07 +0200 >Fri, 11 Oct 2024 12:04:07 +0200
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
@ -8,7 +51,7 @@
### docs: Changelog (origin/patch-fixforecast) ### docs: Changelog
>Fri, 11 Oct 2024 07:07:57 +0200 >Fri, 11 Oct 2024 07:07:57 +0200
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

4
FHEM/59_Weather.pm
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# 59_Weather.pm # 59_Weather.pm
# (c) 2009-2024 Copyright by Dr. Boris Neubert # (c) 2009-2025 Copyright by Dr. Boris Neubert
# e-mail: omega at online dot de # e-mail: omega at online dot de
# #
# Contributors: # Contributors:
@ -544,7 +544,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v2.2.30", "version": "v2.2.35",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

9
controls_Weather.txt
View File

@ -1,5 +1,4 @@
UPD 2024-10-11_12:02:22 25848 FHEM/59_Weather.pm UPD 2025-02-04_20:57:25 25848 FHEM/59_Weather.pm
UPD 2024-10-11_11:59:21 34293 lib/FHEM/Core/Weather.pm UPD 2025-02-04_20:58:03 34419 lib/FHEM/Core/Weather.pm
UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2025-02-04_20:58:29 33780 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-07-11_14:08:00 33779 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2025-02-04_20:57:50 38751 lib/FHEM/APIs/Weather/wundergroundAPI.pm
UPD 2024-10-11_12:02:42 37627 lib/FHEM/APIs/Weather/wundergroundAPI.pm

816
lib/FHEM/APIs/Weather/DarkSkyAPI.pm
View File

File diff suppressed because one or more lines are too long

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

@ -3,7 +3,7 @@
# #
# Developed with VSCodium and richterger perl plugin # Developed with VSCodium and richterger perl plugin
# #
# (c) 2019-2023 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net) # (c) 2019-2025 Copyright: Marko Oldenburg (fhemdevelopment at cooltux dot net)
# All rights reserved # All rights reserved
# #
# Special thanks goes to: # Special thanks goes to:
@ -423,7 +423,7 @@ sub _ProcessingRetrieveData {
_ErrorHandling( $self, _ErrorHandling( $self,
'OpenWeatherMap Weather decode JSON err ' . $@ ); 'OpenWeatherMap Weather decode JSON err ' . $@ );
} }
elsif (defined( $data->{cod} ) elsif ( defined( $data->{cod} )
&& $data->{cod} && $data->{cod}
&& $data->{cod} != 200 && $data->{cod} != 200
&& defined( $data->{message} ) && defined( $data->{message} )

33
lib/FHEM/APIs/Weather/wundergroundAPI.pm
View File

File diff suppressed because one or more lines are too long

7
lib/FHEM/Core/Weather.pm
View File

@ -2,7 +2,7 @@
############################################################################## ##############################################################################
# #
# 59_Weather.pm # 59_Weather.pm
# (c) 2009-2024 Copyright by Dr. Boris Neubert # (c) 2009-2025 Copyright by Dr. Boris Neubert
# e-mail: omega at online dot de # e-mail: omega at online dot de
# #
# Contributors: # Contributors:
@ -434,8 +434,13 @@ sub _Writereadings {
&& ref( $dataRef->{$r} ) ne 'ARRAY' ); && ref( $dataRef->{$r} ) ne 'ARRAY' );
} }
if ( defined( $dataRef->{current}->{code} )
&& $dataRef->{current}->{code} )
{
::readingsBulkUpdate( $hash, 'icon', ::readingsBulkUpdate( $hash, 'icon',
$iconlist[ $dataRef->{current}->{code} ] ); $iconlist[ $dataRef->{current}->{code} ] );
}
if ( defined( $dataRef->{current}->{wind_direction} ) if ( defined( $dataRef->{current}->{wind_direction} )
&& $dataRef->{current}->{wind_direction} && $dataRef->{current}->{wind_direction}
&& defined( $dataRef->{current}->{wind_speed} ) && defined( $dataRef->{current}->{wind_speed} )