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

30_DUOFERN: fix DoTrigger

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17477 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Telekatz 2018-10-07 14:15:26 +00:00
parent 17a116ea40
commit 73868c59a0
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/30_DUOFERN.pm
View File

@ -1054,7 +1054,8 @@ sub
DUOFERN_Parse($$) DUOFERN_Parse($$)
{ {
my ($hash,$msg) = @_; my ($hash,$msg) = @_;
my @retval = ();
my $code = substr($msg,30,6); my $code = substr($msg,30,6);
$code = substr($msg,36,6) if ($msg =~ m/81.{42}/); $code = substr($msg,36,6) if ($msg =~ m/81.{42}/);
@ -1063,7 +1064,6 @@ DUOFERN_Parse($$)
my $def = $modules{DUOFERN}{defptr}{$code}; my $def = $modules{DUOFERN}{defptr}{$code};
my $def01; my $def01;
my $def02;
if(!$def) { if(!$def) {
DoTrigger("global","UNDEFINED DUOFERN_$code DUOFERN $code"); DoTrigger("global","UNDEFINED DUOFERN_$code DUOFERN $code");
@ -1165,7 +1165,7 @@ DUOFERN_Parse($$)
foreach my $reading (@readingsBlindMode){ foreach my $reading (@readingsBlindMode){
delete($hash->{READINGS}{$reading}); delete($hash->{READINGS}{$reading});
delete($statusValue{$reading}); delete($statusValue{$reading});
Log3 $hash, 1, "DUOFERN blinds mode ".$reading; #Log3 $hash, 1, "DUOFERN blinds mode ".$reading;
} }
} }
@ -1249,8 +1249,8 @@ DUOFERN_Parse($$)
readingsBulkUpdate($hashA, $key, $statusValue{$key}, 1); readingsBulkUpdate($hashA, $key, $statusValue{$key}, 1);
} }
readingsEndUpdate($hashA, 1); # Notify is done by Dispatch readingsEndUpdate($hashA, 1); # Notify is done by Dispatch
DoTrigger($hashA->{NAME}, undef); push (@retval, $hashA->{NAME}) if ($hashA->{NAME} ne $name);
} }
} else { } else {
@ -1308,7 +1308,6 @@ DUOFERN_Parse($$)
} }
readingsSingleUpdate($hash, "event", $sensorMsg{$id}{name}.$chan, 1); readingsSingleUpdate($hash, "event", $sensorMsg{$id}{name}.$chan, 1);
DoTrigger($hash->{NAME},$sensorMsg{$id}{name}.$chan);
} }
} }
@ -1417,10 +1416,10 @@ DUOFERN_Parse($$)
Log3 $hash, 3, "DUOFERN unknown msg: $msg"; Log3 $hash, 3, "DUOFERN unknown msg: $msg";
} }
DoTrigger($def01->{NAME}, undef) if ($def01); push (@retval, $def01->{NAME}) if ($def01);
DoTrigger($def02->{NAME}, undef) if ($def02); push (@retval, $name);
return $name; return @retval;
} }
##################################### #####################################