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

Merge pull request 'change code for better def modify' (#7) from patch-midified into dev

Browse Source 
Reviewed-on: #7
This commit is contained in:
Marko Oldenburg
2022-12-20 18:05:51 +01:00
parent f40224415d 776b78c0c6
commit d5528cccd6
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
59_Weather.pm
View File

@@ -728,17 +728,22 @@ sub Weather_Notify {
my $type = $hash->{TYPE}; my $type = $hash->{TYPE};
return if ( $dev->{NAME} ne "global" ); return if ( $dev->{NAME} ne "global" );
return if ( !grep { /^INITIALIZED|REREADCFG$/ } @{ $dev->{CHANGED} } );
# return if($attr{$name} && $attr{$name}->{disable}); # set forcast and alerts values to api object
if ( grep { /^MODIFIED.$name$/x } @{ $dev->{CHANGED} } ) {
$hash->{fhem}->{api}->setForecast( AttrVal( $name, 'forecast', '' ) );
$hash->{fhem}->{api}->setAlerts( AttrVal( $name, 'alerts', 0 ) );
Weather_GetUpdate($hash);
}
return if ( !grep { /^INITIALIZED|REREADCFG$/x } @{ $dev->{CHANGED} } );
# update weather after initialization or change of configuration # update weather after initialization or change of configuration
# wait 10 to 29 seconds to avoid congestion due to concurrent activities # wait 10 to 29 seconds to avoid congestion due to concurrent activities
Weather_DisarmTimer($hash); Weather_DisarmTimer($hash);
my $delay = 10 + int( rand(20) ); my $delay = 10 + int( rand(20) );
#$delay= 3; # delay removed until further notice
Log3 $hash, 5, Log3 $hash, 5,
"Weather $name: FHEM initialization or rereadcfg triggered update, delay $delay seconds."; "Weather $name: FHEM initialization or rereadcfg triggered update, delay $delay seconds.";
Weather_RearmTimer( $hash, gettimeofday() + $delay ); Weather_RearmTimer( $hash, gettimeofday() + $delay );
@@ -816,9 +821,6 @@ sub Weather_Define {
} }
); );
Weather_GetUpdate($hash)
if ($init_done);
return; return;
} }