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

dev #44

Merged
marko merged 13 commits from dev into testing 2023-01-10 20:56:18 +00:00
Conversation 0 Commits 13 Files Changed 8 +1248 -1091
8 changed files with 1248 additions and 1091 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
CHANGELOG.md
View File

@ -1,4 +1,83 @@
### docs: new versions (HEAD -> patch-version) ### build: v2.2.22 (HEAD -> patch-package)
>Tue, 10 Jan 2023 21:43:26 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: add new modul path in to pre-commit (origin/patch-package)
>Tue, 10 Jan 2023 21:37:10 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
add new modul path in to pre-commit hook file
### revert: mod packages
>Tue, 10 Jan 2023 21:32:56 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
- packages Weather.pm
- split FHEM/59_Weather.pm in two files and packages (FEHM/59_Weather.pm
and FHEM/Core/Weather.pm
[optional body]
[Ticket: no]
### fix: #40
>Tue, 10 Jan 2023 16:09:53 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
Undefined subroutine &FHEM::APIs::Weather::DarkSkyAPI::__strftimeWrapper
### docs: add new changelog and change version (tag: v2.2.21)
>Sun, 8 Jan 2023 21:56:15 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### fix: bugfix function WeatherAsHtmlD not working
>Sun, 8 Jan 2023 21:54:31 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: new changelog entry
>Sun, 8 Jan 2023 17:11:31 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net)
>Commiter: Marko Oldenburg (fhemdevelopment@cooltux.net)
### docs: new versions
>Sun, 8 Jan 2023 17:11:03 +0100 >Sun, 8 Jan 2023 17:11:03 +0100
>Author: Marko Oldenburg (fhemdevelopment@cooltux.net) >Author: Marko Oldenburg (fhemdevelopment@cooltux.net)

1097
FHEM/59_Weather.pm
View File

File diff suppressed because it is too large Load Diff

9
controls_Weather.txt
View File

@ -1,4 +1,5 @@
UPD 2023-01-07_19:00:05 57768 FHEM/59_Weather.pm UPD 2023-01-10_21:41:34 25809 FHEM/59_Weather.pm
UPD 2023-01-08_17:09:40 50104 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2023-01-10_21:20:58 33948 lib/FHEM/Core/Weather.pm
UPD 2023-01-08_17:09:32 33411 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2023-01-10_21:25:52 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-07_19:00:05 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2023-01-10_21:25:49 33422 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-10_21:25:53 36101 lib/FHEM/APIs/Weather/wundergroundAPI.pm

1
hooks/pre-commit
View File

@ -5,6 +5,7 @@ use POSIX qw(strftime);
use strict; use strict;
my @filenames = ( 'FHEM/59_Weather.pm', my @filenames = ( 'FHEM/59_Weather.pm',
'lib/FHEM/Core/Weather.pm',
'lib/FHEM/APIs/Weather/DarkSkyAPI.pm', 'lib/FHEM/APIs/Weather/DarkSkyAPI.pm',
'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm', 'lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm',
'lib/FHEM/APIs/Weather/wundergroundAPI.pm', 'lib/FHEM/APIs/Weather/wundergroundAPI.pm',

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

@ -699,7 +699,7 @@ sub _CallWeatherCallbackFn {
my $self = shift; my $self = shift;
# ## Aufruf der callbackFn # ## Aufruf der callbackFn
return ::Weather_RetrieveCallbackFn( $self->{devName} ); return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
} }
sub _ErrorHandling { sub _ErrorHandling {
@ -709,8 +709,7 @@ sub _ErrorHandling {
my $err = shift; my $err = shift;
$self->{cached}->{current_date_time} = $self->{cached}->{current_date_time} =
__strftimeWrapper( "%a, %e %b %Y %H:%M", _strftimeWrapper( "%a, %e %b %Y %H:%M", localtime( $self->{fetchTime} ) );
localtime( $self->{fetchTime} ) );
$self->{cached}->{status} = $err; $self->{cached}->{status} = $err;
$self->{cached}->{validity} = 'stale'; $self->{cached}->{validity} = 'stale';
@ -780,7 +779,7 @@ sub _strftimeWrapper {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v1.2.11", "version": "v1.2.12",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

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

@ -951,7 +951,7 @@ sub _CallWeatherCallbackFn {
# print 'Dumperausgabe: ' . Dumper $self; # print 'Dumperausgabe: ' . Dumper $self;
### Aufruf der callbackFn ### Aufruf der callbackFn
return ::Weather_RetrieveCallbackFn( $self->{devName} ); return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
} }
sub _ErrorHandling { sub _ErrorHandling {

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

@ -733,7 +733,7 @@ sub _CallWeatherCallbackFn {
my $self = shift; my $self = shift;
# ## Aufruf der callbackFn # ## Aufruf der callbackFn
return ::Weather_RetrieveCallbackFn( $self->{devName} ); return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
} }
sub _ErrorHandling { sub _ErrorHandling {

1140
lib/FHEM/Core/Weather.pm Normal file
View File

File diff suppressed because it is too large Load Diff