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

aus Master gemergt

Browse Source
This commit is contained in:
Marko Oldenburg 2015-08-10 14:32:18 +02:00
commit 15ee90e0dc
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
74_AMAD.pm
View File

@ -22,7 +22,7 @@
# #
################################################################ ################################################################
###### Version 0.2.0 ############ ###### Version 0.2.1 ############
@ -77,7 +77,7 @@ sub AMAD_Define($$) {
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 0); InternalTimer(gettimeofday()+$hash->{INTERVAL}, "AMAD_GetUpdateTimer", $hash, 0);
$hash->{STATE} = "active"; $hash->{STATE} = "initialized";
readingsSingleUpdate ($hash,"deviceState","online",0); readingsSingleUpdate ($hash,"deviceState","online",0);
return undef; return undef;
@ -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"); AMAD_RetrieveAutomagicInfo($hash) if (ReadingsVal($name,"deviceState","online") eq "online" && $hash->{STATE} eq "active" || $hash->{STATE} eq "error" || $hash->{STATE} eq "initialized");
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";
@ -239,6 +239,7 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
if (defined($err)) { if (defined($err)) {
if ($err ne "") 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, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: error while requesting AutomagicInfo: $err";
return; return;
} }
@ -246,6 +247,7 @@ 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");
Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo"; Log3 $name, 4, "AMAD ($name) - AMAD_RetrieveAutomagicInfoFinished: received http code ".$param->{code}." without any data after requesting AMAD AutomagicInfo";
return; return;
} }
@ -267,6 +269,8 @@ sub AMAD_RetrieveAutomagicInfoFinished($$$)
} }
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
$hash->{STATE} = "active" if ($hash->{STATE} eq "error" || $hash->{STATE} eq "initialized");
return undef; return undef;
} }
@ -277,6 +281,17 @@ sub AMAD_HTTP_POST($$)
my $state = $hash->{STATE}; my $state = $hash->{STATE};
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";
return;
}
if ($hash->{STATE} eq "error")
{
Log3 $name, 4, "AMAD ($name) - AMAD_HTTP_POST: error while send Set command. Please check IP or PORT";
return;
}
$hash->{STATE} = "Send HTTP POST"; $hash->{STATE} = "Send HTTP POST";
HttpUtils_NonblockingGet( HttpUtils_NonblockingGet(