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

change data handle for callBackFn - wichtig alle Module Updaten

Browse Source
This commit is contained in:
Marko Oldenburg 2019-01-09 12:55:21 +01:00
parent 49a292cc50
commit 117ebca8bc
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
59_Weather.pm
View File

@ -336,8 +336,8 @@ sub Weather_ReturnWithError($$) {
sub Weather_RetrieveCallbackFn($) { sub Weather_RetrieveCallbackFn($) {
my $hash = shift; my $name = shift;
my $name = $hash->{NAME}; my $hash = $defs{$name};
my $responseRef = $hash->{fhem}{api}->getWeather; my $responseRef = $hash->{fhem}{api}->getWeather;
if ( $responseRef->{status} eq 'ok' ) { if ( $responseRef->{status} eq 'ok' ) {
@ -602,8 +602,7 @@ sub Weather_Define($$) {
Weather_LanguageInitialize($hash->{LANG}); Weather_LanguageInitialize($hash->{LANG});
my $apistring = $api . '::Weather'; my $apistring = $api . '::Weather';
# $hash->{fhem}{api} = $api . '::Weather'->new( { hash => $hash, apikey => $hash->{APIKEY}, location => $hash->{LOCATION}, cachemaxage => 600, language => $hash->{LANG} } ); $hash->{fhem}{api} = $apistring->new( { devName => $hash->{NAME}, apikey => $hash->{APIKEY}, location => $hash->{LOCATION}, cachemaxage => 600, language => $hash->{LANG} } );
$hash->{fhem}{api} = $apistring->new( { hash => $hash, apikey => $hash->{APIKEY}, location => $hash->{LOCATION}, cachemaxage => 600, language => $hash->{LANG} } );
Weather_GetUpdate($hash) if($init_done); Weather_GetUpdate($hash) if($init_done);

4
DarkSkyAPI.pm
View File

@ -66,7 +66,7 @@ sub new {
my ( $class, $argsRef ) = @_; my ( $class, $argsRef ) = @_;
my $self = { my $self = {
devHash => $argsRef->{hash}, devName => $argsRef->{devName},
key => ( defined( $argsRef->{apikey} ) ? $argsRef->{apikey} : 'none' ), key => ( defined( $argsRef->{apikey} ) ? $argsRef->{apikey} : 'none' ),
cachemaxage => $argsRef->{cachemaxage}, cachemaxage => $argsRef->{cachemaxage},
lang => $argsRef->{language}, lang => $argsRef->{language},
@ -437,7 +437,7 @@ sub _CallWeatherCallbackFn($) {
my $self = shift; my $self = shift;
# ## Aufruf der callbackFn # ## Aufruf der callbackFn
main::Weather_RetrieveCallbackFn( $self->{devHash} ); main::Weather_RetrieveCallbackFn( $self->{devName} );
} }
sub _ErrorHandling($$) { sub _ErrorHandling($$) {

4
OpenWeatherMapAPI.pm
View File

@ -89,7 +89,7 @@ sub new {
my ( $class, $argsRef ) = @_; my ( $class, $argsRef ) = @_;
my $self = { my $self = {
devHash => $argsRef->{hash}, devName => $argsRef->{devName},
key => ( defined( $argsRef->{apikey} ) ? $argsRef->{apikey} : 'none' ), key => ( defined( $argsRef->{apikey} ) ? $argsRef->{apikey} : 'none' ),
cachemaxage => $argsRef->{cachemaxage}, cachemaxage => $argsRef->{cachemaxage},
lang => $argsRef->{language}, lang => $argsRef->{language},
@ -286,7 +286,7 @@ sub _CallWeatherCallbackFn($) {
my $self = shift; my $self = shift;
# ## Aufruf der callbackFn # ## Aufruf der callbackFn
main::Weather_RetrieveCallbackFn( $self->{devHash} ); main::Weather_RetrieveCallbackFn( $self->{devName} );
} }
sub _ErrorHandling($$) { sub _ErrorHandling($$) {