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: some autocreate modifications (Forum #94060)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18402 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2019-01-24 14:57:49 +00:00
parent 62a7159fc0
commit c875177e3c
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -172,13 +172,25 @@ MQTT2_DEVICE_Parse($$)
my $ret = json2nameValue($value);
if(keys %{$ret}) {
$topic =~ m,.*/([^/]+),;
my $prefix = ($1 && $1 !~m/^0x[0-9a-f]+$/i) ? "${1}_" : ""; # 91394
$add = "{ json2nameValue(\$EVENT, '$prefix', \$JSONMAP) }";
$add = "{ json2nameValue(\$EVENT) }";
}
}
if(!$add) {
$topic =~ m,.*/([^/]+),;
$add = ($1 ? $1 : $topic);
my @tEl = split("/",$topic);
if(@tEl == 1) {
$add = $tEl[0];
} elsif($tEl[-1] =~ m/^\d+$/) { # relay_0
$add = $tEl[-2]."_".$tEl[-1];
} elsif($tEl[-2] =~ m/^\d+$/) { # relay_0_power
$add = $tEl[-2]."_".$tEl[-1];
$add = $tEl[-3]."_".$add if(@tEl > 2);
} else {
$add = $tEl[-1];
}
$add = makeReadingName($add); # Convert non-valid characters to _
}
@ -761,7 +773,7 @@ zigbee2mqtt_devStateIcon255($)
<li>imageLink href<br>
sets the image to be shown. The "Show neighbor map" function initializes
the value automatically.
</li>
</li><br>
<a name="jsonMap"></a>
<li>jsonMap oldReading1:newReading1 oldReading2:newReading2...<br>
@ -774,8 +786,6 @@ zigbee2mqtt_devStateIcon255($)
</code></ul>
The special newReading value of 0 will prevent creating a reading for
oldReading.
<br>
</li><br>
<a name="readingList"></a>
@ -806,7 +816,12 @@ zigbee2mqtt_devStateIcon255($)
<ul><code>
attr sonoff_th10 readingList tele/sonoff/S.* {
json2nameValue($EVENT) }
</code></ul></li>
</code></ul>
A second (optional) parameter to json2nameValue is treated as prefix,
and will be prepended to each reading name.<br>
The third (optional) parameter is $JSONMAP, see the jsonMap attribute
above.
</li>
</ul>
</li><br>