diff --git a/fhem/FHEM/10_MQTT2_DEVICE.pm b/fhem/FHEM/10_MQTT2_DEVICE.pm index 6dd106374..f3c7b29cd 100644 --- a/fhem/FHEM/10_MQTT2_DEVICE.pm +++ b/fhem/FHEM/10_MQTT2_DEVICE.pm @@ -442,7 +442,7 @@ MQTT2_DEVICE_Attr($$) return "$dev attr $attrName: more parameters needed" if(!$par2); if($atype eq "reading") { - if($par2 =~ m/^{.*}\s+$/) { + if($par2 =~ m/^{.*}\s*$/) { my $ret = perlSyntaxCheck($par2, ("%TOPIC"=>1, "%EVENT"=>"0 1 2 3 4 5 6 7 8 9", "%NAME"=>$dev, "%CID"=>"clientId", diff --git a/fhem/fhem.pl b/fhem/fhem.pl index cb2bb96aa..300169925 100755 --- a/fhem/fhem.pl +++ b/fhem/fhem.pl @@ -5262,7 +5262,7 @@ hashKeyRename($$$) my $val = $hash->{$k}; next if($k !~ m/$r2/ || !defined($repl{$1})); $k =~ s/$r2/$repl{$1}/; - $ret{makeReadingName($k)} = $val; + $ret{$k} = $val; } return \%ret; } @@ -5285,7 +5285,7 @@ json2reading($$;$$$) if($ret && ref $ret eq "HASH") { readingsBeginUpdate($hash); foreach my $k (keys %{$ret}) { - readingsBulkUpdate($hash, $k, $ret->{$k}); + readingsBulkUpdate($hash, makeReadingName($k), $ret->{$k}); } readingsEndUpdate($hash, 1); }