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

dev #35

Merged
marko merged 9 commits from dev into testing 2023-01-08 16:14:30 +00:00
Conversation 0 Commits 9 Files Changed 4 +1078 -18
4 changed files with 1078 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1046
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

8
controls_Weather.txt
View File

@@ -1,4 +1,4 @@
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-07_19:00:05 57768 FHEM/59_Weather.pm
UPD 2023-01-08_17:09:40 50104 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-08_17:09:32 33411 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-07_19:00:05 36090 lib/FHEM/APIs/Weather/wundergroundAPI.pm

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

@@ -726,9 +726,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 +773,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.11",
"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 +793,9 @@ sub _strftimeWrapper {
"prereqs": {
"runtime": {
"requires": {
"FHEM": 5.00918799,
"HttpUtils": 5.023,
"FHEM::Meta": 0,
"HttpUtils": 0,
"strict": 0,
"warnings": 0,
"constant": 0,

20
lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
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
),
}
@@ -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,