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

Verbesserte Auswertung der empfangenden Daten über die AMADCommBridge nach Änderung des HTTP Request Headers ab Autimagic 1.29

Browse Source
This commit is contained in:
Marko Oldenburg
2015-11-04 21:22:28 +01:00
parent 82ba0bf86c
commit a437a47276
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
74_AMAD.pm
View File

@@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday);
use HttpUtils; use HttpUtils;
use TcpServerUtils; use TcpServerUtils;
my $version = "0.8.1"; my $version = "0.8.2";
@@ -894,13 +894,23 @@ sub AMAD_CommBridge_Read($) {
### ###
my @data = split( '\R\R', $buf ); my @data = split( '\R\R', $buf );
my $chash = undef;
if ( $data[0] =~ /FHEMCMD: setreading\b/ ) { if ( $data[0] =~ /FHEMCMD: setreading\b/ ) {
my $tv = $data[1]; my $tv = $data[1];
@data = split( '\R', $data[0] ); @data = split( '\R', $data[0] );
$data[2] =~ s/FHEMDEVICE: //; if( $data[2] =~ /FHEMDEVICE:/ ) {
my $chash = $defs{$data[2]};
$data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]};
} else {
$data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]};
}
### Begin Response Processing ### Begin Response Processing
my @valuestring = split( '@@@@', $tv ); my @valuestring = split( '@@@@', $tv );
@@ -947,8 +957,16 @@ sub AMAD_CommBridge_Read($) {
elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) { elsif ( $data[0] =~ /FHEMCMD: statusrequest\b/ ) {
@data = split( '\R', $data[0] ); @data = split( '\R', $data[0] );
$data[2] =~ s/FHEMDEVICE: //; if( $data[2] =~ /FHEMDEVICE:/ ) {
my $chash = $defs{$data[2]};
$data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]};
} else {
$data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]};
}
return AMAD_GetUpdateLocal( $chash ); return AMAD_GetUpdateLocal( $chash );
} }