FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Version 0.4.1 - Fix FHEM Crash wenn das Androidgerät über Netzwerk nicht erreichbar ist. Möglichkeit für stateFormat hinzugefügt. Fehlerbehandlung komplett umgeschrieben

Browse Source
This commit is contained in:
Marko Oldenburg 2015-08-17 21:31:05 +02:00
parent 642a628d5b
commit 1f7a23adc9
2 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
74_AMAD.pm
View File

@ -22,7 +22,7 @@
# #
################################################################ ################################################################
###### Version 0.4.0 ############ ###### Version 0.4.1 ############
@ -140,7 +140,7 @@ sub AMAD_GetUpdateTimer($)
my ($hash) = @_; my ($hash) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
AMAD_RetrieveAutomagicInfo($hash) if (ReadingsVal($name,"deviceState","online") eq "online" && $hash->{STATE} eq "active" || $hash->{STATE} eq "error" || $hash->{STATE} eq "initialized"); AMAD_RetrieveAutomagicInfo($hash) if (ReadingsVal($name,"deviceState","online") eq "online" && $hash->{STATE} ne "disabled");
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 1); InternalTimer(gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 1);
Log3 $name, 4, "AMAD ($name) - Call AMAD_GetUpdateTimer"; Log3 $name, 4, "AMAD ($name) - Call AMAD_GetUpdateTimer";
@ -193,7 +193,6 @@ sub AMAD_RetrieveAutomagicInfo($)
{ {
url => $url, url => $url,
timeout => 5, timeout => 5,
#noshutdown => 0,
hash => $hash, hash => $hash,
method => "GET", method => "GET",
doTrigger => 1, doTrigger => 1,
@ -216,7 +215,7 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
if (defined($err)) { if (defined($err)) {
if ($err ne "") if ($err ne "")
{ {
$hash->{STATE} = "error" if ($hash->{STATE} ne "initialized"); $hash->{STATE} = $err if ($hash->{STATE} ne "initialized");
Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err"; Log3 $name, 5, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err";
return; return;
} }
@ -224,12 +223,12 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
if($data eq "" and exists($param->{code})) if($data eq "" and exists($param->{code}))
{ {
$hash->{STATE} = "error" if ($hash->{STATE} ne "initialized"); $hash->{STATE} = $param if ($hash->{STATE} ne "initialized");
Log3 $name, 5, "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; return;
} }
# $hash->{RETRIEVECACHE} = $data; # zu Testzwecken $hash->{STATE} = "active" if ($hash->{STATE} eq "initialized" || $hash->{STATE} ne "active");
my @valuestring = split('@@@@', $data); my @valuestring = split('@@@@', $data);
my %buffer; my %buffer;
@ -246,7 +245,7 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
} }
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
$hash->{STATE} = "active" if ($hash->{STATE} eq "error" || $hash->{STATE} eq "initialized"); $hash->{STATE} = "active" if ($hash->{STATE} eq "initialized");
return undef; return undef;
} }
@ -261,12 +260,7 @@ sub AMAD_HTTP_POST($$)
if ($hash->{STATE} eq "initialized") if ($hash->{STATE} eq "initialized")
{ {
Log3 $name, 3, "AMAD ($name) - AMAD_HTTP_POST: set command only works if STATE active, please wait for next interval run"; Log3 $name, 3, "AMAD ($name) - AMAD_HTTP_POST: set command only works if STATE active, please wait for next interval run";
return "set command only works if STATE active, please wait for next interval run"; return "set command only works if STATE not equal initialized, please wait for next interval run";
}
if ($hash->{STATE} eq "error")
{
Log3 $name, 3, "AMAD ($name) - AMAD_HTTP_POST: error while send Set command. Please check IP, PORT or wait for next interval run.";
return "error while send Set command. Please check IP, PORT or wait for next interval run.";
} }
$hash->{STATE} = "Send HTTP POST"; $hash->{STATE} = "Send HTTP POST";
@ -275,9 +269,10 @@ sub AMAD_HTTP_POST($$)
{ {
url => $url, url => $url,
timeout => 5, timeout => 5,
#noshutdown => 0, hash => $hash,
method => "POST", method => "POST",
doTrigger => 1, doTrigger => 1,
callback => \&AMAD_HTTP_POSTerrorHandling,
} }
); );
Log3 $name, 4, "AMAD ($name) - Send HTTP POST with URL $url"; Log3 $name, 4, "AMAD ($name) - Send HTTP POST with URL $url";
@ -287,6 +282,34 @@ sub AMAD_HTTP_POST($$)
return undef; return undef;
} }
sub AMAD_HTTP_POSTerrorHandling($$$)
{
my ( $param, $err, $data ) = @_;
my $hash = $param->{hash};
# my $doTrigger = $param->{doTrigger};
my $name = $hash->{NAME};
# my $host = $hash->{HOST};
if (defined($err)) {
if ($err ne "")
{
$hash->{STATE} = $err if ($hash->{STATE} ne "initialized");
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: error while send SetCommand: $err";
return;
}
}
if($data eq "" and exists($param->{code}))
{
$hash->{STATE} = $param if ($hash->{STATE} ne "initialized");
Log3 $name, 5, "AMAD ($name) - AMAD_HTTP_POST: received http code ".$param->{code}." without any data after send SetCommand";
return;
}
return undef;
}
sub AMAD_SelectSetCmd($$@) sub AMAD_SelectSetCmd($$@)
{ {
my ($hash, $cmd, @data) = @_; my ($hash, $cmd, @data) = @_;
@ -520,7 +543,6 @@ sub AMAD_SelectSetCmd($$@)
<ul><br> <ul><br>
Es gibt drei STATE Zust&auml;nde. Es gibt drei STATE Zust&auml;nde.
<li>initialized - Ist der Status kurz nach einem define, ein Set Befehl ist hier noch nicht m&ouml;glich.</li> <li>initialized - Ist der Status kurz nach einem define, ein Set Befehl ist hier noch nicht m&ouml;glich.</li>
<li>error - beim letzten "get Information" gab es eine Fehlermeldung daher werden die Set Befehle ausgesetzt bis der n&auml;chsten "get Information" Durchlauf ohne Fehler beendet wird.</li>
<li>activ - das Modul ist im aktiven Status und "Set Befehle" k&ouml;nnen gesetzt werden.</li> <li>activ - das Modul ist im aktiven Status und "Set Befehle" k&ouml;nnen gesetzt werden.</li>
</ul> </ul>
<br><br><br> <br><br><br>

0
Automagic_FHEM-AMAD_Flows_v0.4.0.xml → Automagic_FHEM-AMAD_Flows_v0.4.1.xml
View File