Skip to content

Commit e511d24

Browse files
jlblancocjlblancoc
committed
Merge branch 'develop'
2 parents fd5ba74 + 9f1bc2b commit e511d24

File tree

8 files changed

+19
-12
lines changed

8 files changed

+19
-12
lines changed

‎3rdparty/nanogui‎

‎README.md‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,14 @@ sudo apt install ros-$ROS_DISTRO-mrpt2
7373

7474
`mrpt2` status in ROS build farms:
7575

76-
| Distro | `develop` branch | Stable release | Next builds |
76+
77+
| Distro | `develop` branch | Next builds | Stable release |
7778
|---|---|---|---|
78-
| ROS1 Noetic @ u20.04 | [![Build Status](https://build.ros.org/job/Ndev__mrpt2__ubuntu_focal_amd64/badge/icon)](https://build.ros.org/job/Ndev__mrpt2__ubuntu_focal_amd64/) | [![Version](https://img.shields.io/ros/v/noetic/mrpt2)](https://index.ros.org/search/?term=mrpt2) | [![Build Status](https://build.ros.org/job/Nbin_uF64__mrpt2__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros.org/job/Nbin_uF64__mrpt2__ubuntu_focal_amd64__binary/) |
79-
| ROS2 Humble @ u22.04 | [![Build Status](https://build.ros2.org/job/Hdev__mrpt2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Hdev__mrpt2__ubuntu_jammy_amd64/) | [![Version](https://img.shields.io/ros/v/humble/mrpt2)](https://index.ros.org/search/?term=mrpt2) | [![Build Status](https://build.ros2.org/job/Hbin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Hbin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/) |
80-
| ROS2 Iron @ u22.04 | [![Build Status](https://build.ros2.org/job/Idev__mrpt2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Idev__mrpt2__ubuntu_jammy_amd64/) | [![Version](https://img.shields.io/ros/v/iron/mrpt2)](https://index.ros.org/search/?term=mrpt2) | [![Build Status](https://build.ros2.org/job/Ibin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Ibin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/) |
81-
| ROS2 Rolling @ u24.04 | [![Build Status](https://build.ros2.org/job/Rdev__mrpt2__ubuntu_noble_amd64/badge/icon)](https://build.ros2.org/job/Rdev__mrpt2__ubuntu_noble_amd64/) | [![Version](https://img.shields.io/ros/v/rolling/mrpt2)](https://index.ros.org/search/?term=mrpt2) | [![Build Status](https://build.ros2.org/job/Rbin_uN64__mrpt2__ubuntu_noble_amd64__binary/badge/icon)](https://build.ros2.org/job/Rbin_uN64__mrpt2__ubuntu_noble_amd64__binary/) |
79+
| ROS 1 Noetic @ u20.04 | [![Build Status](https://build.ros.org/job/Ndev__mrpt2__ubuntu_focal_amd64/badge/icon)](https://build.ros.org/job/Ndev__mrpt2__ubuntu_focal_amd64/) | [![Build Status](https://build.ros.org/job/Nbin_uF64__mrpt2__ubuntu_focal_amd64__binary/badge/icon)](https://build.ros.org/job/Nbin_uF64__mrpt2__ubuntu_focal_amd64__binary/) | [![Version](https://img.shields.io/ros/v/noetic/mrpt2)](https://index.ros.org/search/?term=mrpt2) |
80+
| ROS 2 Humble @ u22.04 | [![Build Status](https://build.ros2.org/job/Hdev__mrpt2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Hdev__mrpt2__ubuntu_jammy_amd64/) | [![Build Status](https://build.ros2.org/job/Hbin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Hbin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/) | [![Version](https://img.shields.io/ros/v/humble/mrpt2)](https://index.ros.org/search/?term=mrpt2) |
81+
| ROS 2 Iron @ u22.04 | [![Build Status](https://build.ros2.org/job/Idev__mrpt2__ubuntu_jammy_amd64/badge/icon)](https://build.ros2.org/job/Idev__mrpt2__ubuntu_jammy_amd64/) | [![Build Status](https://build.ros2.org/job/Ibin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/badge/icon)](https://build.ros2.org/job/Ibin_uJ64__mrpt2__ubuntu_jammy_amd64__binary/) | [![Version](https://img.shields.io/ros/v/iron/mrpt2)](https://index.ros.org/search/?term=mrpt2) |
82+
| ROS 2 Jazzy @ u24.04 | [![Build Status](https://build.ros2.org/job/Jdev__mrpt2__ubuntu_noble_amd64/badge/icon)](https://build.ros2.org/job/Jdev__mrpt2__ubuntu_noble_amd64/) | [![Build Status](https://build.ros2.org/job/Jbin_uN64__mrpt2__ubuntu_noble_amd64__binary/badge/icon)](https://build.ros2.org/job/Jbin_uN64__mrpt2__ubuntu_noble_amd64__binary/) | [![Version](https://img.shields.io/ros/v/jazzy/mrpt2)](https://index.ros.org/search/?term=mrpt2) |
83+
| ROS 2 Rolling @ u24.04 | [![Build Status](https://build.ros2.org/job/Rdev__mrpt2__ubuntu_noble_amd64/badge/icon)](https://build.ros2.org/job/Rdev__mrpt2__ubuntu_noble_amd64/) | [![Build Status](https://build.ros2.org/job/Rbin_uN64__mrpt2__ubuntu_noble_amd64__binary/badge/icon)](https://build.ros2.org/job/Rbin_uN64__mrpt2__ubuntu_noble_amd64__binary/) | [![Version](https://img.shields.io/ros/v/rolling/mrpt2)](https://index.ros.org/search/?term=mrpt2) |
8284

8385
| EOL Distro | Last release |
8486
|---|---|

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# version format
2-
version: 2.13.0-{branch}-build{build}
2+
version: 2.13.1-{branch}-build{build}
33

44
os: Visual Studio 2019
55

‎doc/requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pybtex==0.24.0
1515
pybtex-docutils==1.0.3
1616
Pygments==2.16.1
1717
PyYAML==6.0.1
18-
requests==2.31.0
18+
requests==2.32.0
1919
six==1.16.0
2020
snowballstemmer==2.2.0
2121
Sphinx==5.3.0

‎doc/source/doxygen-docs/changelog.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
\page changelog Change Log
22

3+
# Version 2.13.1: Released June 5th, 2024
4+
- BUG FIXES:
5+
- nanogui: Fix invalidation of iterators/references in widget lists.
6+
- rnav: fix exception thrown when target is out of the domain of one PTG.
7+
38
# Version 2.13.0: Released May 19th, 2024
49
- Changes in apps:
510
- SceneViewer3D: it now automatically guesses the min/max clip planes from the scene bounding box.

‎libs/nav/src/reactive/CMultiObjectiveMotionOptimizerBase.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ int CMultiObjectiveMotionOptimizerBase::decide(
6161
catch (std::exception&)
6262
{
6363
m_score_exprs.clear();
64-
throw; // rethrow
64+
return -1; // no good motion in this case
6565
}
6666

6767
// Register formulas also as variables, usable by the assert()
@@ -99,7 +99,7 @@ int CMultiObjectiveMotionOptimizerBase::decide(
9999
catch (std::exception&)
100100
{
101101
m_movement_assert_exprs.clear();
102-
throw; // rethrow
102+
return -1; // no good motion in this case
103103
}
104104
}
105105
}

‎package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package format="3">
88
<name>mrpt2</name>
99
<!-- Before updating version number, read [MRPT_ROOT]/version_prefix.txt first -->
10-
<version>2.13.0</version>
10+
<version>2.13.1</version>
1111
<description>Mobile Robot Programming Toolkit (MRPT) version 2.x</description>
1212

1313
<author email="[email protected]">Jose-Luis Blanco-Claraco</author>

‎version_prefix.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
2.13.0
1+
2.13.1
22
# IMPORTANT: This file is parsed by CMake, don't add any comment to
33
# the first line.
44
# This file is used in both Windows and Linux scripts to automatically

0 commit comments

Comments
 (0)