Commit a70d37b5 authored by Niklas Yann Wettengel's avatar Niklas Yann Wettengel
Browse files

Imported upstream version '0.1.20' of 'upstream'

parent 3a801d77
## 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`
......
<package>
<name>homer_map_manager</name>
<version>0.1.19</version>
<version>0.1.20</version>
<description>
map_manager
</description>
......
<package>
<name>homer_mapnav_msgs</name>
<version>0.1.19</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>
......
<package>
<name>homer_mapping</name>
<version>0.1.19</version>
<version>0.1.20</version>
<description>
homer_mapping
......
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
<version>0.1.19</version>
<version>0.1.20</version>
<description>The nav_libs package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
......
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
<version>0.1.19</version>
<version>0.1.20</version>
<description>The homer_navigation package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
......
......@@ -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);
......@@ -516,6 +512,7 @@ void HomerNavigationNode::performNextMove() {
m_seen_obstacle_before = true;
} else {
m_seen_obstacle_before = false;
m_obstacle_on_path = false;
}
}
......@@ -722,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.");
......@@ -1026,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();
}
......@@ -1063,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();
......@@ -1226,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();
......
......@@ -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.19
name: upstream
patches: null
release_inc: '0'
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment