From 147536e639cdca7b4c159eeaa6d6de37f376fc33 Mon Sep 17 00:00:00 2001
From: Malte Roosen <mroosen@uni-koblenz.de>
Date: Wed, 23 Nov 2016 18:50:12 +0000
Subject: [PATCH] Rebase from 'upstream'
---
README.md | 28 +++++++++++++++++++
homer_map_manager/CHANGELOG.rst | 3 ++
homer_map_manager/package.xml | 2 +-
homer_mapnav_msgs/CHANGELOG.rst | 3 ++
homer_mapnav_msgs/package.xml | 2 +-
homer_mapping/CHANGELOG.rst | 3 ++
homer_mapping/package.xml | 2 +-
homer_nav_libs/CHANGELOG.rst | 3 ++
homer_nav_libs/package.xml | 2 +-
homer_navigation/CHANGELOG.rst | 5 ++++
homer_navigation/package.xml | 2 +-
.../src/homer_navigation_node.cpp | 5 ++++
tracks.yaml | 2 +-
13 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index e7ecabdf..4d544690 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,31 @@
+## homer_mapping (kinetic) - 0.1.8-0
+
+The packages in the `homer_mapping` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_mapping` on `Mon, 21 Nov 2016 17:15:35 -0000`
+
+These packages were released:
+- `homer_map_manager`
+- `homer_mapnav_msgs`
+- `homer_mapping`
+- `homer_nav_libs`
+- `homer_navigation`
+
+Version of package(s) in repository `homer_mapping`:
+
+- upstream repository: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
+- release repository: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
+- rosdistro version: `0.1.7-0`
+- old version: `0.1.7-0`
+- new version: `0.1.8-0`
+
+Versions of tools used:
+
+- bloom version: `0.5.23`
+- catkin_pkg version: `0.2.10`
+- rosdep version: `0.11.5`
+- rosdistro version: `0.5.0`
+- vcstools version: `0.1.39`
+
+
## homer_mapping (kinetic) - 0.1.7-0
The packages in the `homer_mapping` repository were released into the `kinetic` distro by running `/usr/bin/bloom-release --rosdistro kinetic --track kinetic homer_mapping` on `Thu, 17 Nov 2016 20:35:23 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index c8b7c7f0..f2a5b2f2 100644
--- a/homer_map_manager/CHANGELOG.rst
+++ b/homer_map_manager/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.9 (2016-11-23)
+------------------
+
0.1.8 (2016-11-21)
------------------
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index 3985f7a3..3299ac0a 100644
--- a/homer_map_manager/package.xml
+++ b/homer_map_manager/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_map_manager</name>
- <version>0.1.8</version>
+ <version>0.1.9</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index da2d1401..b2227dcc 100644
--- a/homer_mapnav_msgs/CHANGELOG.rst
+++ b/homer_mapnav_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.9 (2016-11-23)
+------------------
+
0.1.8 (2016-11-21)
------------------
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index 9cb65a36..c4c1298b 100644
--- a/homer_mapnav_msgs/package.xml
+++ b/homer_mapnav_msgs/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapnav_msgs</name>
- <version>0.1.8</version>
+ <version>0.1.9</version>
<description> homer_mapnav_msgs contains the messages used for mapping and navigation
</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index 2301405c..430a98af 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.9 (2016-11-23)
+------------------
+
0.1.8 (2016-11-21)
------------------
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index 48e48ce8..b37ac926 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>0.1.8</version>
+ <version>0.1.9</version>
<description>
homer_mapping
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index 004b295f..58ad8d0c 100644
--- a/homer_nav_libs/CHANGELOG.rst
+++ b/homer_nav_libs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.9 (2016-11-23)
+------------------
+
0.1.8 (2016-11-21)
------------------
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 05e47b51..7896e7f7 100644
--- a/homer_nav_libs/package.xml
+++ b/homer_nav_libs/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
- <version>0.1.8</version>
+ <version>0.1.9</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_navigation/CHANGELOG.rst b/homer_navigation/CHANGELOG.rst
index ec1cf80f..496db8bd 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.9 (2016-11-23)
+------------------
+* fix bug when first target is unreachable
+* Contributors: Malte Roosen
+
0.1.8 (2016-11-21)
------------------
* Catch error case of obstacleMapDistance=0
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index 8ea3ce7b..8ed22a47 100644
--- a/homer_navigation/package.xml
+++ b/homer_navigation/package.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
- <version>0.1.8</version>
+ <version>0.1.9</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_navigation/src/homer_navigation_node.cpp b/homer_navigation/src/homer_navigation_node.cpp
index f63498e2..11c740c4 100644
--- a/homer_navigation/src/homer_navigation_node.cpp
+++ b/homer_navigation/src/homer_navigation_node.cpp
@@ -418,6 +418,11 @@ void HomerNavigationNode::performNextMove() {
targetPositionReached();
return;
}
+ if (m_waypoints.size() == 0) {
+ ROS_WARN_STREAM(
+ "No waypoints but trying to perform next move! Skipping.");
+ return;
+ }
// if we have accidentaly skipped waypoints, recalculate path
float minDistance = FLT_MAX;
float distance;
diff --git a/tracks.yaml b/tracks.yaml
index 3595e144..add4be12 100644
--- a/tracks.yaml
+++ b/tracks.yaml
@@ -13,7 +13,7 @@ tracks:
- git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
:{release_inc}
devel_branch: master
- last_version: 0.1.7
+ last_version: 0.1.8
name: upstream
patches: null
release_inc: '0'
--
GitLab