From 55e296cdd68e06d262b0311da829e8b8a8dc2339 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 20 Jun 2019 22:31:06 +0200 Subject: [PATCH] fig bug --- 73_AMADCommBridge.pm | 10 ++++++---- 74_AMADDevice.pm | 13 +++++++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm index a36de6d..f275dcf 100755 --- a/73_AMADCommBridge.pm +++ b/73_AMADCommBridge.pm @@ -876,6 +876,8 @@ sub ProcessRead($$) { my ( $hash, $buf ) = @_; my $name = $hash->{NAME}; + my $flowsetversion = + $modules{AMADCommBridge}{defptr}{BRIDGE}->{VERSIONFLOWSET}; my @data = split( '\R\R', $buf ); my $data = $data[0]; @@ -892,7 +894,7 @@ sub ProcessRead($$) { if ( $data =~ /currentFlowsetUpdate.xml/ ) { $response = -qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$hash->{VERSIONFLOWSET}.xml); +qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$flowsetversion.xml); $c = $hash->{CD}; print $c "HTTP/1.1 200 OK\r\n", "Content-Type: text/plain\r\n", @@ -906,7 +908,7 @@ qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$hash->{VERSIONFLOWSET}.xml); elsif ( $data =~ /currentTaskersetUpdate.prj.xml/ ) { $response = - qx(cat $fhempath/FHEM/lib/74_AMADtaskerset_$hash->{VERSIONFLOWSET}.prj.xml); + qx(cat $fhempath/FHEM/lib/74_AMADtaskerset_$flowsetversion.prj.xml); $c = $hash->{CD}; print $c "HTTP/1.1 200 OK\r\n", "Content-Type: text/plain\r\n", @@ -1460,8 +1462,8 @@ sub ParseMsg($$) { ], "release_status": "stable", "license": "GPL_2", - "version": "v4.4.2", - "x_flowsetversion": "4.1.1", + "version": "v4.4.3", + "x_flowsetversion": "4.4.1", "author": [ "Marko Oldenburg " ], diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm index b6c8e84..6c5f467 100755 --- a/74_AMADDevice.pm +++ b/74_AMADDevice.pm @@ -240,11 +240,11 @@ sub Define($$) { my $amad_id = $a[3]; my $remoteServer = $a[4]; - $hash->{HOST} = $host; - $hash->{AMAD_ID} = $amad_id; - $hash->{VERSION} = version->parse($VERSION)->normal; - $hash->{NOTIFYDEV} = 'global,' . $name; - $hash->{MODEL} = $remoteServer; + $hash->{HOST} = $host; + $hash->{AMAD_ID} = $amad_id; + $hash->{VERSION} = version->parse($VERSION)->normal; + $hash->{NOTIFYDEV} = 'global,' . $name; + $hash->{MODEL} = $remoteServer; $hash->{PORT} = 8090 if ( $remoteServer eq 'Automagic' ); $hash->{PORT} = 1817 if ( $remoteServer eq 'Autoremote' ); @@ -276,6 +276,7 @@ sub Define($$) { } $iodev = $hash->{IODev}->{NAME}; + # $hash->{VERSIONFLOWSET} = FHEM::Meta::Get( $defs{$iodev}, 'x_flowsetversion' ); $hash->{VERSIONFLOWSET} = $defs{$iodev}->{VERSIONFLOWSET}; @@ -1679,7 +1680,7 @@ sub CreateChangeBtDeviceValue($$) { ], "release_status": "stable", "license": "GPL_2", - "version": "v4.4.2", + "version": "v4.4.3", "author": [ "Marko Oldenburg " ],