From 5b1df82ff65f9e3a54992fa5e6c0e7905c0c260f Mon Sep 17 00:00:00 2001 From: justme1968 Date: Wed, 27 Feb 2013 12:45:23 +0000 Subject: [PATCH] devStateIcon fix git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2822 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- FHEM/31_HUEDevice.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/FHEM/31_HUEDevice.pm b/FHEM/31_HUEDevice.pm index 16966b85e..7b5e68415 100644 --- a/FHEM/31_HUEDevice.pm +++ b/FHEM/31_HUEDevice.pm @@ -61,6 +61,7 @@ sub HUEDevice_Define($$) $hash->{fhem}{sat} = -1; + CommandAttr(undef,$name.' webCmd rgb:toggle:on:off') if( !defined( AttrVal($hash->{NAME}, "webCmd", undef) ) ); CommandAttr(undef,$name.' devStateIcon {CommandGet("","'.$name.' devStateIcon")}') if( !defined( AttrVal($hash->{NAME}, "devStateIcon", undef) ) ); AssignIoPort($hash); @@ -118,6 +119,7 @@ HUEDevice_Set($@) my $obj = { 'on' => JSON::true, }; + $obj->{bri} =254 if( ReadingsVal($name,"bri","0") eq 0 ); if( defined($value) ) { $obj->{transitiontime} = $value / 10; } @@ -201,7 +203,7 @@ HUEDevice_Set($@) } } elsif($cmd eq "xy" && $value =~ m/^(.+),(.+)/) { my ($x,$y) = ($1, $2); - + my $obj = { 'xy' => [0+$x, 0+$y], 'on' => JSON::true, @@ -283,10 +285,10 @@ HUEDevice_Set($@) sub HUEDevice_Get($@) { - my ($hash, @a) = @_; - + my ($hash, @a) = @_; + my $name = $a[0]; - return "$name: get needs at least one parameter" if(@a < 2); + return "$name: get needs at least one parameter" if(@a < 2); my $cmd= $a[1]; @@ -337,11 +339,11 @@ HUEDevice_Get($@) return $ret; } elsif ( $cmd eq "devStateIcon" ) { return '
'. - 'off' if( ReadingsVal($name,"state","off") eq "off" ); + 'off'. + '
' if( ReadingsVal($name,"state","off") eq "off" | ReadingsVal($name,"bri","0") eq 0 ); return '
'. - ''.$hash->{STATE}.''. '
' if( AttrVal($hash->{NAME}, "model", "") eq "LWL001" ); return '