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

Merge pull request 'testing' (#52) from testing into main

Browse Source 
Reviewed-on: #52
This commit is contained in:
Marko Oldenburg 2023-02-05 09:48:33 +01:00
commit 33763032c6
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controls_Weather.txt
View File

@ -1,5 +1,5 @@
UPD 2023-01-29_16:14:48 25809 FHEM/59_Weather.pm UPD 2023-01-29_16:14:48 25809 FHEM/59_Weather.pm
UPD 2023-02-02_22:56:41 33947 lib/FHEM/Core/Weather.pm UPD 2023-02-05_09:25:24 34254 lib/FHEM/Core/Weather.pm
UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm UPD 2023-01-29_16:14:48 50106 lib/FHEM/APIs/Weather/DarkSkyAPI.pm
UPD 2023-01-29_16:14:48 33422 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm UPD 2023-01-29_16:14:48 33422 lib/FHEM/APIs/Weather/OpenWeatherMapAPI.pm
UPD 2023-01-29_16:14:48 36101 lib/FHEM/APIs/Weather/wundergroundAPI.pm UPD 2023-01-29_16:14:48 36101 lib/FHEM/APIs/Weather/wundergroundAPI.pm

21
lib/FHEM/Core/Weather.pm
View File

@ -32,9 +32,18 @@ package FHEM::Core::Weather;
use strict; use strict;
use warnings; use warnings;
use Time::HiRes qw(gettimeofday); my $missingModul = '';
eval { use Time::HiRes qw /gettimeofday/; 1 }
or $missingModul .= "libtime-hires-perl ";
eval { use Readonly; 1 }
or $missingModul .= "libreadonly-perl ";
#use Time::HiRes qw(gettimeofday);
use experimental qw /switch/; use experimental qw /switch/;
use Readonly;
#use Readonly;
use FHEM::Meta; use FHEM::Meta;
@ -318,8 +327,6 @@ sub _ReturnWithError {
} }
sub DeleteForecastreadings { sub DeleteForecastreadings {
return 0 unless ( __PACKAGE__ eq caller(0) );
my $hash = shift; my $hash = shift;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
@ -770,6 +777,12 @@ sub Define {
return $@ unless ( FHEM::Meta::SetInternals($hash) ); return $@ unless ( FHEM::Meta::SetInternals($hash) );
use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' ); use version 0.60; our $VERSION = FHEM::Meta::Get( $hash, 'version' );
return
'Cannot define Weather device. Please use "apt install '
. ${missingModul}
. ' to install missing perl modules'
if ($missingModul);
my $usage = my $usage =
"syntax: define <name> Weather [API=<API>] [apikey=<apikey>] [location=<location>] [interval=<interval>] [lang=<lang>]"; "syntax: define <name> Weather [API=<API>] [apikey=<apikey>] [location=<location>] [interval=<interval>] [lang=<lang>]";