FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

33_readingsProxy.pm: use deviceEvents()

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7737 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-01-26 16:28:33 +00:00
parent 3bf4dd8f76
commit 78aeb58166
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/33_readingsProxy.pm
View File

@ -128,11 +128,14 @@ readingsProxy_Notify($$)
my ($hash,$dev) = @_; my ($hash,$dev) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
if( grep(m/^INITIALIZED$/, @{$dev->{CHANGED}}) ) { my $events = deviceEvents($dev,1);
return if( !$events );
if( grep(m/^INITIALIZED$/, @{$events}) ) {
readingsProxy_updateDevices($hash); readingsProxy_updateDevices($hash);
return undef; return undef;
} }
elsif( grep(m/^REREADCFG$/, @{$dev->{CHANGED}}) ) { elsif( grep(m/^REREADCFG$/, @{$events}) ) {
readingsProxy_updateDevices($hash); readingsProxy_updateDevices($hash);
return undef; return undef;
} }
@ -141,9 +144,9 @@ readingsProxy_Notify($$)
return if($dev->{NAME} eq $name); return if($dev->{NAME} eq $name);
my $max = int(@{$dev->{CHANGED}}); my $max = int(@{$events});
for (my $i = 0; $i < $max; $i++) { for (my $i = 0; $i < $max; $i++) {
my $s = $dev->{CHANGED}[$i]; my $s = $events->[$i];
$s = "" if(!defined($s)); $s = "" if(!defined($s));
if( $dev->{NAME} eq "global" && $s =~ m/^RENAMED ([^ ]*) ([^ ]*)$/) { if( $dev->{NAME} eq "global" && $s =~ m/^RENAMED ([^ ]*) ([^ ]*)$/) {