74_AMAD: New Minor Release 2.4 new AMADCommBridge API

git-svn-id: https://svn.fhem.de/fhem/trunk@11803 2b470e98-0d58-463d-a4d8-8e2adae1ed80

fhem/CHANGED

@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - updated: 74_AMAD: New Minor Release 2.4 new AMADCommBridge API
   - changed: 10_ZWave: alarm Events text changed, comma replaced, Forum #53389
   - feature: 93_DbRep: new module added - reporting of database content
              written by DbLog, see commandref for details

fhem/FHEM/74_AMAD.pm

@@ -37,8 +37,8 @@ use TcpServerUtils;
 use Encode qw(encode);
 
 
-my $modulversion = "2.2.4";
+my $modulversion = "2.4.0";
-my $flowsetversion = "2.2.4";
+my $flowsetversion = "2.4.0";
 
 
 
@@ -278,15 +278,15 @@ sub AMAD_statusRequest($) {
     my $activetask = AttrVal( $name, "checkActiveTask", "none" );
     
 
-    my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Path muß so im Automagic als http request Trigger drin stehen
+    my $url = "http://" . $host . ":" . $port . "/fhem-amad/deviceInfo/"; # Pfad muß so im Automagic als http request Trigger drin stehen
   
     HttpUtils_NonblockingGet(
 	{
 	    url		=> $url,
-	    timeout	=> 30,
+	    timeout	=> 15,
 	    hash	=> $hash,
 	    method	=> "GET",
-	    header	=> "fhemip: $fhemip\r\nfhemdevice: $name\r\nactivetask: $activetask\r\napssid: $apssid\r\nbport: $bport",
+	    header	=> "Connection: close\r\nfhemip: $fhemip\r\nfhemdevice: $name\r\nactivetask: $activetask\r\napssid: $apssid\r\nbport: $bport",
 	    doTrigger	=> 1,
 	    callback	=> \&AMAD_statusRequestErrorHandling,
 	}
@@ -904,6 +904,7 @@ sub AMAD_HTTP_POST($$) {
 	    timeout	=> 60,
 	    hash	=> $hash,
 	    method	=> "POST",
+	    header	=> "Connection: close",
 	    doTrigger	=> 1,
 	    callback	=> \&AMAD_HTTP_POSTerrorHandling,
 	}
@@ -1092,10 +1093,9 @@ sub AMAD_CommBridge_Read($) {
     my $bname = $bhash->{NAME};
     
     
-    ## Zum testen mal ausgeschalten
+    
     if( $hash->{SERVERSOCKET} ) {               # Accept and create a child
         TcpServer_Accept( $hash, "AMAD" );
-        
         return;
     }
 
@@ -1103,6 +1103,8 @@ sub AMAD_CommBridge_Read($) {
     my $buf;
     my $ret = sysread($hash->{CD}, $buf, 1024);
 
+
+
     # When there is an error in connection return
     if( !defined($ret ) || $ret <= 0 ) {
         CommandDelete( undef, $hash->{NAME} );
@@ -1121,12 +1123,13 @@ sub AMAD_CommBridge_Read($) {
     my @data = split( '\R\R', $buf );
     
     my $header = AMAD_Header2Hash( $data[0] );
-    my $device = $header->{FHEMDEVICE} if(defined($header->{FHEMDEVICE}));
-    my $dhash = $defs{$device};
     my $response;
     my $c;
+    my $device = $header->{FHEMDEVICE} if(defined($header->{FHEMDEVICE}));
+    my $fhemcmd = $header->{FHEMCMD} if(defined($header->{FHEMCMD}));
+    my $dhash = $defs{$device} if( $defs{$device} );
+
 
-    my $fhemcmd = $header->{FHEMCMD};
 
 
     if ( $data[0] =~ /currentFlowsetUpdate.xml/ ) {
@@ -1136,6 +1139,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
 
@@ -1149,6 +1153,7 @@ sub AMAD_CommBridge_Read($) {
             $c = $hash->{CD};
             print $c "HTTP/1.1 200 OK\r\n",
                 "Content-Type: text/plain\r\n",
+                "Connection: close\r\n",
                 "Content-Length: ".length($response)."\r\n\r\n",
                 $response;
 
@@ -1156,6 +1161,16 @@ sub AMAD_CommBridge_Read($) {
         }
     }
 
+
+
+    elsif( !defined($device) ) {
+        readingsSingleUpdate( $bhash, "transmitterERROR", $name." has no device name sends", 1 );
+        Log3 $name, 4, "AMAD ($name) - ERROR - no device name given. please check your global variable in automagic";
+        return;
+    }
+
+
+
     elsif ( $fhemcmd =~ /setreading\b/ ) {
 	my $tv = $data[1];
 
@@ -1167,6 +1182,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
 
@@ -1184,6 +1200,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
 	
@@ -1203,6 +1220,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
             
@@ -1217,6 +1235,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
         
@@ -1241,6 +1260,7 @@ sub AMAD_CommBridge_Read($) {
         $c = $hash->{CD};
         print $c "HTTP/1.1 200 OK\r\n",
             "Content-Type: text/plain\r\n",
+            "Connection: close\r\n",
             "Content-Length: ".length($response)."\r\n\r\n",
             $response;
 	
@@ -1252,6 +1272,7 @@ sub AMAD_CommBridge_Read($) {
     $c = $hash->{CD};
     print $c "HTTP/1.1 200 OK\r\n",
         "Content-Type: text/plain\r\n",
+        "Connection: close\r\n",
         "Content-Length: ".length($response)."\r\n\r\n",
         $response;
 }