FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

fixed updateLine

Browse Source 
use xhr for colorupdates by colorpicker and rgb presets



git-svn-id: https://svn.fhem.de/fhem/trunk@3455 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-07-19 18:46:42 +00:00
parent 6b2429fa07
commit 92086c0c7c
3 changed files with 34 additions and 9 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
- SVN
- feature: use xhr for colorupdates by colorpicker and rgb presets
- feature: new module 34_SWAP for generic SWAP protocoll support using
a panStick and 34_panStamp as IODevice(by justme1968)
- feature: new module 34_panStamp to use a panStick as a RF modem

31
fhem/FHEM/31_HUEDevice.pm
View File

@ -125,17 +125,23 @@ HUEDevice_colorpickerFn($$$)
my $cv = CommandGet("","$d $cmd");
$cmd = "" if($cmd eq "state");
if( $args[1] ) {
my $c = "\"$FW_ME?cmd=set $d $cmd$srf\"";
my $c = "cmd=set $d $cmd$srf";
return '<td align="center">'.
'<a href='. $c .'>'.
"<div onClick=\"FW_cmd('$FW_ME?XHR=1&$c')\" style=\"width:32px;height:19px;".
'border:1px solid #fff;border-radius:8px;background-color:#'. $args[1] .';"></div>'.
'</td>' if( AttrVal($FW_wname, "longpoll", 1));
return '<td align="center">'.
"<a href=\"$FW_ME?$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\"";
my $c = "$FW_ME?XHR=1&cmd=set $d $cmd %$srf";
return '<td align="center">'.
"<input class='color {pickerMode:'$mode'}' value='#$cv' onchange='colorpicker_setColor(this,\"$mode\",$c)'\"/>".
"<input id='colorpicker.$d-RGB' class=\"color {pickerMode:'$mode',pickerFaceColor:'transparent',pickerFace:3,pickerBorder:0,pickerInsetColor:'red'}\" value='$cv' onChange='colorpicker_setColor(this,\"$mode\",\"$c\")'>".
'</td>';
}
}
@ -170,6 +176,8 @@ sub HUEDevice_Define($$)
$hash->{fhem}{sat} = -1;
$hash->{fhem}{xy} = '';
$hash->{fhem}{percent} = -1;
$attr{$name}{devStateIcon} = '{(HUEDevice_devStateIcon($name),"toggle")}' if( !defined( $attr{$name}{devStateIcon} ) );
@ -289,7 +297,7 @@ HUEDevice_SetParam($$@)
$obj->{'on'} = JSON::true;
$obj->{'hue'} = int($h*256);
$obj->{'sat'} = 0+$s;
$obj->{'bru'} = 0+$v;
$obj->{'bri'} = 0+$v;
} elsif( $cmd eq "effect" ) {
$obj->{'effect'} = $value;
} elsif( $cmd eq "transitiontime" ) {
@ -582,14 +590,13 @@ HUEDevice_GetUpdate($)
if( defined($xy) && $xy ne $hash->{fhem}{xy} ) {readingsBulkUpdate($hash,"xy",$xy);}
my $s = '';
my $percent;
if( $on )
{
$s = 'on';
if( $on != $hash->{fhem}{on} ) {readingsBulkUpdate($hash,"onoff",1);}
my $percent = int( $state->{'bri'} * 100 / 254 );
if( $bri != $hash->{fhem}{bri} ) {readingsBulkUpdate($hash,"level", $percent . ' %');}
if( $bri != $hash->{fhem}{bri} ) {readingsBulkUpdate($hash,"pct", $percent);}
$percent = int( $bri * 100 / 254 );
if( $percent > 0
&& $percent < 100 ) {
$s = $dim_values{int($percent/7)};
@ -599,12 +606,18 @@ HUEDevice_GetUpdate($)
else
{
$s = 'off';
$percent = 0;
if( $on != $hash->{fhem}{on} ) {readingsBulkUpdate($hash,"onoff",0);}
}
if( $percent != $hash->{fhem}{percent} ) {readingsBulkUpdate($hash,"level", $percent . ' %');}
if( $percent != $hash->{fhem}{percent} ) {readingsBulkUpdate($hash,"pct", $percent);}
if( $s ne $hash->{STATE} ) {readingsBulkUpdate($hash,"state",$s);}
readingsEndUpdate($hash,defined($hash->{LOCAL} ? 0 : 1));
CommandTrigger( "", "$name RGB: ".CommandGet("","$name rgb") );
$hash->{fhem}{on} = $on;
$hash->{fhem}{colormode} = $colormode;
$hash->{fhem}{bri} = $bri;
@ -612,6 +625,8 @@ HUEDevice_GetUpdate($)
$hash->{fhem}{hue} = $hue;
$hash->{fhem}{sat} = $sat;
$hash->{fhem}{xy} = $xy;
$hash->{fhem}{percent} = $percent;
}
1;

11
fhem/www/pgm2/fhemweb_colorpicker.js
View File

@ -2,11 +2,14 @@
function
FW_colorpickerUpdateLine(d)
{
var name = "colorpicker."+d[0];
el = document.getElementById(name);
if(el) {
el.setAttribute('value', '#d');
el.color.fromString(d[1]);
}
}
function
@ -18,6 +21,12 @@ colorpicker_setColor(el,mode,cmd)
(0x100 | Math.round(255*el.color.hsv[1])).toString(16).substr(1) +
(0x100 | Math.round(255*el.color.hsv[2])).toString(16).substr(1);
}
var req = new XMLHttpRequest();
req.open("GET", cmd.replace('%',v), true);
req.send(null);
if( 0 )
if(cmd)
document.location = cmd.replace('%',v);
}