From 090bd53907afec53691165101d25567761f33f7c Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Wed, 25 Nov 2020 09:19:42 +0000 Subject: [PATCH] 30_tradfri.pm: ikmproved 'get scenes' output git-svn-id: https://svn.fhem.de/fhem/trunk@23230 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/30_tradfri.pm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/30_tradfri.pm b/fhem/FHEM/30_tradfri.pm index f092dd0d8..1020e560c 100644 --- a/fhem/FHEM/30_tradfri.pm +++ b/fhem/FHEM/30_tradfri.pm @@ -531,9 +531,21 @@ tradfri_Get($$@) if( my $chash = $modules{HUEDevice}{defptr}{$code} ) { $group = AttrVal( $chash->{NAME}, 'alias', $group ); } - $ret .= sprintf( "%-20s %-20s %-20s", $key, $group, $scene->{name} ); - $ret .= sprintf( " %s\n", join( ",", @{$scene->{lights}} ) ); + + #$ret .= sprintf( " %s\n", join( ",", @{$scene->{lights}} ) ); + my $lights; + foreach my $light (@{$scene->{lights}}) { + $lights .= ',' if( $lights ); + my $code = "$name-$light"; + if( my $chash = $modules{HUEDevice}{defptr}{$code} ) { + $lights .= AttrVal( $chash->{NAME}, 'alias', $chash->{NAME} ); + } else { + $lights .= $light; + } + } + $ret .= "$lights\n"; + } if( $ret ) { my $header = sprintf( "%-20s %-20s %-20s", "ID", "GROUP", "NAME" );