From 0dc01beffedcd6eca315671d5e5d95b849dfd26b Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 13 Aug 2015 14:27:23 +0200 Subject: [PATCH] =?UTF-8?q?Dokumentation=20angepasst=20und=20vervollst?= =?UTF-8?q?=C3=A4ndigt,=20diverse=20Rechtschreibfehler=20korrigiert,=20lee?= =?UTF-8?q?re=20Eintr=C3=A4ge=20in=20den=20SetCommands=20abgefabgen=20-=20?= =?UTF-8?q?kein=20Absturz=20mehr=20von=20FHEM.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 145 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 115 insertions(+), 30 deletions(-) diff --git a/74_AMAD.pm b/74_AMAD.pm index 88e63da..cdc838f 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -22,7 +22,7 @@ # ################################################################ -###### Version 0.3.0 ############ +###### Version 0.3.6 ############ @@ -173,17 +173,9 @@ sub AMAD_Set($$@) || lc $cmd eq 'openurl' || lc $cmd eq 'nextalarmtime') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); - return AMAD_SelectSetCmd ($hash, $cmd, @val); + Log3 $name, 5, "AMAD ($name) - set $name $cmd ".join(" ", @val); + return AMAD_SelectSetCmd ($hash, $cmd, @val) if (@val); } - -# elsif (lc $cmd eq 'devicestate') { -# Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); -# my $v = join(" ", @val); -# -# readingsSingleUpdate ($hash,$cmd,$v,1); -# -# return undef; return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list"; } @@ -219,13 +211,13 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$) my $name = $hash->{NAME}; my $host = $hash->{HOST}; - Log3 $name, 3, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: calling Host: $host"; + Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: calling Host: $host"; if (defined($err)) { if ($err ne "") { $hash->{STATE} = "error" if ($hash->{STATE} ne "initialized"); - Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err"; + Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err"; return; } } @@ -233,7 +225,7 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$) if($data eq "" and exists($param->{code})) { $hash->{STATE} = "error" if ($hash->{STATE} ne "initialized"); - Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo"; + Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo"; return; } @@ -268,12 +260,12 @@ sub AMAD_HTTP_POST($$) if ($hash->{STATE} eq "initialized") { - Log3 $name, 4, "AMAD ($name) - AMAD_HTTP_POST: set command only works if STATE active, please wait next interval run"; + Log3 $name, 3, "AMAD ($name) - AMAD_HTTP_POST: set command only works if STATE active, please wait next interval run"; return "set command only works if STATE active, please wait next interval run"; } if ($hash->{STATE} eq "error") { - Log3 $name, 4, "AMAD ($name) - AMAD_HTTP_POST: error while send Set command. Please check IP or PORT"; + Log3 $name, 3, "AMAD ($name) - AMAD_HTTP_POST: error while send Set command. Please check IP or PORT"; return "error while send Set command. Please check IP or PORT"; } @@ -397,28 +389,121 @@ sub AMAD_SelectSetCmd($$@)

AMAD - Automagic Android Device