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

10_MQTT2_DEVICE.pm: allow perl for setList and getList (Forum #133903)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27674 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2023-06-12 08:33:06 +00:00
parent d4b809ce70
commit 27f98a442c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -307,10 +307,14 @@ MQTT2_JSON($;$)
} }
sub sub
MQTT2_getCmdHash($) MQTT2_getCmdHash($$)
{ {
my ($list) = @_; my ($hash, $list) = @_;
my (%h, @cmd); my (%h, @cmd);
$list = AnalyzePerlCommand($hash ? $hash->{CL} : undef, $1)
if($list =~ m/^{(.*)}/s); #133903
map { map {
my ($k,$v) = split(" ",$_,2); my ($k,$v) = split(" ",$_,2);
push @cmd, $k; push @cmd, $k;
@ -365,7 +369,7 @@ MQTT2_DEVICE_Get($@)
return "Not enough arguments for get" if(!defined($a[1])); return "Not enough arguments for get" if(!defined($a[1]));
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($gets,$cmdList) = MQTT2_getCmdHash(AttrVal($name, "getList", "")); my ($gets,$cmdList) = MQTT2_getCmdHash($hash, AttrVal($name, "getList", ""));
return "Unknown argument $a[1], choose one of $cmdList" if(!$gets->{$a[1]}); return "Unknown argument $a[1], choose one of $cmdList" if(!$gets->{$a[1]});
return undef if(IsDisabled($name)); return undef if(IsDisabled($name));
Log3 $hash, 3, "MQTT2_DEVICE get ".join(" ", @a); Log3 $hash, 3, "MQTT2_DEVICE get ".join(" ", @a);
@ -395,7 +399,7 @@ MQTT2_DEVICE_Set($@)
return "Not enough arguments for set" if(!defined($a[1])); return "Not enough arguments for set" if(!defined($a[1]));
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my ($sets,$cmdList) = MQTT2_getCmdHash(AttrVal($name, "setList", "")); my ($sets,$cmdList) = MQTT2_getCmdHash($hash, AttrVal($name, "setList", ""));
my $cmdName = $a[1]; my $cmdName = $a[1];
return MQTT2_DEVICE_addPos($hash,@a) if($cmdName eq "addPos"); # hidden cmd return MQTT2_DEVICE_addPos($hash,@a) if($cmdName eq "addPos"); # hidden cmd
my $cmd = $sets->{$cmdName}; my $cmd = $sets->{$cmdName};
@ -530,8 +534,8 @@ MQTT2_DEVICE_Attr($$)
if($attrName eq "periodicCmd") { if($attrName eq "periodicCmd") {
if($type eq "set") { if($type eq "set") {
if($init_done) { if($init_done) {
my ($gets,undef) = MQTT2_getCmdHash(AttrVal($dev, "getList", "")); my ($gets,undef) = MQTT2_getCmdHash($hash, AttrVal($dev,"getList",""));
my ($sets,undef) = MQTT2_getCmdHash(AttrVal($dev, "setList", "")); my ($sets,undef) = MQTT2_getCmdHash($hash, AttrVal($dev,"setList",""));
for my $np (split(" ", $param)) { for my $np (split(" ", $param)) {
return "$np ist not of the form cmd:period" if($np !~ m/(.*):(.*)/); return "$np ist not of the form cmd:period" if($np !~ m/(.*):(.*)/);
return "$1 is neither a get nor a set command" return "$1 is neither a get nor a set command"
@ -557,7 +561,7 @@ MQTT2_DEVICE_periodic()
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $param = AttrVal($name, "periodicCmd", ""); my $param = AttrVal($name, "periodicCmd", "");
return if(!$param); return if(!$param);
my ($gets,undef) = MQTT2_getCmdHash(AttrVal($name, "getList", "")); my ($gets,undef) = MQTT2_getCmdHash($hash, AttrVal($name, "getList", ""));
my $cnt = ++$hash->{periodicCounter}; my $cnt = ++$hash->{periodicCounter};
for my $np (split(" ", $param)) { for my $np (split(" ", $param)) {
next if($np !~ m/(.*):(.*)/ || $cnt % int($2)); next if($np !~ m/(.*):(.*)/ || $cnt % int($2));
@ -1129,6 +1133,9 @@ zigbee2mqtt_devStateIcon255($;$$)
MQTT message will be sent.</li> MQTT message will be sent.</li>
<li>SetExtensions is activated</li> <li>SetExtensions is activated</li>
<li>if the topic name ends with :r, then the retain flag is set</li> <li>if the topic name ends with :r, then the retain flag is set</li>
<li>if the whole argument is enclosed in {}, then it is evaluated as a
perl expression. The string returned will be interpreted as described
above.</li>
</ul> </ul>
</li><br> </li><br>