mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-04-24 21:29:21 +00:00
added new modelids
preparation for async io git-svn-id: https://svn.fhem.de/fhem/trunk@5435 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968
parent
0138e6a85e
commit
6001be2023
@ -18,12 +18,17 @@ use SetExtensions;
|
||||
|
||||
my %hueModels = (
|
||||
LCT001 => {name => 'HUE Bulb' ,type => 'Extended color light' ,subType => 'colordimmer',},
|
||||
LCT002 => {name => 'HUE Bulb BR30' ,type => 'Extended color light' ,subType => 'colordimmer',},
|
||||
LCT003 => {name => 'HUE Bulb GU10' ,type => 'Extended color light' ,subType => 'colordimmer',},
|
||||
LLC001 => {name => 'LivingColors G2' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LLC005 => {name => 'LivingColors Bloom' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LLC006 => {name => 'LivingColors Iris' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LLC007 => {name => 'LivingColors Bloom' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LLC011 => {name => 'LivingColors Bloom' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LLC012 => {name => 'LivingColors Bloom' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LST001 => {name => 'LightStrips' ,type => 'Color Light' ,subType => 'colordimmer',},
|
||||
LWB001 => {name => 'LivingWhites Bulb' ,type => 'Dimmable light' ,subType => 'dimmer',},
|
||||
LWB003 => {name => 'LivingWhites Bulb' ,type => 'Dimmable light' ,subType => 'dimmer',},
|
||||
LWL001 => {name => 'LivingWhites Outlet' ,type => 'Dimmable plug-in unit' ,subType => 'dimmer',},
|
||||
);
|
||||
|
||||
@ -82,7 +87,7 @@ HUEDevice_devStateIcon($)
|
||||
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
return ".*:light_question" if( !$hash->{helper}{reachable} && AttrVal($name, "color-icons", 0) != 0 );
|
||||
return ".*:light_question" if( $hash->{helper}{reachable} ne 'true' && AttrVal($name, "color-icons", 0) != 0 );
|
||||
|
||||
return ".*:off:toggle"
|
||||
if( ReadingsVal($name,"state","off") eq "off" || ReadingsVal($name,"bri","0") eq 0 );
|
||||
@ -191,10 +196,11 @@ sub HUEDevice_Define($$)
|
||||
} else {
|
||||
$hash->{DEF} = "group $id $args[3]";
|
||||
$attr{$name}{webCmd} = 'on:off' if( !defined( $attr{$name}{webCmd} ) );
|
||||
$attr{$name}{delayedUpdate} = 1 if( !defined( $attr{$name}{delayedUpdate} ) );
|
||||
}
|
||||
|
||||
RemoveInternalTimer($hash);
|
||||
InternalTimer(gettimeofday()+10, "HUEDevice_GetUpdate", $hash, 0);
|
||||
InternalTimer(gettimeofday()+10, "HUEDevice_GetUpdate", $hash, 0) if( !$hash->{helper}->{group} );
|
||||
|
||||
return undef;
|
||||
}
|
||||
@ -289,7 +295,7 @@ HUEDevice_SetParam($$@)
|
||||
} elsif( $cmd eq "rgb" && $value =~ m/^(..)(..)(..)/) {
|
||||
my( $r, $g, $b ) = (hex($1)/255.0, hex($2)/255.0, hex($3)/255.0);
|
||||
|
||||
if( !defined( AttrVal($name, "model", undef) ) )
|
||||
if( !defined( AttrVal($name, "model", undef) ) ) {
|
||||
my( $h, $s, $v ) = Color::rgb2hsv($r,$g,$b);
|
||||
|
||||
$obj->{'on'} = JSON::true;
|
||||
@ -312,10 +318,6 @@ HUEDevice_SetParam($$@)
|
||||
my $y = $Y / ($X + $Y + $Z);
|
||||
#Log3 $name, 3, "xyY:". $x . " " . $y ." ". $Y;
|
||||
|
||||
#$x = 0 if( $x < 0 );
|
||||
#$x = 1 if( $x > 1 );
|
||||
#$y = 0 if( $y < 0 );
|
||||
#$y = 1 if( $y > 1 );
|
||||
$Y = 1 if( $Y > 1 );
|
||||
|
||||
my $bri = maxNum($r,$g,$b);
|
||||
@ -324,7 +326,7 @@ HUEDevice_SetParam($$@)
|
||||
$obj->{'on'} = JSON::true;
|
||||
$obj->{'xy'} = [0+$x, 0+$y];
|
||||
$obj->{'bri'} = int(254*$bri);
|
||||
}
|
||||
}
|
||||
}
|
||||
} elsif( $cmd eq "hsv" && $value =~ m/^(..)(..)(..)/) {
|
||||
my( $h, $s, $v ) = (hex($1), hex($2), hex($3));
|
||||
@ -362,7 +364,7 @@ HUEDevice_Set($@)
|
||||
|
||||
my %obj;
|
||||
|
||||
$defs{$name}->{helper}->{update_timeout} = AttrVal($name, "delayedUpdate", 0);
|
||||
$hash->{helper}->{update_timeout} = AttrVal($name, "delayedUpdate", 0);
|
||||
|
||||
if( (my $joined = join(" ", @aa)) =~ /:/ ) {
|
||||
my @cmds = split(":", $joined);
|
||||
@ -381,15 +383,15 @@ HUEDevice_Set($@)
|
||||
HUEDevice_SetParam($name, \%obj, $cmd, $value, $value2);
|
||||
}
|
||||
|
||||
# if( $defs{$name}->{helper}->{update_timeout} == -1 ) {
|
||||
# if( $hash->{helper}->{update_timeout} == -1 ) {
|
||||
# my $diff;
|
||||
# my ($seconds, $microseconds) = gettimeofday();
|
||||
# if( $defs{$name}->{helper}->{timestamp} ) {
|
||||
# my ($seconds2, $microseconds2) = @{$defs{$name}->{helper}->{timestamp}};
|
||||
# if( $hash->{helper}->{timestamp} ) {
|
||||
# my ($seconds2, $microseconds2) = @{$hash->{helper}->{timestamp}};
|
||||
#
|
||||
# $diff = (($seconds-$seconds2)*1000000 + $microseconds-$microseconds2)/1000;
|
||||
# }
|
||||
# $defs{$name}->{helper}->{timestamp} = [$seconds, $microseconds];
|
||||
# $hash->{helper}->{timestamp} = [$seconds, $microseconds];
|
||||
#
|
||||
# return undef if( $diff < 100 );
|
||||
# }
|
||||
@ -401,16 +403,18 @@ HUEDevice_Set($@)
|
||||
} else {
|
||||
$result = HUEDevice_ReadFromServer($hash,$hash->{ID}."/state",\%obj);
|
||||
}
|
||||
if( $result->{'error'} ) {
|
||||
$hash->{STATE} = $result->{'error'}->{'description'};
|
||||
return undef;
|
||||
}
|
||||
|
||||
if( $defs{$name}->{helper}->{update_timeout} == -1 ) {
|
||||
} elsif( $defs{$name}->{helper}->{update_timeout}
|
||||
&& !$hash->{helper}->{group} ) {
|
||||
if( defined($result) && $result->{'error'} ) {
|
||||
$hash->{STATE} = $result->{'error'}->{'description'};
|
||||
return undef;
|
||||
}
|
||||
|
||||
return undef if( !defined($result) );
|
||||
|
||||
if( $hash->{helper}->{update_timeout} == -1 ) {
|
||||
} elsif( $hash->{helper}->{update_timeout} ) {
|
||||
RemoveInternalTimer($hash);
|
||||
InternalTimer(gettimeofday()+1, "HUEDevice_GetUpdate", $hash, 0);
|
||||
InternalTimer(gettimeofday()+$hash->{helper}->{update_timeout}, "HUEDevice_GetUpdate", $hash, 0);
|
||||
} else {
|
||||
RemoveInternalTimer($hash);
|
||||
HUEDevice_GetUpdate( $hash );
|
||||
@ -595,6 +599,7 @@ HUEDevice_ReadFromServer($@)
|
||||
my $ret;
|
||||
unshift(@a,$name);
|
||||
$ret = IOWrite($hash, @a);
|
||||
#$ret = IOWrite($hash,$hash,@a);
|
||||
use strict "refs";
|
||||
return $ret;
|
||||
return if(IsDummy($name) || IsIgnored($name));
|
||||
@ -632,27 +637,51 @@ HUEDevice_GetUpdate($)
|
||||
return;
|
||||
}
|
||||
|
||||
$hash->{lights} = join( ",", @{$result->{lights}} );
|
||||
HUEDevice_Parse($hash,$result);
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
if(!$hash->{LOCAL}) {
|
||||
RemoveInternalTimer($hash);
|
||||
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "HUEDevice_GetUpdate", $hash, 0);
|
||||
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "HUEDevice_GetUpdate", $hash, 0) if( $hash->{INTERVAL} );
|
||||
}
|
||||
|
||||
my $result = HUEDevice_ReadFromServer($hash,$hash->{ID});
|
||||
if( !defined($result) ) {
|
||||
$hash->{helper}{reachable} = 0;
|
||||
$hash->{helper}{reachable} = 'false';
|
||||
$hash->{STATE} = "unknown";
|
||||
return;
|
||||
} elsif( $result->{'error'} ) {
|
||||
$hash->{helper}{reachable} = 0;
|
||||
$hash->{helper}{reachable} = 'false';
|
||||
$hash->{STATE} = $result->{'error'}->{'description'};
|
||||
return;
|
||||
}
|
||||
|
||||
HUEDevice_Parse($hash,$result);
|
||||
}
|
||||
|
||||
sub
|
||||
HUEDevice_Parse($$)
|
||||
{
|
||||
my($hash,$result) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
Log3 $name, 4, "parse status message for $name";
|
||||
|
||||
if( $hash->{helper}->{group} ) {
|
||||
$hash->{lighes} = join( ",", @{$result->{lights}} );
|
||||
|
||||
foreach my $id ( @{$result->{lights}} ) {
|
||||
my $code = $hash->{IODev}->{NAME} ."-". $id;
|
||||
my $chash = $modules{HUEDevice}{defptr}{$code};
|
||||
|
||||
HUEDevice_GetUpdate($chash) if( defined($chash) );
|
||||
}
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
$hash->{modelid} = $result->{'modelid'};
|
||||
$hash->{name} = $result->{'name'};
|
||||
$hash->{type} = $result->{'type'};
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user