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

Compare commits

base: FHEM:v2.2.20
Branches Tags
FHEM:dev FHEM:main FHEM:testing
FHEM:v2.2.22 FHEM:v2.2.21 FHEM:v2.2.20
...
compare: FHEM:v2.2.21
Branches Tags
FHEM:main FHEM:dev FHEM:testing
FHEM:v2.2.22 FHEM:v2.2.21 FHEM:v2.2.20

15 Commits
v2.2.20 ... v2.2.21

Author SHA1 Message Date
Marko Oldenburg
185a7bbc91 docs: add new changelog and change version 2023-01-08 21:56:15 +01:00
Marko Oldenburg
0a2f755324 fix: bugfix function WeatherAsHtmlD not working 2023-01-08 21:54:31 +01:00
Marko Oldenburg
b6ecd73be9 Merge pull request 'testing' (#36) from testing into main 
Reviewed-on: #36
 2023-01-08 17:14:53 +01:00
Marko Oldenburg
4e666112b5 Merge pull request 'dev' (#35) from dev into testing 
Reviewed-on: #35
 2023-01-08 17:14:30 +01:00
Marko Oldenburg
394c038e5c Merge pull request 'patch-version' (#34) from patch-version into dev 
Reviewed-on: #34
 2023-01-08 17:12:17 +01:00
Marko Oldenburg
e96fb55f90 docs: new changelog entry 2023-01-08 17:11:31 +01:00
Marko Oldenburg
a330aec9d7 docs: new versions 2023-01-08 17:11:03 +01:00
Marko Oldenburg
fc08db02eb Merge pull request 'fixes: #31' (#33) from patch-DarkSky into dev 
Reviewed-on: #33
 2023-01-08 17:05:53 +01:00
Marko Oldenburg
f8b12ba1a7 fix: #31 
Use of uninitialized value in DarkSkyAPI.pm line 730
 2023-01-08 17:05:11 +01:00
Marko Oldenburg
908773420b Merge pull request 'fixes: #30' (#32) from patch-openweathermap into dev 
Reviewed-on: #32
 2023-01-08 16:54:10 +01:00
Marko Oldenburg
cef2455448 fix: #30 
Use of uninitialized value in OpenWeatherMapAPI.pm line 981
 2023-01-08 16:52:11 +01:00
Marko Oldenburg
e237018aad fix: wrong snow hour assignment 2023-01-08 16:21:40 +01:00
Marko Oldenburg
c7f7066b31 Merge pull request 'testing' (#29) from testing into main 
Reviewed-on: #29
 2023-01-07 13:49:01 +01:00
Marko Oldenburg
363e862244 Merge pull request 'dev' (#28) from dev into testing 
Reviewed-on: #28
 2023-01-07 13:47:47 +01:00
Marko Oldenburg
8659585952 Merge pull request 'patch-newversion' (#27) from patch-newversion into dev 
Reviewed-on: #27
 2023-01-07 13:45:43 +01:00
5 changed files with 1103 additions and 22 deletions
Expand all files Collapse all files

1068
CHANGELOG.md
View File

File diff suppressed because it is too large Load Diff

9
FHEM/59_Weather.pm
View File

@ -1078,15 +1078,16 @@ sub WeatherAsHtmlD {
my $op2 = shift;
my ( $f, $items ) = Weather_CheckOptions( $d, $op1, $op2 );
my $ret;
if ($FW_ss) {
WeatherAsHtmlV( $d, $f, $items );
$ret = WeatherAsHtmlV( $d, $f, $items );
}
else {
WeatherAsHtmlH( $d, $f, $items );
$ret = WeatherAsHtmlH( $d, $f, $items );
}
return;
return $ret;
}
sub Weather_CheckOptions {
@ -1606,7 +1607,7 @@ sub Weather_CheckOptions {
],
"release_status": "stable",
"license": "GPL_2",
"version": "v2.2.20",
"version": "v2.2.21",
"author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>"
],

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-08_21:52:20 57800 FHEM/59_Weather.pm
UPD 2023-01-08_17:15:24 50104 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-08_17:15:24 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,