Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-07 22:29:19 +00:00
Code

30_LIGHTIFY.pm: handle message format for new firmware also

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10266 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2015-12-26 14:13:38 +00:00
parent 4a04df6f33
commit a395557d0b
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
FHEM/30_LIGHTIFY.pm
View File

@ -285,7 +285,7 @@ LIGHTIFY_Write($@)
$chash->{helper}->{update_timeout} = AttrVal($name, "delayedUpdate", 0);; $chash->{helper}->{update_timeout} = AttrVal($name, "delayedUpdate", 0);;
#$chash->{helper}->{update_timeout} = 1 if( !$chash->{helper}->{update_timeout} ); #$chash->{helper}->{update_timeout} = 1 if( !$chash->{helper}->{update_timeout} );
RemoveInternalTimer($chash); RemoveInternalTimer($chash);
InternalTimer(gettimeofday()+$chash->{helper}->{update_timeout}, "HUEDevice_GetUpdate", $chash, 0); InternalTimer(gettimeofday()+$chash->{helper}->{update_timeout}, "HUEDevice_GetUpdate", $chash, 0);
} else { } else {
@ -409,21 +409,24 @@ LIGHTIFY_Parse($$)
my $response = substr($hex,2*3,2*1); my $response = substr($hex,2*3,2*1);
my $cnt = substr($hex,2*4,2*1); my $cnt = substr($hex,2*4,2*1);
if( $response eq getDevices ) { if( $response eq getDevices ) {
my $size = length($hex)/2;
my $nr_lights = hex(substr($hex,2*9,2*1)); my $nr_lights = hex(substr($hex,2*9,2*1));
my $offset = ($size-11) / $nr_lights;
my $autocreated = 0; my $autocreated = 0;
for( my $i = 0; $i < $nr_lights; ++$i ) { for( my $i = 0; $i < $nr_lights; ++$i ) {
my $short = substr($hex,$i*42*2+2*11,2*2); my $short = substr($hex,$i*$offset*2+2*11,2*2);
my $id = substr($hex,$i*42*2+2*13,2*8); my $id = substr($hex,$i*$offset*2+2*13,2*8);
my $type = substr($hex,$i*42*2+2*21,2*1); my $type = substr($hex,$i*$offset*2+2*21,2*1);
my $mode = substr($hex,$i*42*2+2*27,2*1); my $mode = substr($hex,$i*$offset*2+2*27,2*1);
my $onoff = hex(substr($hex,$i*42*2+2*29,2*1)); my $onoff = hex(substr($hex,$i*$offset*2+2*29,2*1));
my $dim = hex(substr($hex,$i*42*2+2*30,2*1)); my $dim = hex(substr($hex,$i*$offset*2+2*30,2*1));
my $ct = hex(substr($hex,$i*42*2+2*32,2*1).substr($hex,$i*42*2+2*31,2*1)); my $ct = hex(substr($hex,$i*$offset*2+2*32,2*1).substr($hex,$i*$offset*2+2*31,2*1));
my $r = (substr($hex,$i*42*2+2*33,2*1)); my $r = (substr($hex,$i*$offset*2+2*33,2*1));
my $g = (substr($hex,$i*42*2+2*34,2*1)); my $g = (substr($hex,$i*$offset*2+2*34,2*1));
my $b = (substr($hex,$i*42*2+2*35,2*1)); my $b = (substr($hex,$i*$offset*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*$offset*2+2*37,2*16));
my $has_w = (hex($type) & 0x02) ? 1: 0; my $has_w = (hex($type) & 0x02) ? 1: 0;
my $has_rgb = (hex($type) & 0x08) ? 1 : 0; my $has_rgb = (hex($type) & 0x08) ? 1 : 0;