mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

30_HUEBridge.pm: fix for scenes without lights

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20623 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme1968
2019-11-30 08:25:25 +00:00
parent 1ac4a1b630
commit b54e39d230
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/FHEM/30_HUEBridge.pm
View File

@@ -944,7 +944,7 @@ HUEBridge_Set($@)
map { $count{$scenes->{$_}{name}}++ } keys %{$scenes}; map { $count{$scenes->{$_}{name}}++ } keys %{$scenes};
$list .= " scene:". join(",", sort map { my $scene = $scenes->{$_}{name}; $list .= " scene:". join(",", sort map { my $scene = $scenes->{$_}{name};
my $group = ''; my $group = '';
if( $count{$scene} > 1 ) { if( $scenes->{$_}{lights} && $count{$scene} > 1 ) {
my $lights = join( ",", @{$scenes->{$_}{lights}} ); my $lights = join( ",", @{$scenes->{$_}{lights}} );
$group = HUEbridge_groupOfLights($hash,$lights); $group = HUEbridge_groupOfLights($hash,$lights);
$group = join( ";", map { my $l = $hash->{helper}{lights}{$_}{name}; $l?$l:$_;} @{$scenes->{$_}{lights}} ) if( !$group && $hash->{helper}{lights} ); $group = join( ";", map { my $l = $hash->{helper}{lights}{$_}{name}; $l?$l:$_;} @{$scenes->{$_}{lights}} ) if( !$group && $hash->{helper}{lights} );
@@ -1033,7 +1033,8 @@ HUEBridge_Get($@)
foreach my $key ( sort {$result->{$a}{name} cmp $result->{$b}{name}} keys %{$result} ) { foreach my $key ( sort {$result->{$a}{name} cmp $result->{$b}{name}} keys %{$result} ) {
$ret .= sprintf( "%-20s %-25s %-10s", $key, $result->{$key}{name}, $result->{$key}{type} ); $ret .= sprintf( "%-20s %-25s %-10s", $key, $result->{$key}{name}, $result->{$key}{type} );
$ret .= sprintf( "%i %i %i %-40s %-20s", $result->{$key}{recycle}, $result->{$key}{locked},$result->{$key}{version}, $result->{$key}{owner}, $result->{$key}{lastupdated}?$result->{$key}{lastupdated}:'' ) if( $arg && $arg eq 'detail' ); $ret .= sprintf( "%i %i %i %-40s %-20s", $result->{$key}{recycle}, $result->{$key}{locked},$result->{$key}{version}, $result->{$key}{owner}, $result->{$key}{lastupdated}?$result->{$key}{lastupdated}:'' ) if( $arg && $arg eq 'detail' );
my $lights = join( ",", @{$result->{$key}{lights}} ); my $lights = "";
$lights = join( ",", @{$result->{$key}{lights}} ) if( $result->{$key}{lights} );
my $group = HUEbridge_groupOfLights($hash,$lights); my $group = HUEbridge_groupOfLights($hash,$lights);
if( !$arg && $group ) { if( !$arg && $group ) {