Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Aug 14, 2024
2 parents 99561d2 + e63f15f commit 1450014
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 94 deletions.
Empty file added CATKIN_IGNORE
Empty file.
Empty file added COLCON_IGNORE
Empty file.
7 changes: 7 additions & 0 deletions COLCON_IGNORE.README
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Since 2024-Jul, MRPT is no longer built as a monolithic ROS package. Instead,
please, clone the new repository:

https://github.com/MRPT/mrpt-ros

which leads to generating finer-grained MRPT ROS packages.

2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# version format
version: 2.13.5-{branch}-build{build}
version: 2.13.6-{branch}-build{build}

os: Visual Studio 2019

Expand Down
9 changes: 9 additions & 0 deletions doc/source/doxygen-docs/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
\page changelog Change Log

# Version 2.13.6: Released Aug 14th, 2024
- Build system:
- This main MRPT repository is no longer directly built as a ROS package. Please, use the wrappers for better modularity:
- https://github.com/MRPT/mrpt_ros
- https://github.com/MRPT/python_mrpt_ros
- BUG FIXES:
- CWaypointsNavigator::waypoints_navigationStep() stops aligning with target after the waypoint is considered as reached.
- Fix FTBFS in Debian sid (g++-14) due to missing ``#include <iomanip>``.

# Version 2.13.5: Released Aug 5th, 2024
- Changes in libraries:
- \ref mrpt_ros2bridge_grp:
Expand Down
2 changes: 2 additions & 0 deletions libs/nav/src/reactive/CWaypointsNavigator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,8 @@ void CWaypointsNavigator::waypoints_navigationStep()
" segment-to-target dist: "
<< dist2target << ", allowed_dist: " << wp.allowed_distance);

m_is_aligning = false;

wp.reached = true;
wp.skipped = false;
wp.timestamp_reach = mrpt::Clock::now();
Expand Down
2 changes: 1 addition & 1 deletion libs/obs/src/CObservationGPS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <mrpt/serialization/CArchive.h>
#include <mrpt/serialization/optional_serialization.h>

#include <iomanip>
#include <iomanip> // for setprecision(), etc.

using namespace std;
using namespace mrpt;
Expand Down
2 changes: 1 addition & 1 deletion libs/poses/src/CPose3D.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#include <Eigen/Dense>
#include <algorithm> // for move
#include <cmath> // for fabs
#include <iomanip> // for operator<<
#include <iomanip> // for setprecision(), etc.
#include <limits> // for numeric_...
#include <ostream> // for operator<<
#include <string> // for allocator
Expand Down
2 changes: 1 addition & 1 deletion libs/poses/src/CPose3DQuat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <mrpt/serialization/CSerializable.h>

#include <Eigen/Dense>
#include <iomanip>
#include <iomanip> // for setprecision(), etc.
#include <limits>

using namespace std;
Expand Down
1 change: 1 addition & 0 deletions libs/poses/src/Lie/LieTraits_unittest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include <mrpt/poses/Lie/SE.h>

#include <Eigen/Dense>
#include <iomanip> // for setprecision(), etc.

using namespace mrpt;
using namespace mrpt::poses;
Expand Down
89 changes: 0 additions & 89 deletions package.xml

This file was deleted.

2 changes: 1 addition & 1 deletion version_prefix.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2.13.5
2.13.6
# IMPORTANT: This file is parsed by CMake, don't add any comment to
# the first line.
# This file is used in both Windows and Linux scripts to automatically
Expand Down

0 comments on commit 1450014

Please sign in to comment.