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

fig bug

Browse Source
This commit is contained in:
Marko Oldenburg
2019-06-20 22:31:06 +02:00
parent abff40a4ec
commit 55e296cdd6
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
73_AMADCommBridge.pm
View File

@@ -876,6 +876,8 @@ sub ProcessRead($$) {
my ( $hash, $buf ) = @_; my ( $hash, $buf ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $flowsetversion =
$modules{AMADCommBridge}{defptr}{BRIDGE}->{VERSIONFLOWSET};
my @data = split( '\R\R', $buf ); my @data = split( '\R\R', $buf );
my $data = $data[0]; my $data = $data[0];
@@ -892,7 +894,7 @@ sub ProcessRead($$) {
if ( $data =~ /currentFlowsetUpdate.xml/ ) { if ( $data =~ /currentFlowsetUpdate.xml/ ) {
$response = $response =
qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$hash->{VERSIONFLOWSET}.xml); qx(cat $fhempath/FHEM/lib/74_AMADautomagicFlowset_$flowsetversion.xml);
$c = $hash->{CD}; $c = $hash->{CD};
print $c "HTTP/1.1 200 OK\r\n", print $c "HTTP/1.1 200 OK\r\n",
"Content-Type: text/plain\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/ ) { elsif ( $data =~ /currentTaskersetUpdate.prj.xml/ ) {
$response = $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}; $c = $hash->{CD};
print $c "HTTP/1.1 200 OK\r\n", print $c "HTTP/1.1 200 OK\r\n",
"Content-Type: text/plain\r\n", "Content-Type: text/plain\r\n",
@@ -1460,8 +1462,8 @@ sub ParseMsg($$) {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v4.4.2", "version": "v4.4.3",
"x_flowsetversion": "4.1.1", "x_flowsetversion": "4.4.1",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

13
74_AMADDevice.pm
View File

@@ -240,11 +240,11 @@ sub Define($$) {
my $amad_id = $a[3]; my $amad_id = $a[3];
my $remoteServer = $a[4]; my $remoteServer = $a[4];
$hash->{HOST} = $host; $hash->{HOST} = $host;
$hash->{AMAD_ID} = $amad_id; $hash->{AMAD_ID} = $amad_id;
$hash->{VERSION} = version->parse($VERSION)->normal; $hash->{VERSION} = version->parse($VERSION)->normal;
$hash->{NOTIFYDEV} = 'global,' . $name; $hash->{NOTIFYDEV} = 'global,' . $name;
$hash->{MODEL} = $remoteServer; $hash->{MODEL} = $remoteServer;
$hash->{PORT} = 8090 if ( $remoteServer eq 'Automagic' ); $hash->{PORT} = 8090 if ( $remoteServer eq 'Automagic' );
$hash->{PORT} = 1817 if ( $remoteServer eq 'Autoremote' ); $hash->{PORT} = 1817 if ( $remoteServer eq 'Autoremote' );
@@ -276,6 +276,7 @@ sub Define($$) {
} }
$iodev = $hash->{IODev}->{NAME}; $iodev = $hash->{IODev}->{NAME};
# $hash->{VERSIONFLOWSET} = FHEM::Meta::Get( $defs{$iodev}, 'x_flowsetversion' ); # $hash->{VERSIONFLOWSET} = FHEM::Meta::Get( $defs{$iodev}, 'x_flowsetversion' );
$hash->{VERSIONFLOWSET} = $defs{$iodev}->{VERSIONFLOWSET}; $hash->{VERSIONFLOWSET} = $defs{$iodev}->{VERSIONFLOWSET};
@@ -1679,7 +1680,7 @@ sub CreateChangeBtDeviceValue($$) {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v4.4.2", "version": "v4.4.3",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],