From 5e16771e842f517c42f96f70293a44dc0736a5af Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Sat, 14 Dec 2019 10:08:24 +0000 Subject: [PATCH] Color.pm: handle set.*, handle onoff for rgb git-svn-id: https://svn.fhem.de/fhem/trunk@20742 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/Color.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fhem/FHEM/Color.pm b/fhem/FHEM/Color.pm index d13abcfdc..9dc5fc9a3 100644 --- a/fhem/FHEM/Color.pm +++ b/fhem/FHEM/Color.pm @@ -452,6 +452,7 @@ devStateIcon($$@) my $s = $value; return ".*:light_question" if( !$s ); + return ".*:light_question" if( $s =~ m/^set/i ); return ".*:$s:toggle"; } elsif( $type && $type eq "dimmer" ) { @@ -465,6 +466,7 @@ devStateIcon($$@) } return ".*:light_question" if( !defined($percent) ); + return ".*:light_question" if( $percent =~ m/^set/i ); return ".*:on:toggle" if( $percent eq "on" ); return ".*:off:toggle" if( $percent eq "off" ); @@ -489,13 +491,17 @@ devStateIcon($$@) } return ".*:light_question" if( !defined($value) ); + return ".*:light_question" if( $value =~ m/^set/i ); return ".*:on:toggle" if( $value eq "on" ); return ".*:off:toggle" if( $value eq "off" ); + $value = substr($value,0,6); + my $s = 'on'; if( $pct ) { my $percent = ::ReadingsVal($name,$pct, undef); $percent = ::CommandGet("","$name $pct") if( !$percent ); + return ".*:off:toggle" if( $onoff && ::ReadingsVal($name,$onoff,'') =~ m/(0|off$)/i ); return ".*:off:toggle" if( $percent eq "off" ); $percent = 100 if( $percent eq "on" ); $s = $dim_values{int($percent/7)} if( $percent && $percent < 100 );