Merge branch 'testing' into devel

This commit is contained in:
Marko Oldenburg 2021-03-05 10:54:26 +01:00
commit ccefae7ee6
2 changed files with 15 additions and 18 deletions

View File

@ -725,22 +725,19 @@ sub ReadingsProcessing_Powerwalls {
$readings{ 'wall_' . $i . '_' . $r } = $v $readings{ 'wall_' . $i . '_' . $r } = $v
if ( ref($v) ne 'HASH' ); if ( ref($v) ne 'HASH' );
if ( ref($v) eq 'HASH' ) { # if ( ref($v) eq 'HASH' ) {
while ( ($r,$v) = each %{$v} ) { # while ( my ( $s, $ts ) = each %{$v} ) {
if ( ref($v) eq 'ARRAY' # if ( ref( $ts ) eq 'ARRAY'
&& scalar( @{$v} ) > 0 ) # && scalar( @{ $ts } ) > 0 )
{ # {
my $j = 0; # my $j = 0;
for ( @{ $v } ) { # for my $t ( @{ $ts } ) {
my $text = $r; # $readings{ 'wall_' . $i . '_' . $r . '_' . $s . '_' . $j } = $t;
while ( ($r,$v) = each %{$_} ) { # $j++;
$readings{ 'wall_' . $i . '_' . $r . '_' . $text . '_' . $j . '_' . $r } = $v # }
} # }
$j++; # }
} # }
}
}
}
} }
$i++; $i++;
@ -1098,7 +1095,7 @@ sub Rename {
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v1.0.4", "version": "v1.0.5",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],

View File

@ -1 +1 @@
UPD 2021-03-02_18:53:51 31521 FHEM/46_TeslaPowerwall2AC.pm UPD 2021-03-05_10:54:12 31392 FHEM/46_TeslaPowerwall2AC.pm