From 156fabe25c5ffb5f6e4fb2431817f1612ec78d0f Mon Sep 17 00:00:00 2001 From: deespe Date: Thu, 4 Aug 2016 17:08:29 +0000 Subject: [PATCH] 98_Hyperion.pm: minor code improvements, documentation adjustments and documentation layout adjustments git-svn-id: https://svn.fhem.de/fhem/trunk@11892 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Hyperion.pm | 160 ++++++++++++++++++++------------------- 1 file changed, 81 insertions(+), 79 deletions(-) diff --git a/fhem/FHEM/98_Hyperion.pm b/fhem/FHEM/98_Hyperion.pm index 1c8d9031c..9ee2aedce 100644 --- a/fhem/FHEM/98_Hyperion.pm +++ b/fhem/FHEM/98_Hyperion.pm @@ -127,7 +127,8 @@ sub Hyperion_list2array($$) sub Hyperion_Get($@) { my ($hash,$name,$cmd) = @_; - return "get $name needs one parameter: configFiles:noArg devStateIcon:noArg statusRequest:noArg" if (!defined($cmd)); + my $params = "configFiles:noArg devStateIcon:noArg statusRequest:noArg"; + return "get $name needs one parameter: $params" if (!defined($cmd)); if ($cmd eq "configFiles") { @@ -143,7 +144,7 @@ sub Hyperion_Get($@) } else { - return "Unknown argument $cmd for $name, choose one of configFiles:noArg devStateIcon:noArg statusRequest:noArg"; + return "Unknown argument $cmd for $name, choose one of $params"; } } @@ -177,9 +178,10 @@ sub Hyperion_GetHttpResponse($$$) if (!$conn) { + my $error = "Can't connect to http://$host:$port"; readingsBulkUpdate($hash,"state","ERROR") if (Value($name) ne "ERROR"); - readingsBulkUpdate($hash,"serverResponse","ERROR: Can't connect to http://$host:$port"); - readingsBulkUpdate($hash,"lastError","Can't connect to http://$host:$port") if (ReadingsVal($name,"lastError","") ne "Can't connect to http://$host:$port"); + readingsBulkUpdate($hash,"serverResponse","ERROR: $error"); + readingsBulkUpdate($hash,"lastError",$error) if (ReadingsVal($name,"lastError","") ne $error); undef $conn; return undef; } @@ -832,107 +834,108 @@ sub Hyperion_devStateIcon($;$)

set <required> [optional]

@@ -941,16 +944,15 @@ sub Hyperion_devStateIcon($;$)

Get