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

allow usage of openautomation svg icons

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@3286 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2013-06-14 21:26:29 +00:00
parent d6508b3268
commit b389d3ee10
2 changed files with 43 additions and 16 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
- feature: HUEDevice: allow usage of openautomation svg icons
- feature: FHEMWEB: svg icons / iconPath / www/images/openautomation added - feature: FHEMWEB: svg icons / iconPath / www/images/openautomation added
- feature: FHEMWEB: SVGcache attribute & clearSvgCache set command added - feature: FHEMWEB: SVGcache attribute & clearSvgCache set command added
- feature: SYSSTAT: allow (remote) monitoring raspberry pi on cpu frequency - feature: SYSSTAT: allow (remote) monitoring raspberry pi on cpu frequency

58
fhem/FHEM/31_HUEDevice.pm
View File

@ -58,10 +58,47 @@ sub HUEDevice_Initialize($)
"model:".join(",", sort keys %hueModels)." ". "model:".join(",", sort keys %hueModels)." ".
"subType:colordimmer,dimmer,switch"; "subType:colordimmer,dimmer,switch";
#$hash->{FW_summaryFn} = "HUEDevice_summaryFn";
$data{webCmdFn}{colorpicker} = "HUEDevice_colorpickerFn"; $data{webCmdFn}{colorpicker} = "HUEDevice_colorpickerFn";
$data{FWEXT}{"/"}{SCRIPT} = "/jscolor/jscolor.js"; $data{FWEXT}{"/"}{SCRIPT} = "/jscolor/jscolor.js";
} }
sub
HUEDevice_devStateIcon($)
{
my($hash) = @_;
$hash = $defs{$hash} if( ref($hash) ne 'HASH' );
return undef if( !$hash );
my $name = $hash->{NAME};
return undef
if( ReadingsVal($name,"state","off") eq "off" || ReadingsVal($name,"bri","0") eq 0 );
return undef
if( AttrVal($name, "model", "") eq "LWL001" );
return '<div style="height:19px;'.
'border:1px solid #fff;border-radius:8px;background-color:#'.CommandGet("","$name rgb").';">'.
'<img src="/fhem/icons/'.$hash->{STATE}.'" alt="'.$hash->{STATE}.'" title="'.$hash->{STATE}.'">'.
'</div>' if( ReadingsVal($name,"colormode","") eq "ct" );
return '<div style="width:32px;height:19px;'.
'border:1px solid #fff;border-radius:8px;background-color:#'.CommandGet("","$name rgb").';"></div>';
}
sub
HUEDevice_summaryFn($$$$)
{
Log 3, "HUEDevice_summaryFn";
my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$d};
my $name = $hash->{NAME};
return HUEDevice_devStateIcon($hash);
}
sub sub
HUEDevice_colorpickerFn($$$) HUEDevice_colorpickerFn($$$)
{ {
@ -120,7 +157,7 @@ sub HUEDevice_Define($$)
$hash->{fhem}{xy} = ''; $hash->{fhem}{xy} = '';
$attr{$name}{devStateIcon} = '{(CommandGet("","'.$name.' devStateIcon"),"toggle")}' if( !defined( $attr{$name}{devStateIcon} ) ); $attr{$name}{devStateIcon} = '{(HUEDevice_devStateIcon($name),"toggle")}' if( !defined( $attr{$name}{devStateIcon} ) );
AssignIoPort($hash); AssignIoPort($hash);
if(defined($hash->{IODev}->{NAME})) { if(defined($hash->{IODev}->{NAME})) {
@ -379,19 +416,7 @@ HUEDevice_Get($@)
} }
return sprintf( "%02x%02x%02x", $r+0.5, $g+0.5, $b+0.5 ); return sprintf( "%02x%02x%02x", $r+0.5, $g+0.5, $b+0.5 );
} elsif ( $cmd eq "devStateIcon" ) { } elsif ( $cmd eq "devStateIcon" ) {
return '<img src="/fhem/icons/off" alt="off" title="off">' return HUEDevice_devStateIcon($hash);
if( ReadingsVal($name,"state","off") eq "off" || ReadingsVal($name,"bri","0") eq 0 );
return '<img src="/fhem/icons/'.$hash->{STATE}.'" alt="'.$hash->{STATE}.'" title="'.$hash->{STATE}.'">'
if( AttrVal($hash->{NAME}, "model", "") eq "LWL001" );
return '<div style="height:19px;'.
'border:1px solid #fff;border-radius:8px;background-color:#'.CommandGet("","$name rgb").';">'.
'<img src="/fhem/icons/'.$hash->{STATE}.'" alt="'.$hash->{STATE}.'" title="'.$hash->{STATE}.'">'.
'</div>' if( ReadingsVal($name,"colormode","") eq "ct" );
return '<div style="width:32px;height:19px;'.
'border:1px solid #fff;border-radius:8px;background-color:#'.CommandGet("","$name rgb").';"></div>';
} }
return "Unknown argument $cmd, choose one of rgb devStateIcon"; return "Unknown argument $cmd, choose one of rgb devStateIcon";
@ -462,7 +487,8 @@ HUEDevice_GetUpdate($)
|| !defined($attr{$name}{model}) || !defined($attr{$name}{model})
|| !defined($hueModels{$attr{$name}{model}}{subType}) ); || !defined($hueModels{$attr{$name}{model}}{subType}) );
$attr{$name}{devStateIcon} = '{CommandGet("","'.$name.' devStateIcon")}'; $attr{$name}{devStateIcon} = '{(HUEDevice_devStateIcon($name),"toggle")}' if( !defined( $attr{$name}{devStateIcon} ) );
if( !defined( $attr{$name}{webCmd} ) ) { if( !defined( $attr{$name}{webCmd} ) ) {
$attr{$name}{webCmd} = 'rgb:rgb ff0000:rgb C8FF12:rgb 0000ff:toggle:on:off' if( $attr{$name}{subType} eq "colordimmer" ); $attr{$name}{webCmd} = 'rgb:rgb ff0000:rgb C8FF12:rgb 0000ff:toggle:on:off' if( $attr{$name}{subType} eq "colordimmer" );
$attr{$name}{webCmd} = 'pct:toggle:on:off' if( $attr{$name}{subType} eq "dimmer" ); $attr{$name}{webCmd} = 'pct:toggle:on:off' if( $attr{$name}{subType} eq "dimmer" );
@ -557,7 +583,7 @@ HUEDevice_GetUpdate($)
</ul> </ul>
</ul><br> </ul><br>
<a name="HUE_Readings"></a> <a name="HUEDevice_Readings"></a>
<b>Readings</b> <b>Readings</b>
<ul> <ul>
<li>bri<br> <li>bri<br>