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 22:23:02 +01:00
parent a437a47276
commit a0aee74475
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
74_AMAD.pm
View File

@@ -900,16 +900,6 @@ sub AMAD_CommBridge_Read($) {
my $tv = $data[1]; my $tv = $data[1];
@data = split( '\R', $data[0] ); @data = split( '\R', $data[0] );
if( $data[2] =~ /FHEMDEVICE:/ ) {
$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
@@ -923,15 +913,38 @@ sub AMAD_CommBridge_Read($) {
my $t; my $t;
my $v; my $v;
while( ( $t, $v ) = each %buffer ) {
$v =~ s/null//g; if( $data[2] =~ /FHEMDEVICE:/ ) {
$data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]};
while( ( $t, $v ) = each %buffer ) {
$v =~ s/null//g;
readingsBeginUpdate( $chash ); readingsBeginUpdate( $chash );
readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) ); readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) );
} }
readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" ); readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" );
readingsEndUpdate( $chash, 1 ); readingsEndUpdate( $chash, 1 );
} else {
$data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]};
while( ( $t, $v ) = each %buffer ) {
$v =~ s/null//g;
readingsBeginUpdate( $chash );
readingsBulkUpdate( $chash, $t, $v ) if( defined( $v ) );
}
readingsBulkUpdate( $chash, "lastStatusRequestState", "statusRequest_done" );
readingsEndUpdate( $chash, 1 );
}
### End Response Processing ### End Response Processing
return; return;
@@ -961,14 +974,16 @@ sub AMAD_CommBridge_Read($) {
$data[2] =~ s/FHEMDEVICE: //; $data[2] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[2]}; my $chash = $defs{$data[2]};
return AMAD_GetUpdateLocal( $chash );
} else { } else {
$data[3] =~ s/FHEMDEVICE: //; $data[3] =~ s/FHEMDEVICE: //;
my $chash = $defs{$data[3]}; my $chash = $defs{$data[3]};
return AMAD_GetUpdateLocal( $chash );
} }
return AMAD_GetUpdateLocal( $chash );
} }
} }