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

Merge pull request 'dev' (#39) from dev into main

Browse Source 
Reviewed-on: #39
This commit is contained in:
Marko Oldenburg 2023-01-08 22:00:37 +01:00
commit 2e8acfff0b
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CHANGELOG.md
View File

@ -1,4 +1,24 @@
### docs: new versions (HEAD -> patch-version) ### fix: bugfix function WeatherAsHtmlD not working (HEAD -> patch-WeatherAsHtmlD)
>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)

9
FHEM/59_Weather.pm
View File

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

6
controls_Weather.txt
View File

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