Commit 9ebb71a5 authored by Projekt Robbie's avatar Projekt Robbie
Browse files

Imported upstream version '0.1.18' of 'upstream'

parent e8fa9978
## homer_mapping (kinetic) - 0.1.17-1
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 `Sun, 26 Feb 2017 23:11:15 -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: https://gitlab.uni-koblenz.de/robbie/homer_mapping.git
- rosdistro version: `0.1.16-0`
- old version: `0.1.17-0`
- new version: `0.1.17-1`
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.17-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 `Sun, 26 Feb 2017 22:59:16 -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.15-1`
- old version: `0.1.16-0`
- new version: `0.1.17-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.16-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, 23 Feb 2017 14:45:46 -0000`
......
......@@ -2,6 +2,9 @@
Changelog for package homer_map_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.1.18 (2017-02-28)
-------------------
0.1.17 (2017-02-26)
-------------------
* Eigen3 INCLUDE_DIR fix
......
<package>
<name>homer_map_manager</name>
<version>0.1.17</version>
<version>0.1.18</version>
<description>
map_manager
</description>
......
......@@ -2,6 +2,11 @@
Changelog for package homer_mapnav_msgs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.1.18 (2017-02-28)
-------------------
* reworked ignore laser and obstacle position feedback
* Contributors: Lisa
0.1.17 (2017-02-26)
-------------------
......
......@@ -7,3 +7,5 @@ int8 LASER_TIMEOUT=35
int8 NO_PATH_FOUND=40
int8 reason
geometry_msgs/PointStamped point
<package>
<name>homer_mapnav_msgs</name>
<version>0.1.17</version>
<version>0.1.18</version>
<description> homer_mapnav_msgs contains the messages used for mapping and navigation
</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
......
......@@ -2,6 +2,9 @@
Changelog for package homer_mapping
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.1.18 (2017-02-28)
-------------------
0.1.17 (2017-02-26)
-------------------
* Eigen3 INCLUDE_DIR fix
......
<package>
<name>homer_mapping</name>
<version>0.1.17</version>
<version>0.1.18</version>
<description>
homer_mapping
......
......@@ -2,6 +2,9 @@
Changelog for package homer_nav_libs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.1.18 (2017-02-28)
-------------------
0.1.17 (2017-02-26)
-------------------
* Eigen3 INCLUDE_DIR fix
......
<?xml version="1.0"?>
<package>
<name>homer_nav_libs</name>
<version>0.1.17</version>
<version>0.1.18</version>
<description>The nav_libs package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
......
......@@ -2,6 +2,11 @@
Changelog for package homer_navigation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
0.1.18 (2017-02-28)
-------------------
* reworked ignore laser and obstacle position feedback
* Contributors: Lisa
0.1.17 (2017-02-26)
-------------------
* Eigen3 INCLUDE_DIR fix
......
......@@ -5,6 +5,7 @@
#include <sstream>
#include <string>
#include <vector>
#include <regex>
#include <ros/package.h>
#include <ros/ros.h>
......@@ -133,6 +134,8 @@ class HomerNavigationNode {
/** @brief stops the Robot */
void stopRobot();
bool isInIgnoreList(std::string frame_id);
/**
* @brief Sets each cell of the map to -1 outside the bounding box
* containing the robot pose and the current target
......
<?xml version="1.0"?>
<package>
<name>homer_navigation</name>
<version>0.1.17</version>
<version>0.1.18</version>
<description>The homer_navigation package</description>
<maintainer email="fpolster@uni-koblenz.de">Florian Polster</maintainer>
......
......@@ -209,11 +209,16 @@ void HomerNavigationNode::idleProcess() {
}
}
bool HomerNavigationNode::isInIgnoreList(std::string frame_id){
std::regex reg("(^|\\s)"+frame_id+"(\\s|$)");
return regex_match(m_ignore_scan, reg);
}
void HomerNavigationNode::setExplorerMap() {
// adding lasers to map
nav_msgs::OccupancyGrid temp_map = *m_map;
for (const auto& scan : m_scan_map) {
if(m_ignore_scan.find(scan.second->header.frame_id) == std::string::npos){
if(!isInIgnoreList(scan.second->header.frame_id)){
std::vector<geometry_msgs::Point> scan_points;
scan_points = map_tools::laser_msg_to_points(
scan.second, m_transform_listener, "/map");
......@@ -392,6 +397,9 @@ void HomerNavigationNode::sendTargetUnreachableMsg(int8_t reason) {
m_MainMachine.setState(IDLE);
homer_mapnav_msgs::TargetUnreachable unreachable_msg;
unreachable_msg.reason = reason;
unreachable_msg.point = geometry_msgs::PointStamped();
unreachable_msg.point.header.frame_id = "/map";
unreachable_msg.point.point = m_obstacle_position;
m_target_unreachable_pub.publish(unreachable_msg);
m_waypoints.clear();
ROS_INFO_STREAM("=== TargetUnreachableMsg ===");
......@@ -416,7 +424,7 @@ bool HomerNavigationNode::obstacleOnPath() {
m_last_check_path_time = ros::Time::now();
if (m_pixel_path.size() != 0) {
for (auto const& scan : m_scan_map) {
if(m_ignore_scan.find(scan.second->header.frame_id) == std::string::npos){
if(!isInIgnoreList(scan.second->header.frame_id)){
std::vector<geometry_msgs::Point> scan_points;
scan_points = map_tools::laser_msg_to_points(
scan.second, m_transform_listener, "/map");
......@@ -1056,7 +1064,7 @@ void HomerNavigationNode::processLaserScan(const sensor_msgs::LaserScan::ConstPt
m_last_laser_time = ros::Time::now();
if(m_MainMachine.state() != IDLE)
{
if(m_ignore_scan.find(msg->header.frame_id)== std::string::npos)
if(!isInIgnoreList(msg->header.frame_id))
{
m_max_move_distances[msg->header.frame_id] = map_tools::get_max_move_distance(
map_tools::laser_msg_to_points(msg, m_transform_listener, "/base_link"),
......
......@@ -13,10 +13,10 @@ tracks:
- git-bloom-generate -y rosrpm --prefix release/:{ros_distro} :{ros_distro} -i
:{release_inc}
devel_branch: master
last_version: 0.1.16
last_version: 0.1.17
name: upstream
patches: null
release_inc: '0'
release_inc: '1'
release_repo_url: git@gitlab.uni-koblenz.de:robbie/homer_mapping.git
release_tag: :{version}
ros_distro: kinetic
......
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