diff --git a/fhem/CHANGED b/fhem/CHANGED index 812d755f3..7ffb79e33 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII - SVN + - change: HUEDevice: allow color preset buttons in webCmd - feature: SYSSTAT: allow (remote) monitoring raspberry pi on chip temperature - feature: HUEDevice: use webCmdFn for colorpicker added jscolor for colorpicker diff --git a/fhem/FHEM/31_HUEDevice.pm b/fhem/FHEM/31_HUEDevice.pm index a455a7d16..69290e91f 100644 --- a/fhem/FHEM/31_HUEDevice.pm +++ b/fhem/FHEM/31_HUEDevice.pm @@ -65,18 +65,29 @@ sub HUEDevice_colorpickerFn($$$) { my ($FW_wname, $d, $FW_room, $cmd, $values) = @_; - + + my @args = split("[ \t]+", $cmd); + return undef if($values !~ m/^colorpicker,(.*)$/); my ($mode) = ($1); $mode = "RGB" if( !defined($mode) ); my $srf = $FW_room ? "&room=$FW_room" : ""; - my $srf = $FW_room ? "&room=$FW_room" : ""; my $cv = CommandGet("","$d $cmd"); $cmd = "" if($cmd eq "state"); - my $c = "\"$FW_ME?cmd=set $d $cmd %$srf\""; - return "
{CommandGet("","<name> devStateIcon")} to show device color as default in room overview.rgb:rgb FF0000:rgb C8FF12:rgb 0000FF:toggle:on:off to show colorpicker and 3 color preset buttons in room overview.