Compare commits
24 Commits
Author | SHA1 | Date | |
---|---|---|---|
e3b9f512b9 | |||
99b46338ca | |||
a78a1a986d | |||
62df910faa | |||
f96c557a22 | |||
4eeb71e8bc | |||
eeea03d2df | |||
2e8acfff0b | |||
c29f48a282 | |||
185a7bbc91 | |||
0a2f755324 | |||
b6ecd73be9 | |||
4e666112b5 | |||
394c038e5c | |||
e96fb55f90 | |||
a330aec9d7 | |||
fc08db02eb | |||
f8b12ba1a7 | |||
908773420b | |||
cef2455448 | |||
e237018aad | |||
c7f7066b31 | |||
363e862244 | |||
8659585952 |
1127
CHANGELOG.md
1127
CHANGELOG.md
File diff suppressed because it is too large
Load Diff
1097
FHEM/59_Weather.pm
1097
FHEM/59_Weather.pm
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
|
@ -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',
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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
1140
lib/FHEM/Core/Weather.pm
Normal file
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user