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

10_MQTT2_DEVICE.pm: allow empty lines in setList/getList (Forum #90145)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17189 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-08-22 06:47:08 +00:00
parent 1c36ec08a3
commit c9be09dce8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -168,6 +168,7 @@ MQTT2_DEVICE_Get($@)
my %gets; my %gets;
map { my ($k,$v) = split(" ",$_,2); $gets{$k} = $v; } map { my ($k,$v) = split(" ",$_,2); $gets{$k} = $v; }
grep /./,
split("\n", AttrVal($hash->{NAME}, "getList", "")); split("\n", AttrVal($hash->{NAME}, "getList", ""));
return "Unknown argument $a[1], choose one of ".join(" ",sort keys %gets) return "Unknown argument $a[1], choose one of ".join(" ",sort keys %gets)
if(!$gets{$a[1]}); if(!$gets{$a[1]});
@ -207,6 +208,7 @@ MQTT2_DEVICE_Set($@)
my %sets; my %sets;
map { my ($k,$v) = split(" ",$_,2); $sets{$k} = $v; } map { my ($k,$v) = split(" ",$_,2); $sets{$k} = $v; }
grep /./,
split("\n", AttrVal($hash->{NAME}, "setList", "")); split("\n", AttrVal($hash->{NAME}, "setList", ""));
my $cmd = $sets{$a[1]}; my $cmd = $sets{$a[1]};
return SetExtensions($hash, join(" ", sort keys %sets), @a) if(!$cmd); return SetExtensions($hash, join(" ", sort keys %sets), @a) if(!$cmd);
@ -298,7 +300,7 @@ MQTT2_DEVICE_addReading($$)
my ($name, $param) = @_; my ($name, $param) = @_;
foreach my $line (split("\n", $param)) { foreach my $line (split("\n", $param)) {
my ($re,$code) = split(" ", $line,2); 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);
} }
} }