From c6b7807eeeed21f6b52db46d2be2e7a077ab88e7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Wed, 22 Aug 2018 06:47:08 +0000 Subject: [PATCH] 10_MQTT2_DEVICE.pm: allow empty lines in setList/getList (Forum #90145) git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@17189 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/10_MQTT2_DEVICE.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FHEM/10_MQTT2_DEVICE.pm b/FHEM/10_MQTT2_DEVICE.pm index 998af49ee..2cca711aa 100644 --- a/FHEM/10_MQTT2_DEVICE.pm +++ b/FHEM/10_MQTT2_DEVICE.pm @@ -168,6 +168,7 @@ MQTT2_DEVICE_Get($@) my %gets; map { my ($k,$v) = split(" ",$_,2); $gets{$k} = $v; } + grep /./, split("\n", AttrVal($hash->{NAME}, "getList", "")); return "Unknown argument $a[1], choose one of ".join(" ",sort keys %gets) if(!$gets{$a[1]}); @@ -207,6 +208,7 @@ MQTT2_DEVICE_Set($@) my %sets; map { my ($k,$v) = split(" ",$_,2); $sets{$k} = $v; } + grep /./, split("\n", AttrVal($hash->{NAME}, "setList", "")); my $cmd = $sets{$a[1]}; return SetExtensions($hash, join(" ", sort keys %sets), @a) if(!$cmd); @@ -298,7 +300,7 @@ MQTT2_DEVICE_addReading($$) my ($name, $param) = @_; foreach my $line (split("\n", $param)) { my ($re,$code) = split(" ", $line,2); - $modules{MQTT2_DEVICE}{defptr}{re}{$re}{$name} = $code; + $modules{MQTT2_DEVICE}{defptr}{re}{$re}{$name} = $code if($re && $code); } }