FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

30_LIGHTIFY.pm: added uniqueid to internals

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11712 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-06-25 08:09:32 +00:00
parent 97ed5ac31c
commit 3a7eadef32
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/30_LIGHTIFY.pm
View File

@ -617,13 +617,14 @@ LIGHTIFY_sendNext($)
}
}
sub
LIGHTIFY_toJson($$$$$$$$$)
LIGHTIFY_toJson($$$$$$$$$$)
{
my ($hash,$chash,$reachable,$onoff,$dim,$ct,$r,$g,$b) = @_;
my ($hash,$chash,$id,$reachable,$onoff,$dim,$ct,$r,$g,$b) = @_;
my $json = { state => { } };
if( $chash ) {
$json->{uniqueid} = $id if( defined($id) );
$json->{state}{on} = $onoff if( defined($onoff) );
$json->{state}{reachable} = $reachable? 1 : 0 if( defined($reachable) );
@ -754,7 +755,7 @@ LIGHTIFY_Parse($$)
$chash->{helper}{type} = hex($type);
$chash->{helper}{type} = extcolordimmer if( !$chash->{helper}{type} );
my $json = LIGHTIFY_toJson($hash, $chash, $reachable, $onoff, $dim, $ct, $r, $g, $b);
my $json = LIGHTIFY_toJson($hash, $chash, $id, $reachable, $onoff, $dim, $ct, $r, $g, $b);
my $changed = HUEDevice_Parse( $chash, $json );
if( $changed || $chash->{helper}{transitiontime} ) {
RemoveInternalTimer($chash);
@ -893,7 +894,7 @@ LIGHTIFY_Parse($$)
Log3 $name, 4, "$id, reachable: $reachable, onoff: $onoff, dim: $dim, ct: $ct, rgb: $r$g$b, w: $w";
$json = LIGHTIFY_toJson($hash, $chash, $reachable, $onoff, $dim, $ct, $r, $g, $b);
$json = LIGHTIFY_toJson($hash, $chash, $id, $reachable, $onoff, $dim, $ct, $r, $g, $b);
}
my $changed = HUEDevice_Parse( $chash, $json ) if( $chash );