Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

31_HUEDevice.pm: fixed warnings that happen in define if bridge device is disabeled

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@12599 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-11-19 10:50:01 +00:00
parent e8ba205d71
commit 0189c1a0da
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
FHEM/31_HUEDevice.pm
View File

@ -256,19 +256,19 @@ sub HUEDevice_Define($$)
$hash->{ID} = $hash->{helper}->{devtype}.$id; $hash->{ID} = $hash->{helper}->{devtype}.$id;
AssignIoPort($hash,$iodev) if( !$hash->{IODev} ); AssignIoPort($hash,$iodev) if( !$hash->{IODev} );
if(defined($hash->{IODev}->{NAME})) { if(defined($hash->{IODev})) {
Log3 $name, 3, "$name: I/O device is " . $hash->{IODev}->{NAME}; Log3 $name, 3, "$name: I/O device is " . $hash->{IODev}->{NAME};
} else { } else {
Log3 $name, 1, "$name: no I/O device"; Log3 $name, 1, "$name: no I/O device";
} }
$iodev = $hash->{IODev}->{NAME}; $iodev = $hash->{IODev}->{NAME} if( defined($hash->{IODev}) );
my $code = $hash->{ID}; my $code = $hash->{ID};
$code = $iodev ."-". $code if( defined($iodev) ); $code = $iodev ."-". $code if( defined($iodev) );
my $d = $modules{HUEDevice}{defptr}{$code}; my $d = $modules{HUEDevice}{defptr}{$code};
return "HUEDevice device $hash->{ID} on HUEBridge $iodev already defined as $d->{NAME}." return "HUEDevice device $hash->{ID} on HUEBridge $iodev already defined as $d->{NAME}."
if( defined($d) if( defined($d)
&& $d->{IODev} == $hash->{IODev} && $d->{IODev} && $hash->{IODev} && $d->{IODev} == $hash->{IODev}
&& $d->{NAME} ne $name ); && $d->{NAME} ne $name );
$modules{HUEDevice}{defptr}{$code} = $hash; $modules{HUEDevice}{defptr}{$code} = $hash;
@ -281,7 +281,7 @@ sub HUEDevice_Define($$)
$args[3] = "" if( !defined( $args[3] ) ); $args[3] = "" if( !defined( $args[3] ) );
if( !$hash->{helper}->{devtype} ) { if( !$hash->{helper}->{devtype} ) {
$hash->{DEF} = "$id $args[3] IODev=$iodev"; $hash->{DEF} = "$id $args[3] IODev=$iodev" if( $iodev );
$interval = 60 if( $interval && $interval < 10 ); $interval = 60 if( $interval && $interval < 10 );
$hash->{INTERVAL} = $interval; $hash->{INTERVAL} = $interval;
@ -306,7 +306,7 @@ sub HUEDevice_Define($$)
$attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ ); $attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ );
} elsif( $hash->{helper}->{devtype} eq 'G' ) { } elsif( $hash->{helper}->{devtype} eq 'G' ) {
$hash->{DEF} = "group $id $args[3] IODev=$iodev"; $hash->{DEF} = "group $id $args[3] IODev=$iodev" if( $iodev );
$hash->{helper}{all_on} = -1; $hash->{helper}{all_on} = -1;
$hash->{helper}{any_on} = -1; $hash->{helper}{any_on} = -1;
@ -319,7 +319,7 @@ sub HUEDevice_Define($$)
$attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ ); $attr{$name}{'color-icons'} = 2 if( !defined( $attr{$name}{'color-icons'} ) && $icon_path =~ m/openautomation/ );
} elsif( $hash->{helper}->{devtype} eq 'S' ) { } elsif( $hash->{helper}->{devtype} eq 'S' ) {
$hash->{DEF} = "sensor $id $args[3] IODev=$iodev"; $hash->{DEF} = "sensor $id $args[3] IODev=$iodev" if( $iodev );
$interval = 60 if( $interval && $interval < 1 ); $interval = 60 if( $interval && $interval < 1 );
$hash->{INTERVAL} = $interval; $hash->{INTERVAL} = $interval;