FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-04 05:16:45 +00:00
Code Issues Releases Wiki Activity

30_HUEBridge.pm: ignore recyclable groups in autocreate, better display ignored groups and sensors in get groups/sensors

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@25535 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2022-01-21 14:57:31 +00:00
parent 51a00eca30
commit f99c8dfde5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/30_HUEBridge.pm
View File

@ -1288,12 +1288,12 @@ HUEBridge_Get($@)
my $code = $name ."-G". $key; my $code = $name ."-G". $key;
my $fhem_name = ''; my $fhem_name = '';
$fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) ); $fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) );
$fhem_name = ' (ignored)' if( !$fhem_name && $hash->{helper}{ignored}{$code} );
$fhem_name = "" if( !$fhem_name ); $fhem_name = "" if( !$fhem_name );
$result->{$key}{type} = '' if( !defined($result->{$key}{type}) ); #deCONZ fix $result->{$key}{type} = '' if( !defined($result->{$key}{type}) ); #deCONZ fix
$result->{$key}{class} = '' if( !defined($result->{$key}{class}) ); #deCONZ fix $result->{$key}{class} = '' if( !defined($result->{$key}{class}) ); #deCONZ fix
$result->{$key}{lights} = [] if( !defined($result->{$key}{lights}) ); #deCONZ fix $result->{$key}{lights} = [] if( !defined($result->{$key}{lights}) ); #deCONZ fix
$ret .= sprintf( "%2i: %-15s %-15s %-15s %-15s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type}, $result->{$key}{class} ); $ret .= sprintf( "%2i: %-15s %-15s %-15s %-15s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type}, $result->{$key}{class} );
$ret .= ' (ignored)' if( $hash->{helper}{ignored}{$code} );
if( !$arg && $hash->{helper}{lights} ) { if( !$arg && $hash->{helper}{lights} ) {
$ret .= sprintf( " %s\n", join( ",", map { my $l = $hash->{helper}{lights}{$_}{name}; $l?$l:$_;} @{$result->{$key}{lights}} ) ); $ret .= sprintf( " %s\n", join( ",", map { my $l = $hash->{helper}{lights}{$_}{name}; $l?$l:$_;} @{$result->{$key}{lights}} ) );
} else { } else {
@ -1391,9 +1391,9 @@ HUEBridge_Get($@)
my $code = $name ."-S". $key; my $code = $name ."-S". $key;
my $fhem_name = ''; my $fhem_name = '';
$fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) ); $fhem_name = $modules{HUEDevice}{defptr}{$code}->{NAME} if( defined($modules{HUEDevice}{defptr}{$code}) );
$fhem_name = ' (ignored)' if( !$fhem_name && $hash->{helper}{ignored}{$code} );
$fhem_name = "" if( !$fhem_name ); $fhem_name = "" if( !$fhem_name );
$ret .= sprintf( "%2i: %-20s %-15s %-20s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type} ); $ret .= sprintf( "%2i: %-20s %-15s %-20s", $key, $result->{$key}{name}, $fhem_name, $result->{$key}{type} );
$ret .= ' (ignored)' if( $hash->{helper}{ignored}{$code} );
$ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{state}) ) if( $arg && $arg eq 'detail' ); $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{state}) ) if( $arg && $arg eq 'detail' );
$ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{config}) ) if( $arg && $arg eq 'detail' ); $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{config}) ) if( $arg && $arg eq 'detail' );
$ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{capabilities}) ) if( $arg && $arg eq 'detail' ); $ret .= sprintf( "\n%-56s %s", '', encode_json($result->{$key}{capabilities}) ) if( $arg && $arg eq 'detail' );
@ -1841,7 +1841,8 @@ HUEBridge_Autocreate($;$$)
next; next;
} }
if( $result->{$id}{type} eq 'Entertainment' ) { if( $result->{$id}{recycle}
|| $result->{$id}{type} eq 'Entertainment' ) {
Log3 $name, 4, "$name: ignoring group $id ($result->{$id}{name}) of type $result->{$id}{type} in autocreate"; Log3 $name, 4, "$name: ignoring group $id ($result->{$id}{name}) of type $result->{$id}{type} in autocreate";
$ignored[1]++; $ignored[1]++;
$hash->{helper}{ignored}{$code} = 1; $hash->{helper}{ignored}{$code} = 1;