FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

93_FHEM2FHEM.pm: add attributes excludeEvents and eventOnly (Forum #62369)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13024 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2017-01-09 15:16:44 +00:00
parent ff71419945
commit 9eb8c48c97
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/FHEM/93_FHEM2FHEM.pm
View File

@ -31,7 +31,8 @@ FHEM2FHEM_Initialize($)
# Normal devices # Normal devices
$hash->{DefFn} = "FHEM2FHEM_Define"; $hash->{DefFn} = "FHEM2FHEM_Define";
$hash->{UndefFn} = "FHEM2FHEM_Undef"; $hash->{UndefFn} = "FHEM2FHEM_Undef";
$hash->{AttrList}= "dummy:1,0 disable:0,1 disabledForIntervals"; $hash->{AttrList}= "dummy:1,0 disable:0,1 ".
"disabledForIntervals excludeEvents eventOnly:1,0";
} }
##################################### #####################################
@ -138,6 +139,7 @@ FHEM2FHEM_Read($)
} }
return if(IsDisabled($name)); return if(IsDisabled($name));
my $excl = AttrVal($name, "excludeEvents", undef);
my $data = $hash->{PARTIAL}; my $data = $hash->{PARTIAL};
#Log3 $hash, 5, "FHEM2FHEM/RAW: $data/$buf"; #Log3 $hash, 5, "FHEM2FHEM/RAW: $data/$buf";
@ -149,26 +151,31 @@ FHEM2FHEM_Read($)
$rmsg =~ s/\r//; $rmsg =~ s/\r//;
if($hash->{informType} eq "LOG") { if($hash->{informType} eq "LOG") {
my ($type, $name, $msg) = split(" ", $rmsg, 3); my ($type, $rname, $msg) = split(" ", $rmsg, 3);
next if(!defined($msg)); # Bogus data next if(!defined($msg)); # Bogus data
my $re = $hash->{regexp}; my $re = $hash->{regexp};
next if($re && !($name =~ m/^$re$/ || "$name:$msg" =~ m/^$re$/)); next if($re && !($rname =~ m/^$re$/ || "$rname:$msg" =~ m/^$re$/));
Log3 $name, 4, "$name: $rmsg"; next if($excl && ($rname =~ m/^$excl$/ || "$rname:$msg" =~ m/^$excl$/));
Log3 $name, 4, "$rname: $rmsg";
if(!$defs{$name}) { if(!$defs{$rname}) {
$defs{$name}{NAME} = $name; $defs{$rname}{NAME} = $rname;
$defs{$name}{TYPE} = $type; $defs{$rname}{TYPE} = $type;
$defs{$name}{STATE} = $msg; $defs{$rname}{STATE} = $msg;
$defs{$name}{FAKEDEVICE} = 1; # Avoid set/attr/delete/etc in notify $defs{$rname}{FAKEDEVICE} = 1; # Avoid set/attr/delete/etc in notify
$defs{$name}{TEMPORARY} = 1; # Do not save it $defs{$rname}{TEMPORARY} = 1; # Do not save it
DoTrigger($name, $msg); DoTrigger($rname, $msg);
delete($defs{$name}); delete($defs{$rname});
} else { } else {
if($msg =~ m/^([^:]*): (.*)$/) { if(AttrVal($name,"eventOnly",0)) {
readingsSingleUpdate($defs{$name}, $1, $2, 1); DoTrigger($rname, $msg);
} else { } else {
DoTrigger($name, $msg); if($msg =~ m/^([^:]*): (.*)$/) {
readingsSingleUpdate($defs{$rname}, $1, $2, 1);
} else {
readingsSingleUpdate($defs{$rname}, "state", $msg, 1);
}
} }
} }
@ -416,6 +423,13 @@ FHEM2FHEM_Set($@)
<li><a href="#dummy">dummy</a></li> <li><a href="#dummy">dummy</a></li>
<li><a href="#disable">disable</a></li> <li><a href="#disable">disable</a></li>
<li><a href="#disabledForIntervals">disabledForIntervals</a></li> <li><a href="#disabledForIntervals">disabledForIntervals</a></li>
<li><a name="#eventOnly">eventOnly</a><br>
if set, generate only events, do not set corresponding readings.
This is a compatibility feature, available only for LOG-Mode.
</li>
<li><a name="#excludeEvents">excludeEvents &lt;regexp&gt;</a>
do not publish events matching &lt;regexp&gt;
</li>
</ul> </ul>
</ul> </ul>
@ -517,6 +531,14 @@ FHEM2FHEM_Set($@)
<li><a href="#dummy">dummy</a></li> <li><a href="#dummy">dummy</a></li>
<li><a href="#disable">disable</a></li> <li><a href="#disable">disable</a></li>
<li><a href="#disabledForIntervals">disabledForIntervals</a></li> <li><a href="#disabledForIntervals">disabledForIntervals</a></li>
<li><a name="#eventOnly">eventOnly</a><br>
falls gesetzt, werden nur die Events generiert, und es wird kein
Reading aktualisiert. Ist nur im LOG-Mode aktiv.
</li>
<li><a name="#excludeEvents">excludeEvents &lt;regexp&gt;</a>
die auf das &lt;regexp&gt; zutreffende Events werden nicht
bereitgestellt.
</li>
</ul> </ul>
</ul> </ul>