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

30_LIGHTIFY.pm: better capability detection

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7977 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-02-14 15:43:16 +00:00
parent a2d4466966
commit ca48f8967f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/30_LIGHTIFY.pm
View File

@ -378,7 +378,11 @@ LIGHTIFY_Parse($$)
my $g = (substr($hex,$i*42*2+2*34,2*1)); my $g = (substr($hex,$i*42*2+2*34,2*1));
my $b = (substr($hex,$i*42*2+2*35,2*1)); my $b = (substr($hex,$i*42*2+2*35,2*1));
my $alias = pack('H*', substr($hex,$i*42*2+2*37,2*16)); my $alias = pack('H*', substr($hex,$i*42*2+2*37,2*16));
Log 3, "$alias: $id:$short, type?: $type, onoff: $onoff, mode?: $mode dim: $dim, ct: $ct, rgb: $r$g$b";
my $has_w = (hex($type) & 0x02) ? 1: 0;
my $has_rgb = (hex($type) & 0x08) ? 1 : 0;
$has_w = 1 if( $type eq '00' );
Log 3, "$alias: $id:$short, type: $type (w:$has_w, rgb:$has_rgb), onoff: $onoff, mode?: $mode dim: $dim, ct: $ct, rgb: $r$g$b";
#my $code = $id; #my $code = $id;
@ -400,8 +404,13 @@ Log 3, "$alias: $id:$short, type?: $type, onoff: $onoff, mode?: $mode dim: $dim,
$cmdret= CommandAttr(undef,"$devname IODev $name"); $cmdret= CommandAttr(undef,"$devname IODev $name");
my $subtype = 'extcolordimmer'; my $subtype = 'extcolordimmer';
$subtype = 'colordimmer' if( $type eq '08' ); if( $has_w && $has_rgb ) {
$subtype = 'ctdimmer' if( $type eq '02' ); $subtype = 'extcolordimmer';
} elsif( $has_rgb ) {
$subtype = 'colordimmer';
} elsif( $has_w ) {
$subtype = 'ctdimmer';
}
$cmdret= CommandAttr(undef,"$devname subType $subtype"); $cmdret= CommandAttr(undef,"$devname subType $subtype");
$autocreated++; $autocreated++;
@ -417,10 +426,10 @@ Log 3, "$alias: $id:$short, type?: $type, onoff: $onoff, mode?: $mode dim: $dim,
} }
}; };
if( $type eq '02' ) { if( !$has_rgb ) {
$json->{state}->{colormode} = 'ct'; $json->{state}->{colormode} = 'ct';
} elsif( $type ne '08' && "$r$g$b" eq '111' ) { } elsif( $has_w && "$r$g$b" eq '111' ) {
$json->{state}->{colormode} = 'ct'; $json->{state}->{colormode} = 'ct';
} else { } else {