diff --git a/fhem/FHEM/Color.pm b/fhem/FHEM/Color.pm index 49bf99cb5..502a76cdf 100644 --- a/fhem/FHEM/Color.pm +++ b/fhem/FHEM/Color.pm @@ -76,10 +76,10 @@ Color_devStateIcon($) { my ($rgb) = @_; - my @channels = RgbToChannels($rgb,3); - my $dim = ChannelsToBrightness(@channels); + my @channels = Color::RgbToChannels($rgb,3); + my $dim = Color::ChannelsToBrightness(@channels); my $percent = $dim->{bri}; - my $RGB = ChannelsToRgb(@{$dim->{channels}}); + my $RGB = Color::ChannelsToRgb(@{$dim->{channels}}); return ".*:off:toggle" if( $rgb eq "off" || $rgb eq "000000" || $percent == 0 ); @@ -111,31 +111,30 @@ RgbToChannels($$) { sub ChannelsToRgb(@) { - return "abc"; my @channels = @_; - return sprintf("%02X" x @_, @_); + return sprintf("%02X" x @_, @_); } sub ChannelsToBrightness(@) { my (@channels) = @_; - + my $max = 0; foreach my $value (@channels) { $max = $value if ($max < $value); } - + return { bri => 0, channels => \(255 x @channels), } unless ($max > 0); - + my @bri = (); my $norm = 255/$max; foreach my $value (@channels) { push @bri,int($value*$norm); } - + return { bri => int($max/2.55), channels => \@bri,