From cbb6921a25c4e8fe223903f9ab297f49f1bfcfdb Mon Sep 17 00:00:00 2001 From: justme1968 Date: Wed, 30 Oct 2013 18:34:12 +0000 Subject: [PATCH] fixed toggle for HUEDevice_devStateIcon state off for LWB001 and LWL001 also git-svn-id: https://svn.fhem.de/fhem/trunk@4136 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/31_HUEDevice.pm | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm index 47a76ebc0..111be098e 100644 --- a/fhem/FHEM/31_HUEDevice.pm +++ b/fhem/FHEM/31_HUEDevice.pm @@ -84,20 +84,15 @@ HUEDevice_devStateIcon($) return ".*:off:toggle" if( ReadingsVal($name,"state","off") eq "off" || ReadingsVal($name,"bri","0") eq 0 ); - return undef - if( AttrVal($name, "model", "") eq "LWB001" ); - - return undef - if( AttrVal($name, "model", "") eq "LWL001" ); - - #return '
'. - # ''.$hash->{STATE}.''. - # '
' if( ReadingsVal($name,"colormode","") eq "ct" ); - my $percent = ReadingsVal($name,"pct","100"); my $s = $dim_values{int($percent/7)}; + return ".*:$s:toggle" + if( AttrVal($name, "model", "") eq "LWB001" ); + + return ".*:$s:toggle" + if( AttrVal($name, "model", "") eq "LWL001" ); + return ".*:$s@#".CommandGet("","$name RGB").":toggle" if( $percent < 100 && AttrVal($name, "color-icons", 0) == 2 ); return ".*:on@#".CommandGet("","$name rgb").":toggle" if( AttrVal($name, "color-icons", 0) != 0 ); @@ -599,7 +594,7 @@ HUEDevice_GetUpdate($) if( $s ne $hash->{STATE} ) {readingsBulkUpdate($hash,"state",$s);} readingsEndUpdate($hash,defined($hash->{LOCAL} ? 0 : 1)); - CommandTrigger( "", "$name RGB: ".CommandGet("","$name rgb") ); + CommandTrigger( "", "$name RGB: ".CommandGet("","$name rgb") ); $hash->{fhem}{on} = $on; $hash->{fhem}{reachable} = $reachable;