From 7404e534c93118a431fcfbf723ef893388fa4298 Mon Sep 17 00:00:00 2001
From: Niklas Yann Wettengel <niyawe@uni-koblenz.de>
Date: Tue, 24 Nov 2015 14:25:22 +0100
Subject: [PATCH] Imported upstream version '1.0.5' of 'upstream'
---
README.md | 26 ++++++++++++++
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 | 5 +++
homer_nav_libs/package.xml | 2 +-
homer_nav_libs/src/tools/loadRosConfig.h | 46 ++++++++++++++++++++++++
homer_navigation/CHANGELOG.rst | 5 +++
homer_navigation/CMakeLists.txt | 2 +-
homer_navigation/package.xml | 3 +-
tracks.yaml | 2 +-
14 files changed, 99 insertions(+), 7 deletions(-)
create mode 100644 homer_nav_libs/src/tools/loadRosConfig.h
diff --git a/README.md b/README.md
index 450efc39..9d81d06f 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,29 @@
+## homer_mapnav (indigo) - 1.0.4-0
+
+The packages in the `homer_mapnav` repository were released into the `indigo` distro by running `/usr/bin/bloom-release --rosdistro indigo --track indigo homer_mapnav` on `Fri, 20 Nov 2015 02:07:32 -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_mapnav`:
+- upstream repository: https://gitlab.uni-koblenz.de/robbie/homer_mapnav.git
+- release repository: https://gitlab.uni-koblenz.de/robbie/homer_mapnav.git
+- rosdistro version: `1.0.2-0`
+- old version: `1.0.2-0`
+- new version: `1.0.4-0`
+
+Versions of tools used:
+- bloom version: `0.5.20`
+- catkin_pkg version: `0.2.10`
+- rosdep version: `0.11.4`
+- rosdistro version: `0.4.2`
+- vcstools version: `0.1.38`
+
+
## homer_mapnav (indigo) - 1.0.2-0
The packages in the `homer_mapnav` repository were released into the `indigo` distro by running `/usr/bin/bloom-release --rosdistro indigo --track indigo homer_mapnav` on `Fri, 20 Nov 2015 00:10:16 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index d27dc638..d093e858 100644
--- a/homer_map_manager/CHANGELOG.rst
+++ b/homer_map_manager/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.5 (2015-11-24)
+------------------
+
1.0.4 (2015-11-20)
------------------
* changed build dependency from libeigen3-dev to eigen
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index f83c9f93..90f19375 100644
--- a/homer_map_manager/package.xml
+++ b/homer_map_manager/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_map_manager</name>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index 92091e10..aa01d87c 100644
--- a/homer_mapnav_msgs/CHANGELOG.rst
+++ b/homer_mapnav_msgs/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.5 (2015-11-24)
+------------------
+
1.0.4 (2015-11-20)
------------------
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index aa87a74c..fd8e5f27 100644
--- a/homer_mapnav_msgs/package.xml
+++ b/homer_mapnav_msgs/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapnav_msgs</name>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<description>
mapnav_msgs
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index fd872924..d2f9d729 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.5 (2015-11-24)
+------------------
+
1.0.4 (2015-11-20)
------------------
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index 3e184132..20343828 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>1.0.4</version>
+ <version>1.0.5</version>
<description>
homer_mapping
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index 99683105..164f1681 100644
--- a/homer_nav_libs/CHANGELOG.rst
+++ b/homer_nav_libs/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.5 (2015-11-24)
+------------------
+* added missing files
+* Contributors: Niklas Yann Wettengel
+
1.0.4 (2015-11-20)
------------------
* changed build dependency from libeigen3-dev to eigen
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index 0826e0d3..4e4479ec 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>1.0.4</version>
+ <version>1.0.5</version>
<description>The nav_libs package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
diff --git a/homer_nav_libs/src/tools/loadRosConfig.h b/homer_nav_libs/src/tools/loadRosConfig.h
new file mode 100644
index 00000000..a51a99ed
--- /dev/null
+++ b/homer_nav_libs/src/tools/loadRosConfig.h
@@ -0,0 +1,46 @@
+
+#ifndef LOAD_ROS_CONFIG_H
+#define LOAD_ROS_CONFIG_H
+
+#include <ros/ros.h>
+#include <string>
+
+template <typename T>
+inline bool loadConfigValue(std::string valueName, T &variable, T default_variable = T() )
+{
+ if(ros::param::has(valueName))
+ {
+ ros::param::get(valueName, variable);
+ ROS_INFO_STREAM(valueName << ": " << variable);
+ return true;
+ }
+ else
+ {
+ ROS_WARN_STREAM("No Parameter: " << valueName << ". Defaulting to "<<default_variable<<".");
+ variable = default_variable;
+ return false;
+ }
+}
+
+template <typename T>
+inline bool loadConfigValue(std::string valueName, std::vector<T> &variable)
+{
+ if(ros::param::has(valueName))
+ {
+ ros::param::get(valueName, variable);
+ ROS_INFO_STREAM(valueName << ":");
+
+ for (int i = 0; i < variable.size(); ++i)
+ ROS_INFO_STREAM("Value "<< i << " :" << variable[i]);
+
+ return true;
+ }
+ else
+ {
+ ROS_WARN_STREAM("No Parameter: " << valueName << ". Defaulting to empty vector.");
+ variable.clear();
+ return false;
+ }
+}
+
+#endif
diff --git a/homer_navigation/CHANGELOG.rst b/homer_navigation/CHANGELOG.rst
index 2d3ff8f2..5f5aaabd 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.0.5 (2015-11-24)
+------------------
+* added missing files
+* Contributors: Niklas Yann Wettengel
+
1.0.4 (2015-11-20)
------------------
* changed build dependency from libeigen3-dev to eigen
diff --git a/homer_navigation/CMakeLists.txt b/homer_navigation/CMakeLists.txt
index 880cd8a3..a18e69a7 100644
--- a/homer_navigation/CMakeLists.txt
+++ b/homer_navigation/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
project(homer_navigation)
find_package(catkin REQUIRED COMPONENTS
- roscpp roslib nav_msgs sensor_msgs homer_mapnav_msgs homer_nav_libs tf cmake_modules
+ roscpp roslib nav_msgs sensor_msgs homer_mapnav_msgs homer_nav_libs tf cmake_modules robbie_architecture
)
find_package(Eigen REQUIRED)
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index c4cbd5a4..453dceab 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>1.0.4</version>
+ <version>1.0.5</version>
<description>The homer_navigation package</description>
<maintainer email="vseib@uni-koblenz.de">Viktor Seib</maintainer>
@@ -22,6 +22,7 @@
<build_depend>tf</build_depend>
<build_depend>cmake_modules</build_depend>
<build_depend>eigen</build_depend>
+ <build_depend>robbie_architecture</build_depend>
<run_depend>roscpp</run_depend>
<run_depend>roslib</run_depend>
diff --git a/tracks.yaml b/tracks.yaml
index 0b2b9cbf..35fc5c02 100644
--- a/tracks.yaml
+++ b/tracks.yaml
@@ -11,7 +11,7 @@ tracks:
- git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
:{release_inc}
devel_branch: null
- last_version: 1.0.2
+ last_version: 1.0.4
name: upstream
patches: null
release_inc: '0'
--
GitLab