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

insert more error handling routines

Browse Source
This commit is contained in:
Marko Oldenburg 2019-09-27 14:00:38 +02:00
parent 57a51e8984
commit 581e49aba2
1 changed files with 105 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
46_TeslaPowerwall2AC.pm
View File

@ -480,16 +480,9 @@ sub ErrorHandling($$$) {
my ( $param, $err, $data ) = @_;
my $hash = $param->{hash};
my $name = $hash->{NAME};
# my $path = $param->{setCmd}; # temporär
print('TESLA DEBUG - ResponseString: ' . Dumper $data);
print('TESLA DEBUG - Error: ' . $err . "\n")
unless ($err);
# #### temporär
# if ( $path eq 'statussoe' ) {
# $data = '{"percentage":69.1675560298826}';
@ -719,9 +712,6 @@ sub ErrorHandling($$$) {
# $data = '{"site_name":"Home Energy Gateway","timezone":"America/Los_Angeles"}';
# }
### Begin Error Handling
if ( defined($err) ) {
@ -735,7 +725,7 @@ sub ErrorHandling($$$) {
Log3 $name, 3, "TeslaPowerwall2AC ($name) - RequestERROR: $err";
$hash->{actionQueue} = [];
# return;
return;
}
}
@ -757,7 +747,7 @@ sub ErrorHandling($$$) {
. " without any data after requesting";
$hash->{actionQueue} = [];
# return;
return;
}
if ( ( $data =~ /Error/i ) and exists( $param->{code} ) ) {
@ -774,7 +764,35 @@ sub ErrorHandling($$$) {
. $param->{code};
$hash->{actionQueue} = [];
# return;
return;
}
if ( $data =~ m#{"code":(\d+),"error":"(.+)","message":"(.+)"}$# ) {
readingsBeginUpdate($hash);
readingsBulkUpdate( $hash, 'state', $1, 1 );
readingsBulkUpdate(
$hash,
'lastRequestError',
'Path: '
. $param->{setCmd} . ' '
. $1
. ' - Error: '
. $2
. ' Messages: '
. $3,
1
);
readingsEndUpdate( $hash, 1 );
Log3 $name, 3,
"TeslaPowerwall2AC ($name) - statusRequestERROR: http error "
. $param->{code};
$hash->{actionQueue} = [];
return;
### End Error Handling
}
@ -784,6 +802,10 @@ sub ErrorHandling($$$) {
Log3 $name, 4, "TeslaPowerwall2AC ($name) - Recieve JSON data: $data";
print( 'TESLA DEBUG - ResponseString: ' . Dumper $data);
print( 'TESLA DEBUG - Error: ' . $err . "\n" )
unless ($err);
# ResponseProcessing( $hash, $param->{setCmd}, $data );
}
@ -950,22 +972,30 @@ sub ReadingsProcessing_Meters_Site($$) {
{
if ( ref( $decode_json->[0] ) eq 'HASH' ) {
while ( my $obj = each %{ $decode_json->[0] } ) {
# print('Ausgabe2: ' . Dumper $obj . "\n");
if ( ref( $decode_json->[0]->{$obj} ) eq 'ARRAY'
or ref( $decode_json->[0]->{$obj} ) eq 'HASH' )
{
if ( ref( $decode_json->[0]->{$obj} ) eq 'HASH' ) {
# print('Ausgabe3: ' . Dumper $obj . "\n");
while ( my ( $r, $v ) = each %{ $decode_json->[0]->{$obj} } ) {
while ( my ( $r, $v ) =
each %{ $decode_json->[0]->{$obj} } )
{
if ( ref($v) ne 'HASH' ) {
# print('Ausgabe4: ' . $obj . '-' . $r . ' = ' . $v . "\n");
$readings{ $obj . '-' . $r } = $v;
}
else {
# print('Ausgabe5: ' . Dumper $decode_json->[0]->{$obj}->{$r} . "\n");
while ( my ( $r2, $v2 ) = each %{ $decode_json->[0]->{$obj}->{$r} } ) {
while ( my ( $r2, $v2 ) =
each %{ $decode_json->[0]->{$obj}->{$r} } )
{
# print('Ausgabe6: ' . $obj . '-' . $r2 . ' = ' . $v2 . "\n");
$readings{ $obj . '-' . $r . '-' . $r2 } = $v2;
$readings{ $obj . '-' . $r . '-' . $r2 } =
$v2;
}
}
}
@ -999,22 +1029,30 @@ sub ReadingsProcessing_Meters_Solar($$) {
{
if ( ref( $decode_json->[0] ) eq 'HASH' ) {
while ( my $obj = each %{ $decode_json->[0] } ) {
# print('Ausgabe2: ' . Dumper $obj . "\n");
if ( ref( $decode_json->[0]->{$obj} ) eq 'ARRAY'
or ref( $decode_json->[0]->{$obj} ) eq 'HASH' )
{
if ( ref( $decode_json->[0]->{$obj} ) eq 'HASH' ) {
# print('Ausgabe3: ' . Dumper $obj . "\n");
while ( my ( $r, $v ) = each %{ $decode_json->[0]->{$obj} } ) {
while ( my ( $r, $v ) =
each %{ $decode_json->[0]->{$obj} } )
{
if ( ref($v) ne 'HASH' ) {
# print('Ausgabe4: ' . $obj . '-' . $r . ' = ' . $v . "\n");
$readings{ $obj . '-' . $r } = $v;
}
else {
# print('Ausgabe5: ' . Dumper $decode_json->[0]->{$obj}->{$r} . "\n");
while ( my ( $r2, $v2 ) = each %{ $decode_json->[0]->{$obj}->{$r} } ) {
while ( my ( $r2, $v2 ) =
each %{ $decode_json->[0]->{$obj}->{$r} } )
{
# print('Ausgabe6: ' . $obj . '-' . $r2 . ' = ' . $v2 . "\n");
$readings{ $obj . '-' . $r . '-' . $r2 } = $v2;
$readings{ $obj . '-' . $r . '-' . $r2 } =
$v2;
}
}
}
@ -1155,7 +1193,7 @@ sub CreateUri($$) {
],
"release_status": "under develop",
"license": "GPL_2",
"version": "v0.6.102",
"version": "v0.6.103",
"author": [
"Marko Oldenburg <leongaultier@gmail.com>"
],