FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-03 16:56:54 +00:00
Code Issues Releases Wiki Activity

HUEDevice: allow color preset buttons in webCmd

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3112 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-04-24 10:20:53 +00:00
parent 968cf55cf6
commit 66db915b56
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII # Add changes at the top of the list. Keep it in ASCII
- SVN - SVN
- change: HUEDevice: allow color preset buttons in webCmd
- feature: SYSSTAT: allow (remote) monitoring raspberry pi on chip temperature - feature: SYSSTAT: allow (remote) monitoring raspberry pi on chip temperature
- feature: HUEDevice: use webCmdFn for colorpicker - feature: HUEDevice: use webCmdFn for colorpicker
added jscolor for colorpicker added jscolor for colorpicker

27
fhem/FHEM/31_HUEDevice.pm
View File

@ -66,17 +66,28 @@ HUEDevice_colorpickerFn($$$)
{ {
my ($FW_wname, $d, $FW_room, $cmd, $values) = @_; my ($FW_wname, $d, $FW_room, $cmd, $values) = @_;
my @args = split("[ \t]+", $cmd);
return undef if($values !~ m/^colorpicker,(.*)$/); return undef if($values !~ m/^colorpicker,(.*)$/);
my ($mode) = ($1); my ($mode) = ($1);
$mode = "RGB" if( !defined($mode) ); $mode = "RGB" if( !defined($mode) );
my $srf = $FW_room ? "&room=$FW_room" : ""; my $srf = $FW_room ? "&room=$FW_room" : "";
my $srf = $FW_room ? "&room=$FW_room" : "";
my $cv = CommandGet("","$d $cmd"); my $cv = CommandGet("","$d $cmd");
$cmd = "" if($cmd eq "state"); $cmd = "" if($cmd eq "state");
my $c = "\"$FW_ME?cmd=set $d $cmd %$srf\""; if( $args[1] ) {
return "<td colspan='2'>". my $c = "\"$FW_ME?cmd=set $d $cmd$srf\"";
"<input class='color {pickerMode:'$mode'}' value='#$cv' onchange='setColor(this,\"$mode\",$c)'\"/>". return "<td colspan='2'>".
"</td>"; '<a href='. $c .'>'.
'<div style="width:32px;height:19px;'.
'border:1px solid #fff;border-radius:8px;background-color:#'. $args[1] .';"></div>'.
'</a>';
"</td>";
} else {
my $c = "\"$FW_ME?cmd=set $d $cmd %$srf\"";
return "<td colspan='2'>".
"<input class='color {pickerMode:'$mode'}' value='#$cv' onchange='setColor(this,\"$mode\",$c)'\"/>".
"</td>";
}
} }
sub HUEDevice_Define($$) sub HUEDevice_Define($$)
@ -108,7 +119,7 @@ sub HUEDevice_Define($$)
$hash->{fhem}{xy} = ''; $hash->{fhem}{xy} = '';
CommandAttr(undef,$name.' webCmd rgb:toggle:on:off') if( !defined( AttrVal($hash->{NAME}, "webCmd", undef) ) ); CommandAttr(undef,$name.' webCmd rgb:rgb ff0000:rgb C8FF12:rgb 0000ff:toggle:on:off') if( !defined( AttrVal($hash->{NAME}, "webCmd", undef) ) );
CommandAttr(undef,$name.' devStateIcon {CommandGet("","'.$name.' devStateIcon")}') if( !defined( AttrVal($hash->{NAME}, "devStateIcon", undef) ) ); CommandAttr(undef,$name.' devStateIcon {CommandGet("","'.$name.' devStateIcon")}') if( !defined( AttrVal($hash->{NAME}, "devStateIcon", undef) ) );
AssignIoPort($hash); AssignIoPort($hash);
@ -619,9 +630,11 @@ HUEDevice_GetUpdate($)
<b>Attributes</b> <b>Attributes</b>
<ul> <ul>
<li>subType<br> <li>subType<br>
dimmer or switch, default is dimmer.</li> colordimmer, dimmer or switch, default is initialized according to device model.</li>
<li>devStateIcon<br> <li>devStateIcon<br>
will be initialized to <code>{CommandGet("","&lt;name&gt; devStateIcon")}</code> to show device color as default in room overview.</li> will be initialized to <code>{CommandGet("","&lt;name&gt; devStateIcon")}</code> to show device color as default in room overview.</li>
<li>webCmd<br>
will be initialized to <code>rgb:rgb FF0000:rgb C8FF12:rgb 0000FF:toggle:on:off</code> to show colorpicker and 3 color preset buttons in room overview.</li>
</ul> </ul>
</ul><br> </ul><br>