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

31_Aurora.pm: avoid name conflict

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@20307 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2019-10-04 09:13:38 +00:00
parent 3d7751d7cb
commit 5163be452a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/31_Aurora.pm
View File

@ -567,7 +567,7 @@ Aurora_Set($@)
}
sub
cttorgb($)
Aurora_cttorgb($)
{
my ($ct) = @_;
@ -604,7 +604,7 @@ cttorgb($)
}
sub
xyYtorgb($$$)
Aurora_xyYtorgb($$$)
{
# calculation from http://www.brucelindbloom.com/index.html
my ($x,$y,$Y) = @_;
@ -668,7 +668,7 @@ Aurora_Get($@)
my $cm = ReadingsVal($name,"colormode","");
if( $cm eq "ct" ) {
if( ReadingsVal($name,"ct","") =~ m/(\d+)/ ) {
($r,$g,$b) = cttorgb(1000000/$1);
($r,$g,$b) = Aurora_cttorgb(1000000/$1);
}
} else {
my $h = ReadingsVal($name,"hue",0) / 359.0;
@ -689,7 +689,7 @@ Aurora_Get($@)
my $cm = ReadingsVal($name,"colormode","");
if( $cm eq "ct" ) {
if( ReadingsVal($name,"ct","") =~ m/(\d+) .*/ ) {
($r,$g,$b) = cttorgb($1);
($r,$g,$b) = Aurora_cttorgb($1);
}
} else {
my $h = ReadingsVal($name,"hue",0) / 359.0;