diff --git a/README.md b/README.md
index 5b2d3f501eaba154d093bb3c3c141b7325a88962..7c54b8f27a0f23370b612340aa21d47ed3fc9ad8 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,59 @@
+## homer_mapping (kinetic) - 0.1.20-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 `Fri, 10 Mar 2017 16:53:47 -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.19-0`
+- old version: `0.1.19-0`
+- new version: `0.1.20-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.19-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, 02 Mar 2017 15:51:11 -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.18-0`
+- old version: `0.1.18-0`
+- new version: `0.1.19-0`
+
+Versions of tools used:
+
+- bloom version: `0.5.24`
+- catkin_pkg version: `0.3.1`
+- rosdep version: `0.11.5`
+- rosdistro version: `0.6.1`
+- vcstools version: `0.1.39`
+
+
## homer_mapping (kinetic) - 0.1.18-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 `Tue, 28 Feb 2017 15:53:51 -0000`
diff --git a/homer_map_manager/CHANGELOG.rst b/homer_map_manager/CHANGELOG.rst
index d88ba453f4af0465966e66fac49bb87fbde8365a..ffb57f59df932f31d646ee10c334e63a8c0c5407 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.19 (2017-03-02)
+-------------------
+
0.1.18 (2017-02-28)
-------------------
diff --git a/homer_map_manager/package.xml b/homer_map_manager/package.xml
index edb7963b97ba748ed597121f9f52c65644fb3972..e4ad289e4313f889a779000906c94dd439ac49a2 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.18</version>
+ <version>0.1.20</version>
<description>
map_manager
</description>
diff --git a/homer_mapnav_msgs/CHANGELOG.rst b/homer_mapnav_msgs/CHANGELOG.rst
index f02a1f15ec0a33193d7863e7d864527d6f0996ff..a83ba473fade21847966b7292df2b999e3642853 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.19 (2017-03-02)
+-------------------
+
0.1.18 (2017-02-28)
-------------------
* reworked ignore laser and obstacle position feedback
diff --git a/homer_mapnav_msgs/package.xml b/homer_mapnav_msgs/package.xml
index be7e458fef76ed25e5adeebd77eb559704c3e572..25ae48ca56addc3d304cfbfd69360a03ab770411 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.18</version>
+ <version>0.1.20</version>
<description> homer_mapnav_msgs contains the messages used for mapping and navigation
</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
diff --git a/homer_mapping/CHANGELOG.rst b/homer_mapping/CHANGELOG.rst
index 01b1f26f0a82ffe31f608ed2611530d2ba85d670..8672cd054c7fbf61b0f3bc8b2854ada5702fb7fb 100644
--- a/homer_mapping/CHANGELOG.rst
+++ b/homer_mapping/CHANGELOG.rst
@@ -2,6 +2,13 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.19 (2017-03-02)
+-------------------
+* enable smaller moves to be able to use higher odometry rates
+* no ros.spin spinOnce instead
+* use the loop_rate
+* Contributors: Florian Polster, Lisa
+
0.1.18 (2017-02-28)
-------------------
diff --git a/homer_mapping/package.xml b/homer_mapping/package.xml
index cefa4e44844d97247bd6e7a82d930eab62f993dc..a9ad8827ccaf3b759f6b77afed13f128755a4bd6 100644
--- a/homer_mapping/package.xml
+++ b/homer_mapping/package.xml
@@ -1,6 +1,6 @@
<package>
<name>homer_mapping</name>
- <version>0.1.18</version>
+ <version>0.1.20</version>
<description>
homer_mapping
diff --git a/homer_nav_libs/CHANGELOG.rst b/homer_nav_libs/CHANGELOG.rst
index 45167bdbc01db44e5f107f3314def18e4c3ca3b7..a3eb2741c724888005fa15a017007cc05d795cc3 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.19 (2017-03-02)
+-------------------
+
0.1.18 (2017-02-28)
-------------------
diff --git a/homer_nav_libs/package.xml b/homer_nav_libs/package.xml
index a94dfb8a6078cb53b8a3a42d88998631d609f8d8..96dc8dd2b438fdf12dc8b11539c1e4f31cfcfcd2 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.18</version>
+ <version>0.1.20</version>
<description>The nav_libs package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
diff --git a/homer_navigation/CHANGELOG.rst b/homer_navigation/CHANGELOG.rst
index 5b34e931dd8700091bac1475e7413b179dbe311f..f2c8c05c4887710fd81130f23d8a4a0fe212c914 100644
--- a/homer_navigation/CHANGELOG.rst
+++ b/homer_navigation/CHANGELOG.rst
@@ -2,6 +2,13 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+0.1.19 (2017-03-02)
+-------------------
+* maskMap disabled because not functional at the moment
+* no seperate laserCallback
+* give position information of obstacle in target unreachable message
+* Contributors: Florian Polster, Lisa
+
0.1.18 (2017-02-28)
-------------------
* reworked ignore laser and obstacle position feedback
diff --git a/homer_navigation/package.xml b/homer_navigation/package.xml
index acc14839c98b2578e71608f27b08b1b0c18eb9c6..3234b6a4635752e1d761581cbd08b946dae6f4e6 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.18</version>
+ <version>0.1.20</version>
<description>The homer_navigation package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
diff --git a/homer_navigation/src/homer_navigation_node.cpp b/homer_navigation/src/homer_navigation_node.cpp
index d7d0aeadbdd7b316fdbaa65d686a30793166a575..d355ef413ca784eb800a07ae9da2141a6621e9a6 100644
--- a/homer_navigation/src/homer_navigation_node.cpp
+++ b/homer_navigation/src/homer_navigation_node.cpp
@@ -84,10 +84,6 @@ void HomerNavigationNode::loadParameters() {
(double)1.2);
ros::param::param("/homer_navigation/waypoint_sampling_threshold",
m_waypoint_sampling_threshold, (float)1.5);
- m_AllowedObstacleDistance.first;
- m_AllowedObstacleDistance.second;
- m_SafeObstacleDistance.first;
- m_SafeObstacleDistance.second;
// check path
ros::param::param("/homer_navigation/check_path", m_check_path, (bool)true);
@@ -235,7 +231,8 @@ void HomerNavigationNode::setExplorerMap() {
}
}
if (m_fast_path_planning) {
- maskMap(temp_map);
+ //TODO check why not functional
+ //maskMap(temp_map);
}
m_explorer->setOccupancyMap(
boost::make_shared<nav_msgs::OccupancyGrid>(temp_map));
@@ -515,6 +512,7 @@ void HomerNavigationNode::performNextMove() {
m_seen_obstacle_before = true;
} else {
m_seen_obstacle_before = false;
+ m_obstacle_on_path = false;
}
}
@@ -721,8 +719,8 @@ void HomerNavigationNode::performNextMove() {
} else if (m_MainMachine.state() == AVOIDING_COLLISION) {
if (isTargetPositionReached()) {
return;
- } else if (m_max_move_distance <= m_collision_distance &&
- m_waypoints.size() > 1 ||
+ } else if ((m_max_move_distance <= m_collision_distance &&
+ m_waypoints.size() > 1) ||
m_max_move_distance <= m_collision_distance_near_target) {
ROS_WARN_STREAM("Maximum driving distance too short ("
<< m_max_move_distance << "m)! Moving back.");
@@ -1025,6 +1023,7 @@ float HomerNavigationNode::minTurnAngle(float angle1, float angle2) {
void HomerNavigationNode::refreshParamsCallback(
const std_msgs::Empty::ConstPtr& msg) {
+ (void) msg;
ROS_INFO_STREAM("Refreshing Parameters");
loadParameters();
}
@@ -1062,10 +1061,10 @@ void HomerNavigationNode::calcMaxMoveDist() {
for (auto d : m_max_move_distances) {
m_max_move_distance = std::min(m_max_move_distance, d.second);
}
- if (m_max_move_distance <= m_collision_distance &&
- std::fabs(m_act_speed) > 0.1 && m_waypoints.size() > 1 ||
- m_max_move_distance <= m_collision_distance_near_target &&
- std::fabs(m_act_speed) > 0.1 && m_waypoints.size() == 1 ||
+ if ((m_max_move_distance <= m_collision_distance &&
+ std::fabs(m_act_speed) > 0.1 && m_waypoints.size() > 1) ||
+ (m_max_move_distance <= m_collision_distance_near_target &&
+ std::fabs(m_act_speed) > 0.1 && m_waypoints.size() == 1) ||
m_max_move_distance <= 0.1) {
if (m_MainMachine.state() == FOLLOWING_PATH) {
stopRobot();
@@ -1225,6 +1224,7 @@ void HomerNavigationNode::navigateToPOICallback(
void HomerNavigationNode::stopNavigationCallback(
const std_msgs::Empty::ConstPtr& msg) {
+ (void) msg;
ROS_INFO_STREAM("Stopping navigation.");
m_MainMachine.setState(IDLE);
stopRobot();
diff --git a/tracks.yaml b/tracks.yaml
index 1c19a936274dcc50b27d3b5e863236b7a548f110..4a85e03f2257832f43d9667933fed7254d4fbc88 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.18
+ last_version: 0.1.20
name: upstream
patches: null
release_inc: '0'