From 13cae42b28b1c8ac255b6bf636f57f5aceba9aa1 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Sun, 23 Feb 2020 12:28:09 +0000 Subject: [PATCH] 00_MQTT2_SERVER.pm: add lastPublish reading to avoid set-events (Forum #108630) git-svn-id: https://svn.fhem.de/fhem/trunk@21256 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_MQTT2_CLIENT.pm | 1 + fhem/FHEM/00_MQTT2_SERVER.pm | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/00_MQTT2_CLIENT.pm b/fhem/FHEM/00_MQTT2_CLIENT.pm index 727a180ed..f7bdc4f13 100644 --- a/fhem/FHEM/00_MQTT2_CLIENT.pm +++ b/fhem/FHEM/00_MQTT2_CLIENT.pm @@ -248,6 +248,7 @@ MQTT2_CLIENT_Set($@) return "Usage: set $name publish -r topic [value]" if(@a < 1); my $tp = shift(@a); my $val = join(" ", @a); + readingsSingleUpdate($hash, "lastPublish", "$tp:$val", 0); MQTT2_CLIENT_doPublish($hash, $tp, $val, $retain); } elsif($a[0] eq "password") { diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm index 73b053966..d6cf81834 100644 --- a/fhem/FHEM/00_MQTT2_SERVER.pm +++ b/fhem/FHEM/00_MQTT2_SERVER.pm @@ -51,7 +51,7 @@ MQTT2_SERVER_Initialize($) sslCertPrefix ); use warnings 'qw'; - $hash->{AttrList} = join(" ", @attrList); + $hash->{AttrList} = join(" ", @attrList)." ".$readingFnAttributes; } ##################################### @@ -162,6 +162,7 @@ MQTT2_SERVER_Set($@) return "Usage: publish -r topic [value]" if(@a < 1); my $tp = shift(@a); my $val = join(" ", @a); + readingsSingleUpdate($hash, "lastPublish", "$tp:$val", 0); MQTT2_SERVER_doPublish($hash->{CL}, $hash, $tp, $val, $retain); } }