From 4ce293d0fc0711df4e78bb5ff034686a1b204bcb Mon Sep 17 00:00:00 2001
From: Marko Oldenburg <leongaultier@gmail.com>
Date: Wed, 13 Dec 2017 21:03:23 +0100
Subject: [PATCH] fix room and remoteServer Attribut

---
 73_AMADCommBridge.pm |  4 ++--
 74_AMADDevice.pm     | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm
index 73764b0..d775c95 100644
--- a/73_AMADCommBridge.pm
+++ b/73_AMADCommBridge.pm
@@ -74,7 +74,7 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode ";
 eval "use JSON;1" or $missingModul .= "JSON ";
 
 
-my $modulversion = "4.1.99.1";
+my $modulversion = "4.1.99.3";
 my $flowsetversion = "4.0.11";
 
 
@@ -153,7 +153,7 @@ sub AMADCommBridge_Define($$) {
     $hash->{VERSIONFLOWSET} = $flowsetversion;
 
 
-    $attr{$name}{room} = "AMAD" if( !defined( $attr{$name}{room} ) );
+    CommandAttr(undef,"$name room AMAD") if(AttrVal($name,'room','none') eq 'none');
     
     Log3 $name, 3, "AMADCommBridge ($name) - defined AMADCommBridge with Socketport $port";
 
diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm
index ae17dd5..fcbf5dd 100644
--- a/74_AMADDevice.pm
+++ b/74_AMADDevice.pm
@@ -58,7 +58,7 @@ eval "use Encode qw(encode encode_utf8);1" or $missingModul .= "Encode ";
 eval "use JSON;1" or $missingModul .= "JSON ";
 
 
-my $modulversion = "4.1.99.1";
+my $modulversion = "4.1.99.3";
 my $flowsetversion = "4.0.11";
 
 
@@ -139,19 +139,19 @@ sub AMADDevice_Define($$) {
     my $iodev;
     my $i = 0;
 
-    
-    foreach my $param ( @a ) {
-        if( $param =~ m/IODev=([^\s]*)/ ) {
+    ######## Kann in kommenden Versionen gelöscht werden ###############
+    #foreach my $param ( @a ) {
+    #    if( $param =~ m/IODev=([^\s]*)/ ) {
         
-            $iodev = $1;
-            splice( @a, $i, 4 );
-            last;
-        }
+    #        $iodev = $1;
+    #        splice( @a, $i, 3 );
+    #        last;
+    #    }
         
-        $i++;
-    }
+    #    $i++;
+    #}
     
-    return "too few parameters: define <name> AMADDevice <HOST-IP> <amad_id> <remoteServer>" if( @a != 4 );
+    return "too few parameters: define <name> AMADDevice <HOST-IP> <amad_id> <remoteServer>" if( @a != 5 );
     return "Cannot define a AMAD device. Perl modul $missingModul is missing." if ( $missingModul );
     
     
@@ -194,8 +194,8 @@ sub AMADDevice_Define($$) {
 
     
 
-    CommandAttr(undef,$name . "room AMAD") if(AttrVal($name,'room','none') eq 'none';
-    CommandAttr(undef,$name . "remoteServer $remoteServer") if(AttrVal($name,'remoteServer','none') eq 'none';
+    CommandAttr(undef,"$name room AMAD") if(AttrVal($name,'room','none') eq 'none');
+    CommandAttr(undef,"$name remoteServer $remoteServer") if(AttrVal($name,'remoteServer','none') eq 'none');
         
     readingsBeginUpdate($hash);
     readingsBulkUpdateIfChanged( $hash, "state", "initialized",1);