From 9fe06f939c4762bc0497f0f7c15461b07c587669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Aguilera?= Date: Thu, 1 Aug 2024 10:13:10 +0200 Subject: [PATCH 1/6] CWaypointsNavigator: stop aligning after reached --- libs/nav/src/reactive/CWaypointsNavigator.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/nav/src/reactive/CWaypointsNavigator.cpp b/libs/nav/src/reactive/CWaypointsNavigator.cpp index 8361c0783f..49cbcfd399 100644 --- a/libs/nav/src/reactive/CWaypointsNavigator.cpp +++ b/libs/nav/src/reactive/CWaypointsNavigator.cpp @@ -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(); From 0233e657ee446262a58f0918e4d50fca9844e5ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Aguilera?= Date: Mon, 5 Aug 2024 13:10:08 +0200 Subject: [PATCH 2/6] update changelog --- doc/source/doxygen-docs/changelog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index f9e4caf509..a08ad1d243 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -10,6 +10,8 @@ - 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. # Version 2.13.4: Released July 24th, 2024 - Fix docs typos. From ef800e9ad99cd205dfaadecb9a0dea4b1e2d80b0 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 7 Aug 2024 22:59:50 +0200 Subject: [PATCH 3/6] patch version bump --- appveyor.yml | 2 +- doc/source/doxygen-docs/changelog.md | 5 ++++- package.xml | 2 +- version_prefix.txt | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 19fe3ea869..2c1f92dfd3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # version format -version: 2.13.5-{branch}-build{build} +version: 2.13.6-{branch}-build{build} os: Visual Studio 2019 diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 7efb8efc2e..305c0e7bca 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,5 +1,9 @@ \page changelog Change Log +# Version 2.13.6: UNRELEASED +- BUG FIXES: + - CWaypointsNavigator::waypoints_navigationStep() stops aligning with target after the waypoint is considered as reached. + # Version 2.13.5: Released Aug 5th, 2024 - Changes in libraries: - \ref mrpt_ros2bridge_grp: @@ -8,7 +12,6 @@ - Fixed detection of timestamp fields in `Float64` format, and convert them from absolute to relative timestamps. - BUG FIXES: - ros1bridge and ros2bridge: fix conversion to PointCloud XYZI. - - CWaypointsNavigator::waypoints_navigationStep() stops aligning with target after the waypoint is considered as reached. # Version 2.13.4: Released July 24th, 2024 - Fix docs typos. diff --git a/package.xml b/package.xml index 868d3f9523..d74d52d672 100644 --- a/package.xml +++ b/package.xml @@ -7,7 +7,7 @@ mrpt2 - 2.13.5 + 2.13.6 Mobile Robot Programming Toolkit (MRPT) version 2.x Jose-Luis Blanco-Claraco diff --git a/version_prefix.txt b/version_prefix.txt index 61a0865ae4..a011a46c6f 100644 --- a/version_prefix.txt +++ b/version_prefix.txt @@ -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 From 97b8737362979bd8c3718c7062e64bdaaea97ec4 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 7 Aug 2024 23:03:19 +0200 Subject: [PATCH 4/6] Revert "Temporarily undo remove ROS package mrpt2" This reverts commit a5559bac64798e74c4c4ee68dea3b6766ee314b9. --- CATKIN_IGNORE | 0 COLCON_IGNORE | 0 COLCON_IGNORE.README | 7 +++ doc/source/doxygen-docs/changelog.md | 4 ++ package.xml | 89 ---------------------------- 5 files changed, 11 insertions(+), 89 deletions(-) create mode 100644 CATKIN_IGNORE create mode 100644 COLCON_IGNORE create mode 100644 COLCON_IGNORE.README delete mode 100644 package.xml diff --git a/CATKIN_IGNORE b/CATKIN_IGNORE new file mode 100644 index 0000000000..e69de29bb2 diff --git a/COLCON_IGNORE b/COLCON_IGNORE new file mode 100644 index 0000000000..e69de29bb2 diff --git a/COLCON_IGNORE.README b/COLCON_IGNORE.README new file mode 100644 index 0000000000..859582b4ef --- /dev/null +++ b/COLCON_IGNORE.README @@ -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. + diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 305c0e7bca..98ce2f7a4c 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,6 +1,10 @@ \page changelog Change Log # Version 2.13.6: UNRELEASED +- 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. diff --git a/package.xml b/package.xml deleted file mode 100644 index d74d52d672..0000000000 --- a/package.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - mrpt2 - - 2.13.6 - Mobile Robot Programming Toolkit (MRPT) version 2.x - - Jose-Luis Blanco-Claraco - Jose-Luis Blanco-Claraco - - https://www.mrpt.org/ - https://github.com/MRPT/mrpt/issues - - BSD - - - eigen - geometry_msgs - glut - libglfw3-dev - libxrandr - libxxf86vm - nav_msgs - opengl - sensor_msgs - std_msgs - stereo_msgs - suitesparse - tf2_msgs - tf2 - - - ros_environment - - - assimp-dev - ffmpeg - libfreenect-dev - libfyaml-dev - libjpeg - libjsoncpp-dev - libopenni2-dev - libpcap - libudev-dev - libusb-1.0-dev - pkg-config - pybind11-dev - python3-pip - tinyxml2 - wx-common - wxwidgets - zlib - - - - - - ament_cmake - - - cv_bridge - libopencv-dev - liboctomap-dev - - - rosbag_storage - rosbag2_storage - roscpp - rclcpp - - - tf2_geometry_msgs - - doxygen - - - cmake - - cmake - - - - - From 2a731ce017084ee9923d8798273e7aa1ee7b09a3 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Sat, 10 Aug 2024 20:28:53 +0200 Subject: [PATCH 5/6] Fix FTBFS with gcc-14 (Bug in Debian sid) --- doc/source/doxygen-docs/changelog.md | 1 + libs/obs/src/CObservationGPS.cpp | 2 +- libs/poses/src/CPose3D.cpp | 2 +- libs/poses/src/CPose3DQuat.cpp | 2 +- libs/poses/src/Lie/LieTraits_unittest.cpp | 1 + 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 98ce2f7a4c..24d5697ec4 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -7,6 +7,7 @@ - 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 ``. # Version 2.13.5: Released Aug 5th, 2024 - Changes in libraries: diff --git a/libs/obs/src/CObservationGPS.cpp b/libs/obs/src/CObservationGPS.cpp index b46b4e5175..33cdd1a4ed 100644 --- a/libs/obs/src/CObservationGPS.cpp +++ b/libs/obs/src/CObservationGPS.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include // for setprecision(), etc. using namespace std; using namespace mrpt; diff --git a/libs/poses/src/CPose3D.cpp b/libs/poses/src/CPose3D.cpp index 6babb2c4db..fdfe26552c 100644 --- a/libs/poses/src/CPose3D.cpp +++ b/libs/poses/src/CPose3D.cpp @@ -36,7 +36,7 @@ #include #include // for move #include // for fabs -#include // for operator<< +#include // for setprecision(), etc. #include // for numeric_... #include // for operator<< #include // for allocator diff --git a/libs/poses/src/CPose3DQuat.cpp b/libs/poses/src/CPose3DQuat.cpp index ebb938d607..6fd1c70064 100644 --- a/libs/poses/src/CPose3DQuat.cpp +++ b/libs/poses/src/CPose3DQuat.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include // for setprecision(), etc. #include using namespace std; diff --git a/libs/poses/src/Lie/LieTraits_unittest.cpp b/libs/poses/src/Lie/LieTraits_unittest.cpp index b4f4cba593..6a7ff91b47 100644 --- a/libs/poses/src/Lie/LieTraits_unittest.cpp +++ b/libs/poses/src/Lie/LieTraits_unittest.cpp @@ -15,6 +15,7 @@ #include #include +#include // for setprecision(), etc. using namespace mrpt; using namespace mrpt::poses; From e63f15f4ec60e7c0e3cb32fc921204953ec2fd57 Mon Sep 17 00:00:00 2001 From: Jose Luis Blanco-Claraco Date: Wed, 14 Aug 2024 09:46:05 +0200 Subject: [PATCH 6/6] changelog --- doc/source/doxygen-docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/doxygen-docs/changelog.md b/doc/source/doxygen-docs/changelog.md index 24d5697ec4..403930c483 100644 --- a/doc/source/doxygen-docs/changelog.md +++ b/doc/source/doxygen-docs/changelog.md @@ -1,6 +1,6 @@ \page changelog Change Log -# Version 2.13.6: UNRELEASED +# 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