FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 13:24:56 +00:00
Code Issues Releases Wiki Activity

10_MQTT_DEVICE.pm: add $EVENT to the non-perl variant of set and get (Forum #91394)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17487 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-10-08 07:38:31 +00:00
parent 024ca15973
commit 507137015f
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -176,6 +176,36 @@ MQTT2_getCmdHash($)
return (\%h, join(" ",@cmd));
}
#############################
# replace {} and $EVENT. Used both in set and get
sub
MQTT2_buildCmd($$$)
{
my ($hash, $a, $cmd) = @_;
shift @{$a};
if($cmd =~ m/^{.*}$/) {
$cmd = EvalSpecials($cmd, ("%EVENT"=>join(" ",@{$a}), "%NAME"=>$hash->{NAME}));
$cmd = AnalyzeCommandChain($hash->{CL}, $cmd);
return if(!$cmd);
} else {
if($cmd =~ m/\$EV/) { # replace EVENT & $EVTPART
my $event = join(" ",@{$a});
$cmd =~ s/\$EVENT/$event/g;
for(my $i=0; $i<@{$a}; $i++) {
my $n = "\\\$EVTPART$i";
$cmd =~ s/$n/$a->[$i]/ge;
}
} else {
shift @{$a};
$cmd .= " ".join(" ",@{$a}) if(@{$a});
}
}
$cmd =~ s/\$DEVICETOPIC/$hash->{DEVICETOPIC}/g;
return $cmd;
}
#############################
sub
@ -198,18 +228,10 @@ MQTT2_DEVICE_Get($@)
}, $tHash, 0);
}
shift @a;
if($cmd =~ m/^{.*}$/) {
$cmd = EvalSpecials($cmd, ("%EVENT"=>join(" ",@a), "%NAME"=>$hash->{NAME}));
$cmd = AnalyzeCommandChain($hash->{CL}, $cmd);
return if(!$cmd);
} else {
shift @a;
$cmd .= " ".join(" ",@a) if(@a);
}
$cmd =~ s/\$DEVICETOPIC/$hash->{DEVICETOPIC}/g;
$cmd = MQTT2_buildCmd($hash, \@a, $cmd);
return if(!$cmd);
IOWrite($hash, split(" ",$cmd,2));
return undef;
}
@ -226,18 +248,8 @@ MQTT2_DEVICE_Set($@)
return SetExtensions($hash, $cmdList, @a) if(!$cmd);
return undef if(IsDisabled($hash->{NAME}));
shift @a;
if($cmd =~ m/^{.*}$/) {
my $NAME = $hash->{NAME};
$cmd = EvalSpecials($cmd, ("%EVENT"=>join(" ",@a), "%NAME"=>$hash->{NAME}));
$cmd = AnalyzeCommandChain($hash->{CL}, $cmd);
return if(!$cmd);
} else {
shift @a;
$cmd .= " ".join(" ",@a) if(@a);
}
$cmd =~ s/\$DEVICETOPIC/$hash->{DEVICETOPIC}/g;
$cmd = MQTT2_buildCmd($hash, \@a, $cmd);
return if(!$cmd);
IOWrite($hash, split(" ",$cmd,2));
readingsSingleUpdate($hash, "state", $cmdName, 1);
return undef;
@ -440,9 +452,10 @@ MQTT2_DEVICE_Undef($$)
<ul>
<li>arguments to the set command will be appended to the message
published (not for the perl expression)</li>
<li>if using a perl expressions, the command arguments are available as
$EVENT, $EVTPART0, etc. The perl expression must return a string
containing the topic and the message separated by a space.</li>
<li>the command arguments are available as $EVENT, $EVTPART0, etc.,
bot in the perl expression and the "normal" topic variant.</li>
<li>the perl expression must return a string containing the topic and
the message separated by a space.</li>
<li>SetExtensions is activated</li>
<li>if the topic name ends with :r, then the retain flag is set</li>
</ul>
@ -470,9 +483,10 @@ MQTT2_DEVICE_Undef($$)
Use a set and a notify/DOIF/etc definition for such a purpose</li>
<li>arguments to the get command will be appended to the message
published (not for the perl expression)</li>
<li>if using a perl expressions, the command arguments are available as
$EVENT, $EVTPART0, etc. The perl expression must return a string
containing the topic and the message separated by a space.</li>
<li>the command arguments are available as $EVENT, $EVTPART0, etc.
</li>
<li>the perl expression must return a string containing the topic and
the message separated by a space.</li>
</ul>
</li><br>