From a395557d0bc1b2a60eb29a2fc1d5f10b2fc3ae5e Mon Sep 17 00:00:00 2001
From: justme-1968 <justme-1968@users.noreply.github.com>
Date: Sat, 26 Dec 2015 14:13:38 +0000
Subject: [PATCH] 30_LIGHTIFY.pm: handle message format for new firmware also

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@10266 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/30_LIGHTIFY.pm | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

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