From 3ae1fed04c52abec3e9d4a9eb8b71114d2068782 Mon Sep 17 00:00:00 2001 From: Ellert <> Date: Tue, 7 Feb 2023 12:30:20 +0000 Subject: [PATCH] Common.pm: test git-svn-id: https://svn.fhem.de/fhem/trunk@27189 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/74_AutomowerConnect.pm | 14 +++++++------- fhem/lib/FHEM/Devices/AMConnect/Common.pm | 1 + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/74_AutomowerConnect.pm b/fhem/FHEM/74_AutomowerConnect.pm index 651ee1e72..fe4f12a78 100644 --- a/fhem/FHEM/74_AutomowerConnect.pm +++ b/fhem/FHEM/74_AutomowerConnect.pm @@ -269,14 +269,14 @@ sub AlignArray { my @searchposlon = ($hash->{helper}{searchpos}[0]{longitude}, $hash->{helper}{searchpos}[1]{longitude}); my @searchposlat = ($hash->{helper}{searchpos}[0]{latitude}, $hash->{helper}{searchpos}[1]{latitude}); my $maxLength = $hash->{helper}{$activity}{maxLength}; - for ( $i = 0; $i < $poslen-2; $i++ ) { # 2 due to 2 alignment data sets at the end + for ( $i = 0; $i < $poslen-2; $i++ ) { # -2 due to 2 alignment data sets at the end if ( $searchposlon[ 0 ] == $hash->{helper}{mower}{attributes}{positions}[ $i ]{longitude} && $searchposlat[ 0 ] == $hash->{helper}{mower}{attributes}{positions}[ $i ]{latitude} && $searchposlon[ 1 ] == $hash->{helper}{mower}{attributes}{positions}[ $i+1 ]{longitude} && $searchposlat[ 1 ] == $hash->{helper}{mower}{attributes}{positions}[ $i+1 ]{latitude} ) { # timediff per step my $dt = 0; - $dt = int(($hash->{helper}{mower}{attributes}{metadata}{statusTimestamp} - $hash->{helper}{$arrayName}[0]{statusTimestamp})/$i) if ( $i && @{ $hash->{helper}{$arrayName} } ); + $dt = int( ( $hash->{helper}{mower}{attributes}{metadata}{statusTimestamp} - $hash->{helper}{$arrayName}[ 0 ]{statusTimestamp} ) / $i) if ( $i && @{ $hash->{helper}{$arrayName} } ); for ($k=$i-1;$k>-1;$k--) { } @@ -284,15 +284,15 @@ sub AlignArray { if ( @{ $hash->{helper}{$arrayName} } ) { - unshift (@{$hash->{helper}{$arrayName}}, dclone($hash->{helper}{mower}{attributes}{positions}[ $k ]) ); + unshift ( @{$hash->{helper}{$arrayName}}, dclone( $hash->{helper}{mower}{attributes}{positions}[ $k ] ) ); } else { - $hash->{helper}{$arrayName}[ 0 ] = dclone($hash->{helper}{mower}{attributes}{positions}[ $k ]); + $hash->{helper}{$arrayName}[ 0 ] = dclone( $hash->{helper}{mower}{attributes}{positions}[ $k ] ); } - pop (@{$hash->{helper}{$arrayName}}) if (@{$hash->{helper}{$arrayName}} > $maxLength); + pop ( @{ $hash->{helper}{$arrayName} } ) if ( @{ $hash->{helper}{$arrayName} } > $maxLength ); $hash->{helper}{$arrayName}[ 0 ]{statusTimestamp} = $hash->{helper}{mower}{attributes}{metadata}{statusTimestamp} - $dt * $k; push ( @temp, dclone( $hash->{helper}{mower}{attributes}{positions}[ $k ] ) ); @@ -301,7 +301,7 @@ sub AlignArray { ::FHEM::Devices::AMConnect::Common::posMinMax( $hash, \@temp ); #callFn if present - if ( $hash->{helper}{$activity}{callFn} && @{$hash->{helper}{$arrayName}} > 1) { + if ( $hash->{helper}{$activity}{callFn} && @{ $hash->{helper}{$arrayName} } > 1 ) { $hash->{helper}{$activity}{cnt} = $i; no strict "refs"; @@ -319,7 +319,7 @@ sub AlignArray { } $hash->{helper}{newdatasets} = $i; - $hash->{helper}{searchpos} = [ dclone( $hash->{helper}{mower}{attributes}{positions}[0] ), dclone( $hash->{helper}{mower}{attributes}{positions}[1] ) ]; + $hash->{helper}{searchpos} = [ dclone( $hash->{helper}{mower}{attributes}{positions}[ 0 ] ), dclone( $hash->{helper}{mower}{attributes}{positions}[ 1 ] ) ]; return undef; } diff --git a/fhem/lib/FHEM/Devices/AMConnect/Common.pm b/fhem/lib/FHEM/Devices/AMConnect/Common.pm index b592ae379..7448fc672 100644 --- a/fhem/lib/FHEM/Devices/AMConnect/Common.pm +++ b/fhem/lib/FHEM/Devices/AMConnect/Common.pm @@ -25,6 +25,7 @@ ################################################################################ package FHEM::Devices::AMConnect::Common; +my $cvsid = '$Id$'; use strict; use warnings; use POSIX;