24 Commits

Author SHA1 Message Date
e3b9f512b9 docs: add new entry in CHANGELOG.md 2023-01-10 21:44:20 +01:00
99b46338ca build: v2.2.22 2023-01-10 21:43:26 +01:00
a78a1a986d docs: add new modul path in to pre-commit
add new modul path in to pre-commit hook file
2023-01-10 21:37:10 +01:00
62df910faa revert: mod packages
- 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]
2023-01-10 21:32:56 +01:00
f96c557a22 Merge pull request 'dev' (#42) from dev into main
Reviewed-on: #42
2023-01-10 16:14:00 +01:00
4eeb71e8bc fixes: #40 Merge pull request 'patch-DarkSkyError' (#41) from patch-DarkSkyError into dev
Reviewed-on: #41
2023-01-10 16:11:25 +01:00
eeea03d2df fix: #40
Undefined subroutine &FHEM::APIs::Weather::DarkSkyAPI::__strftimeWrapper
2023-01-10 16:09:53 +01:00
2e8acfff0b Merge pull request 'dev' (#39) from dev into main
Reviewed-on: #39
2023-01-08 22:00:37 +01:00
c29f48a282 Merge pull request 'fixes: #37' (#38) from patch-WeatherAsHtmlD into dev
Reviewed-on: #38
2023-01-08 22:00:09 +01:00
185a7bbc91 docs: add new changelog and change version 2023-01-08 21:56:15 +01:00
0a2f755324 fix: bugfix function WeatherAsHtmlD not working 2023-01-08 21:54:31 +01:00
b6ecd73be9 Merge pull request 'testing' (#36) from testing into main
Reviewed-on: #36
2023-01-08 17:14:53 +01:00
4e666112b5 Merge pull request 'dev' (#35) from dev into testing
Reviewed-on: #35
2023-01-08 17:14:30 +01:00
394c038e5c Merge pull request 'patch-version' (#34) from patch-version into dev
Reviewed-on: #34
2023-01-08 17:12:17 +01:00
e96fb55f90 docs: new changelog entry 2023-01-08 17:11:31 +01:00
a330aec9d7 docs: new versions 2023-01-08 17:11:03 +01:00
fc08db02eb Merge pull request 'fixes: #31' (#33) from patch-DarkSky into dev
Reviewed-on: #33
2023-01-08 17:05:53 +01:00
f8b12ba1a7 fix: #31
Use of uninitialized value in DarkSkyAPI.pm line 730
2023-01-08 17:05:11 +01:00
908773420b Merge pull request 'fixes: #30' (#32) from patch-openweathermap into dev
Reviewed-on: #32
2023-01-08 16:54:10 +01:00
cef2455448 fix: #30
Use of uninitialized value in OpenWeatherMapAPI.pm line 981
2023-01-08 16:52:11 +01:00
e237018aad fix: wrong snow hour assignment 2023-01-08 16:21:40 +01:00
c7f7066b31 Merge pull request 'testing' (#29) from testing into main
Reviewed-on: #29
2023-01-07 13:49:01 +01:00
363e862244 Merge pull request 'dev' (#28) from dev into testing
Reviewed-on: #28
2023-01-07 13:47:47 +01:00
8659585952 Merge pull request 'patch-newversion' (#27) from patch-newversion into dev
Reviewed-on: #27
2023-01-07 13:45:43 +01:00
8 changed files with 2320 additions and 1103 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,5 @@
UPD 2023-01-07_13:28:16 57768 FHEM/59_Weather.pm
UPD 2023-01-07_13:28:44 49884 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-07_13:28:59 33258 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-07_13:29:12 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm
UPD 2023-01-10_21:41:34 25809 FHEM/59_Weather.pm
UPD 2023-01-10_21:20:58 33948 lib/FHEM/Core/Weather.pm
UPD 2023-01-10_21:25:52 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.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

View File

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

View File

@ -699,7 +699,7 @@ sub _CallWeatherCallbackFn {
my $self = shift;
# ## Aufruf der callbackFn
return ::Weather_RetrieveCallbackFn( $self->{devName} );
return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
}
sub _ErrorHandling {
@ -709,8 +709,7 @@ sub _ErrorHandling {
my $err = shift;
$self->{cached}->{current_date_time} =
__strftimeWrapper( "%a, %e %b %Y %H:%M",
localtime( $self->{fetchTime} ) );
_strftimeWrapper( "%a, %e %b %Y %H:%M", localtime( $self->{fetchTime} ) );
$self->{cached}->{status} = $err;
$self->{cached}->{validity} = 'stale';
@ -726,9 +725,9 @@ sub _CreateForecastRef {
{
lat => $self->{lat},
long => $self->{long},
apiMaintainer => 'Marko Oldenburg ('
. $META->{x_fhem_maintainer}[0] . ')',
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
apiMaintainer => $META->{author}[0],
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
. $META->{release_status},
}
);
@ -773,12 +772,19 @@ sub _strftimeWrapper {
"abstract": "Wetter API für Weather DarkSky"
}
},
"version": "v1.2.10",
"keywords": [
"fhem-mod-device",
"Weather",
"API"
],
"release_status": "stable",
"license": "GPL_2",
"version": "v1.2.12",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],
"x_fhem_maintainer": [
"CoolTux"
"<a href=https://forum.fhem.de/index.php?action=profile;u=13684>CoolTux</a>"
],
"x_fhem_maintainer_github": [
"CoolTuxNet"
@ -786,8 +792,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,

View File

@ -688,7 +688,7 @@ sub _FillSelfHashWithWeatherResponseForForecastHourly {
),
'snow3h' => (
$data->{list}->[$i]->{snow}->{'3h'}
? $data->{list}->[$i]->{snow}->{'1h'}
? $data->{list}->[$i]->{snow}->{'3h'}
: 0
),
}
@ -951,7 +951,7 @@ sub _CallWeatherCallbackFn {
# print 'Dumperausgabe: ' . Dumper $self;
### Aufruf der callbackFn
return ::Weather_RetrieveCallbackFn( $self->{devName} );
return FHEM::Core::Weather::RetrieveCallbackFn( $self->{devName} );
}
sub _ErrorHandling {
@ -977,9 +977,9 @@ sub _CreateForecastRef {
{
lat => $self->{lat},
long => $self->{long},
apiMaintainer => 'Marko Oldenburg ('
. $META->{x_fhem_maintainer}[0] . ')',
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal,
apiMaintainer => $META->{author}[0],
apiVersion => version->parse( __PACKAGE__->VERSION() )->normal . '-'
. $META->{release_status},
}
);
@ -1024,7 +1024,14 @@ sub _strftimeWrapper {
"abstract": "Wetter API für OpenWeatherMap"
}
},
"version": "v3.2.5",
"keywords": [
"fhem-mod-device",
"Weather",
"API"
],
"release_status": "stable",
"license": "GPL_2",
"version": "v3.2.6",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],
@ -1037,8 +1044,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,

View File

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

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

File diff suppressed because it is too large Load Diff