From c8b0f94e8f8cd61b2fa41a9b50144e54fea75a5e Mon Sep 17 00:00:00 2001 From: borisneubert Date: Mon, 31 Dec 2012 12:02:55 +0000 Subject: [PATCH] get ... devices now also shows already defined OWDevices for 1-wire devices git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2397 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/10_OWServer.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/FHEM/10_OWServer.pm b/FHEM/10_OWServer.pm index 41f67c1c5..8b1ae9613 100644 --- a/FHEM/10_OWServer.pm +++ b/FHEM/10_OWServer.pm @@ -187,7 +187,13 @@ OWServer_Get($@) my @devices= grep { m/^\/[0-9a-f]{2}.[0-9a-f]{12}$/i } @dir; my $ret; for my $device (@devices) { - $ret .= substr($device,1) . " " . $owserver->read($device . "/type") . "\n"; + my $name= ""; + my $address= substr($device,1); + my $type= $owserver->read($device . "/type"); + foreach my $p (keys %defs) { + $name= concatc(", ", $name, $p) if($defs{$p}{TYPE} eq "OWDevice" and $defs{$p}{fhem}{address} eq $address); + } + $ret .= sprintf("%s %10s %s\n", $address, $type, $name); } return $ret; } else { @@ -274,7 +280,8 @@ OWServer_Set($@)