From d5bfca7904f0eddcc762e51cdbac0533a3c85d8d Mon Sep 17 00:00:00 2001 From: Ellert <> Date: Fri, 14 Apr 2023 08:42:59 +0000 Subject: [PATCH] AutomowerConnectFamily: minor fixes, cref update git-svn-id: https://svn.fhem.de/fhem/trunk@27444 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/74_AutomowerConnect.pm | 35 ++++++-- fhem/FHEM/75_AutomowerConnectDevice.pm | 31 ++++++-- fhem/lib/FHEM/Devices/AMConnect/Common.pm | 97 +++++++++++++---------- fhem/www/pgm2/automowerconnect.js | 2 +- 5 files changed, 109 insertions(+), 57 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index e150df410..039316aee 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: AutomowerConnectFamily:minor fixes and changes in cref - bugfix: 72_FRITZBOX: kleinere Korrekturen - bugfix: 72_FRITZBOX: TR-064 Problem (topic=133142.0) - bugfix: 72_FRITZBOX: Fehler in Evaluierung RegEx diff --git a/fhem/FHEM/74_AutomowerConnect.pm b/fhem/FHEM/74_AutomowerConnect.pm index 251d3aef5..f3762222d 100644 --- a/fhem/FHEM/74_AutomowerConnect.pm +++ b/fhem/FHEM/74_AutomowerConnect.pm @@ -346,8 +346,6 @@ sub getMowerResponse { my $storediff = $hash->{helper}{mower}{attributes}{metadata}{statusTimestamp} - $hash->{helper}{mowerold}{attributes}{metadata}{statusTimestamp}; if ($storediff) { - # collect timestamps for analysis - unshift ( @{ $hash->{helper}{timestamps} }, $hash->{helper}{mower}{attributes}{metadata}{statusTimestamp} ); ::FHEM::Devices::AMConnect::Common::AlignArray( $hash ); ::FHEM::Devices::AMConnect::Common::FW_detailFn_Update ($hash) if (AttrVal($name,'showMap',1)); @@ -423,6 +421,10 @@ sub getMowerResponse { $hash->{helper}{statistics}{currentWeekTrack} = 0; $hash->{helper}{statistics}{currentWeekArea} = 0; + #clear position arrays + $hash->{helper}{areapos} = []; + $hash->{helper}{otherpos} = []; + } } readingsSingleUpdate($hash, 'state', 'connected', 1 ); @@ -736,7 +738,7 @@ __END__ =begin html - +
attr <name> interval <time in seconds>
attr <name> mapImagePath <path to image>
attr <name> mapDesignAttributes <complete list of design-attributes>
set <name> defaultDesignAttributesToAttribute
to change its valuesset <name> defaultDesignAttributesToAttribute
to change its values. Some default values are
+ attr <name> mapImageCoordinatesToRegister <upper left longitude><space><upper left latitude><line feed><lower right longitude><space><lower right latitude>
attr <name> numberOfWayPointsToDisplay <number of way points>
attr <name> scaleToMeterXY <scale factor longitude><seperator><scale factor latitude>
attr <name> mapDesignAttributes <complete list of design-attributes>
set <name> defaultDesignAttributesToAttribute
um die Werte zu ändern.set <name> defaultDesignAttributesToAttribute
um die Werte zu ändern. Einige Vorgabewerte:
+ attr <name> mapImageCoordinatesToRegister <upper left longitude><space><upper left latitude><line feed><lower right longitude><space><lower right latitude>
attr <name> numberOfWayPointsToDisplay <number of way points>
attr <name> scaleToMeterXY <scale factor longitude><seperator><scale factor latitude>
attr <name> mapDesignAttributes <complete list of design-attributes>
set <name> defaultDesignAttributesToAttribute
to change its valuesset <name> defaultDesignAttributesToAttribute
to change its values. Some default values are
+ attr <name> mapImageCoordinatesToRegister <upper left longitude><space><upper left latitude><line feed><lower right longitude><space><lower right latitude>
attr <name> numberOfWayPointsToDisplay <number of way points>
attr <name> scaleToMeterXY <scale factor longitude><seperator><scale factor latitude>
attr <name> mapDesignAttributes <complete list of design-attributes>
set <name> defaultDesignAttributesToAttribute
um die Werte zu ändern.set <name> defaultDesignAttributesToAttribute
um die Werte zu ändern. Einige Vorgabewerte:
+ attr <name> mapImageCoordinatesToRegister <upper left longitude><space><upper left latitude><line feed><lower right longitude><space><lower right latitude>
attr <name> numberOfWayPointsToDisplay <number of way points>
attr <name> scaleToMeterXY <scale factor longitude><seperator><scale factor latitude>
1 totalRunningTime = totalCuttingTime + totalSearchingTime'; diff --git a/fhem/www/pgm2/automowerconnect.js b/fhem/www/pgm2/automowerconnect.js index 06a95525c..c233f55d0 100644 --- a/fhem/www/pgm2/automowerconnect.js +++ b/fhem/www/pgm2/automowerconnect.js @@ -201,7 +201,7 @@ function AutomowerConnectUpdateDetail (dev, type, imgsrc, picx, picy, csx, csy, if ( pos.length > 4 ) { // draw mowing path - var mowpos = pos.slice(4); + var mowpos = pos.slice(2); AutomowerConnectDrawPath ( ctx, div, mowpos, 'mowingPath' ); // draw start