Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

98_Hyperion: fix wrong error state on successful define, minor code changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12369 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
deespe 2016-10-17 22:11:09 +00:00
parent d80c38ecfb
commit c87d628ec2
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/FHEM/98_Hyperion.pm
View File

@ -119,6 +119,9 @@ sub Hyperion_Define($$)
$attr{$name}{userattr} = "homebridgeMapping ".$attr{$name}{userattr} $attr{$name}{userattr} = "homebridgeMapping ".$attr{$name}{userattr}
if ($attr{$name}{userattr} && index($attr{"global"}{userattr},"homebridgeMapping") == -1 && index($attr{$name}{userattr},"homebridgeMapping") == -1); if ($attr{$name}{userattr} && index($attr{"global"}{userattr},"homebridgeMapping") == -1 && index($attr{$name}{userattr},"homebridgeMapping") == -1);
$attr{$name}{webCmd} = $Hyperion_webCmd; $attr{$name}{webCmd} = $Hyperion_webCmd;
}
if ($init_done)
{
Hyperion_GetUpdate($hash); Hyperion_GetUpdate($hash);
} }
else else
@ -153,11 +156,14 @@ sub Hyperion_OpenDev($)
$hash->{STATE} = DevIo_OpenDev($hash,0,"Hyperion_DoInit",sub($$$) $hash->{STATE} = DevIo_OpenDev($hash,0,"Hyperion_DoInit",sub($$$)
{ {
my ($h,$err) = @_; my ($h,$err) = @_;
readingsSingleUpdate($hash,"lastError",$err,1) if ($err)
if ($err); {
readingsSingleUpdate($hash,"serverResponse","ERROR",1); readingsBeginUpdate($hash);
readingsSingleUpdate($hash,"state","ERROR",1) readingsBulkUpdate($hash,"lastError",$err);
if (Value($hash->{NAME}) ne "ERROR"); readingsBulkUpdate($hash,"serverResponse","ERROR");
readingsBulkUpdate($hash,"state","ERROR");
readingsEndUpdate($hash,1);
}
return $err ? "Error: $err" : $hash->{DeviceName}." connected"; return $err ? "Error: $err" : $hash->{DeviceName}." connected";
}); });
return undef; return undef;
@ -256,8 +262,8 @@ sub Hyperion_Read($)
Log3 $name, 1, $error; Log3 $name, 1, $error;
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash,"serverResponse","ERROR"); readingsBulkUpdate($hash,"serverResponse","ERROR");
readingsBulkUpdate($hash,"state","ERROR");
readingsBulkUpdate($hash,"lastError",$error); readingsBulkUpdate($hash,"lastError",$error);
readingsBulkUpdate($hash,"state","ERROR");
readingsEndUpdate($hash,1); readingsEndUpdate($hash,1);
return undef; return undef;
} }
@ -396,8 +402,7 @@ sub Hyperion_Read($)
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash,"lastError","error while requesting ".$hash->{DeviceName}); readingsBulkUpdate($hash,"lastError","error while requesting ".$hash->{DeviceName});
readingsBulkUpdate($hash,"serverResponse","ERROR"); readingsBulkUpdate($hash,"serverResponse","ERROR");
readingsBulkUpdate($hash,"state","ERROR") readingsBulkUpdate($hash,"state","ERROR");
if (Value($name) ne "ERROR");
} }
return undef; return undef;
} }
@ -405,6 +410,8 @@ sub Hyperion_Read($)
sub Hyperion_GetConfigs($) sub Hyperion_GetConfigs($)
{ {
my ($hash) = @_; my ($hash) = @_;
return "Not connected"
if (!$hash->{FD});
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $ip = $hash->{IP}; my $ip = $hash->{IP};
my $dir = AttrVal($name,"hyperionConfigDir","/etc/hyperion/"); my $dir = AttrVal($name,"hyperionConfigDir","/etc/hyperion/");
@ -418,7 +425,7 @@ sub Hyperion_GetConfigs($)
{ {
my $user = AttrVal($name,"hyperionSshUser","pi"); my $user = AttrVal($name,"hyperionSshUser","pi");
my $cmd = qx(which ssh); my $cmd = qx(which ssh);
chomp($cmd); chomp $cmd;
$cmd .= " $user\@$ip $com"; $cmd .= " $user\@$ip $com";
@files = Hyperion_listFilesInDir($hash,$cmd); @files = Hyperion_listFilesInDir($hash,$cmd);
} }
@ -542,8 +549,7 @@ sub Hyperion_Set($@)
Log3 $name,4,"$name: NOT restarted Hyperion with $binpath $confdir$value, status: $status"; Log3 $name,4,"$name: NOT restarted Hyperion with $binpath $confdir$value, status: $status";
readingsSingleUpdate($hash,"lastError",$status,1); readingsSingleUpdate($hash,"lastError",$status,1);
readingsSingleUpdate($hash,"serverResponse","ERROR",1); readingsSingleUpdate($hash,"serverResponse","ERROR",1);
readingsSingleUpdate($hash,"state","ERROR",1) readingsSingleUpdate($hash,"state","ERROR",1);
if (Value($name) ne "ERROR");
return "$name NOT restarted Hyperion with $binpath $confdir$value, status: $status"; return "$name NOT restarted Hyperion with $binpath $confdir$value, status: $status";
} }
} }
@ -584,7 +590,7 @@ sub Hyperion_Set($@)
elsif ($cmd =~ /^(dimUp|dimDown)$/) elsif ($cmd =~ /^(dimUp|dimDown)$/)
{ {
return "Value of $cmd has to be between 1 and 99" return "Value of $cmd has to be between 1 and 99"
if (defined($value) && $value =~ /^(\d+)$/ && int($1) < 1 && int($1) > 99); if (defined $value && $value =~ /^(\d+)$/ && int($1) < 1 && int($1) > 99);
my $dim = int ReadingsVal($name,"dim",100); my $dim = int ReadingsVal($name,"dim",100);
my $dimStep = (defined $value) ? int $value : int AttrVal($name,"hyperionDimStep",5); my $dimStep = (defined $value) ? int $value : int AttrVal($name,"hyperionDimStep",5);
my $dimUp = ($dim + $dimStep < 100) ? $dim + $dimStep : 100; my $dimUp = ($dim + $dimStep < 100) ? $dim + $dimStep : 100;
@ -782,7 +788,7 @@ sub Hyperion_Attr(@)
Hyperion_Call($hash); Hyperion_Call($hash);
} }
} }
elsif ($attr_name eq "hyperionDefaultPriority" || $attr_name eq "hyperionDefaultDuration") elsif ($attr_name =~ /^hyperionDefault(Priority|Duration)$/)
{ {
$err = "Invalid value $attr_value for attribute $attr_name. Must be a number between 0 and 65536." $err = "Invalid value $attr_value for attribute $attr_name. Must be a number between 0 and 65536."
if ($attr_value !~ /^(\d+)$/ || $1 < 0 || $1 > 65536); if ($attr_value !~ /^(\d+)$/ || $1 < 0 || $1 > 65536);
@ -859,14 +865,13 @@ sub Hyperion_devStateIcon($;$)
if (Value($name) eq "off"); if (Value($name) eq "off");
return ".*:light_exclamation" return ".*:light_exclamation"
if (Value($name) =~ /^(ERROR|disconnected)$/); if (Value($name) =~ /^(ERROR|disconnected)$/);
return ".*:light_question"
if (Value($name) eq "Initialized");
return ".*:light_light_dim_$ico@#".$rgb.":toggle" return ".*:light_light_dim_$ico@#".$rgb.":toggle"
if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "rgb"); if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "rgb");
return ".*:light_led_stripe_rgb@#FFFF00:toggle" return ".*:light_led_stripe_rgb@#FFFF00:toggle"
if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "effect"); if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "effect");
return ".*:it_television@#0000FF:toggle" return ".*:it_television@#0000FF:toggle"
if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "clearall"); if (Value($name) ne "off" && ReadingsVal($name,"mode","") eq "clearall");
return ".*:light_question";
} }
1; 1;