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: add readiongList matching to "graphvis" (Forum #91394)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18009 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2018-12-20 07:43:33 +00:00
parent 9d28bdc096
commit a7e7aebcf8
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/10_MQTT2_DEVICE.pm
View File

@ -500,7 +500,7 @@ MQTT2_DEVICE_nlData($)
{
my ($d) = @_;
my (%dv,%h,%n2n);
my (%img,%h,%n2n);
my $fo="";
my $pref = "https://koenkk.github.io/zigbee2mqtt/images/devices/";
@ -508,15 +508,21 @@ MQTT2_DEVICE_nlData($)
my $dv = ReadingsVal($d, ".devices", ReadingsVal($d, "devices", ""));
for my $l (split(/[\r\n]/, $dv)) {
next if($l !~ m/ieeeAddr":"([^"]+)".*model":"([^"]+)"/);
$dv{$1} = $2;
my $img = $2;
$img =~ s,[/: ],-,g; # Forum #91394, supported-devices.js
$img{$1} = "$pref$img.jpg";
}
# Name translation
for my $n (devspec2array("TYPE=MQTT2_DEVICE")) {
my $cid = $defs{$n}{CID};
next if(!$cid);
$cid =~ s/zigbee_//;
$n2n{$cid} = $n;
if($cid) {
$cid =~ s/zigbee_//;
$n2n{$cid} = $n;
}
if(AttrVal($n, "readingList","") =~ m,zigbee2mqtt/(.*):,) {
$n2n{$1} = $n;
}
}
my $gv = ReadingsVal($d, ".graphviz", ReadingsVal($d, "graphviz", ""));
@ -531,8 +537,8 @@ MQTT2_DEVICE_nlData($)
if($v =~ m/{(.*)\|(.*)\|(.*)\|(.*)}/) {
my ($x1,$x2,$x3,$x4) = ($1,$2,$3,$4);
$nv = $n2n{$x1} if($n2n{$x1});
$h{$n}{img} = $pref.$dv{$n}.".jpg" if($dv{$n});
if($dv{$n} && $n2n{$x1} && !AttrVal($n2n{$x1}, "imageLink", "")) {
$h{$n}{img} = $img{$n} if($img{$n});
if($img{$n} && $n2n{$x1} && !AttrVal($n2n{$x1}, "imageLink", "")) {
CommandAttr(undef, "$nv imageLink $h{$n}{img}");
}
$h{$n}{class} = ($x2 =~ m/Coordinator|Router/ ? "zwDongle":"zwBox");