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

Merge pull request 'patch-specials' (#16) from patch-specials into dev

Browse Source 
Reviewed-on: #16
This commit is contained in:
Marko Oldenburg 2022-12-30 13:18:44 +01:00
commit 3a5046aab6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controls_Weather.txt
View File

@ -1,4 +1,4 @@
UPD 2022-12-30_12:15:47 54815 FHEM/59_Weather.pm UPD 2022-12-30_12:22:17 54815 FHEM/59_Weather.pm
UPD 2022-12-30_12:15:47 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2022-12-30_12:22:17 49883 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2022-12-30_12:15:47 32101 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2022-12-30_12:22:17 32101 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2022-12-30_12:17:04 36070 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2022-12-30_13:17:00 36076 lib/FHEM/APIs/Weather/wundergroundAPI.pm

12
lib/FHEM/APIs/Weather/wundergroundAPI.pm
View File

@ -393,7 +393,7 @@ sub _ProcessingRetrieveData {
# print Dumper $data; ## für Debugging # print Dumper $data; ## für Debugging
$self->{cached}{current_date_time} = $self->{cached}{current_date_time} =
strftimeWrapper( "%a, %e %b %Y %H:%M", _strftimeWrapper( "%a, %e %b %Y %H:%M",
localtime( $self->{fetchTime} ) ); localtime( $self->{fetchTime} ) );
# $self->{cached}{timezone} = $data->{timezone}; # $self->{cached}{timezone} = $data->{timezone};
@ -455,7 +455,7 @@ sub _ProcessingRetrieveData {
'solarRadiation' => $data->{solarRadiation}, 'solarRadiation' => $data->{solarRadiation},
'uvIndex' => $data->{uv}, 'uvIndex' => $data->{uv},
'humidity' => $data->{humidity}, 'humidity' => $data->{humidity},
'pubDate' => strftimeWrapper( 'pubDate' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( $data->{obsTimeLocal} ) main::time_str2num( $data->{obsTimeLocal} )
@ -507,7 +507,7 @@ sub _ProcessingRetrieveData {
'moonPhase' => $data->{moonPhase}[$i], 'moonPhase' => $data->{moonPhase}[$i],
'moonPhaseCode' => $data->{moonPhaseCode}[$i], 'moonPhaseCode' => $data->{moonPhaseCode}[$i],
'moonPhaseDay' => $data->{moonPhaseDay}[$i], 'moonPhaseDay' => $data->{moonPhaseDay}[$i],
'moonriseTime' => strftimeWrapper( 'moonriseTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(
@ -515,7 +515,7 @@ sub _ProcessingRetrieveData {
) )
) )
), ),
'moonsetTime' => strftimeWrapper( 'moonsetTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(
@ -526,7 +526,7 @@ sub _ProcessingRetrieveData {
'narrative' => $data->{narrative}[$i], 'narrative' => $data->{narrative}[$i],
'precipProbability' => $data->{qpf}[$i], 'precipProbability' => $data->{qpf}[$i],
'precipProbabilitySnow' => $data->{qpfSnow}[$i], 'precipProbabilitySnow' => $data->{qpfSnow}[$i],
'sunriseTime' => strftimeWrapper( 'sunriseTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(
@ -534,7 +534,7 @@ sub _ProcessingRetrieveData {
) )
) )
), ),
'sunsetTime' => strftimeWrapper( 'sunsetTime' => _strftimeWrapper(
"%a, %e %b %Y %H:%M", "%a, %e %b %Y %H:%M",
localtime( localtime(
main::time_str2num( main::time_str2num(