From 4f55e35ff17c51e1e9d2c1eb9b3eadfefe6c10bd Mon Sep 17 00:00:00 2001 From: deespe <> Date: Fri, 4 Nov 2016 16:13:23 +0000 Subject: [PATCH] 98_Hyperion: fix toggleMode sometimes not working as expected git-svn-id: https://svn.fhem.de/fhem/trunk@12503 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Hyperion.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/98_Hyperion.pm b/fhem/FHEM/98_Hyperion.pm index 67dc9a157..e98f00b60 100644 --- a/fhem/FHEM/98_Hyperion.pm +++ b/fhem/FHEM/98_Hyperion.pm @@ -334,7 +334,6 @@ sub Hyperion_Read($) elsif ($col) { my $rgb = lc((split("x",$col))[1]); - $rgb =~ m/^(..)(..)(..)/; my ($r,$g,$b) = Color::hex2rgb($rgb); my ($h,$s,$v) = Color::rgb2hsv($r / 255,$g / 255,$b / 255); my $dim = int($v * 100); @@ -379,8 +378,7 @@ sub Hyperion_Read($) sub Hyperion_GetConfigs($) { my ($hash) = @_; - return "Not connected" - if (!$hash->{FD}); + return "Not connected" if (!$hash->{FD}); my $name = $hash->{NAME}; my $ip = $hash->{IP}; my $dir = AttrVal($name,"hyperionConfigDir","/etc/hyperion/"); @@ -545,7 +543,7 @@ sub Hyperion_Set($@) elsif ($cmd eq "rgb") { return "Value of $cmd has to be in RGB hex format like ffffff or 3F7D90" - if ($value !~ /^(\d|[a-f|A-F]){6}$/); + if ($value !~ /^[\dA-Fa-f]{6}$/); $value = lc($value); my ($r,$g,$b) = Color::hex2rgb($value); $obj{color} = [$r,$g,$b]; @@ -657,7 +655,7 @@ sub Hyperion_Set($@) { $nmode = $i < $count - 1 ? $modeorder[$i+1] : $modeorder[0] if ($modeorder[$i] eq $mode); } - $nmode = $nmode ? $nmode : "off"; + $nmode = $nmode ? $nmode : @modeorder[0]; fhem "set $name mode $nmode"; return undef; }