Skip to content

Commit

Permalink
base_link and laser_base are now synced with rtab pos est
Browse files Browse the repository at this point in the history
1. testing shows rtabmap pose est is decently accurate at low speeds.
2. the pose est publishes pos msg. created node that publishes base_link and laser_base based on the pos est.
3. other small changes.

Note:
be sure to test zed_odom path planning as well. need to conduct extensive tests. Close to ready for 0.8.0 release.
  • Loading branch information
NeilNie committed May 4, 2019
1 parent 1678f65 commit f23f0c0
Show file tree
Hide file tree
Showing 63 changed files with 471 additions and 951 deletions.
1 change: 1 addition & 0 deletions ros/src/cmake-build-debug/CMakeFiles/Makefile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ set(CMAKE_DEPEND_INFO_FILES
"navigation/mapping/CMakeFiles/nav_msgs_generate_messages_nodejs.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/bond_generate_messages_cpp.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/map_msgs_generate_messages_nodejs.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/robot_pose_publisher.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/nav_msgs_generate_messages_eus.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/nav_msgs_generate_messages_cpp.dir/DependInfo.cmake"
"navigation/mapping/CMakeFiles/visualization_msgs_generate_messages_eus.dir/DependInfo.cmake"
Expand Down
143 changes: 91 additions & 52 deletions ros/src/cmake-build-debug/CMakeFiles/Makefile2

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions ros/src/cmake-build-debug/CMakeFiles/TargetDirectories.txt
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/nav_msgs_generate_messages_nodejs.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/bond_generate_messages_cpp.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/map_msgs_generate_messages_nodejs.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/robot_pose_publisher.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/nav_msgs_generate_messages_eus.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/nav_msgs_generate_messages_cpp.dir
/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/navigation/mapping/CMakeFiles/visualization_msgs_generate_messages_eus.dir
Expand Down
4 changes: 2 additions & 2 deletions ros/src/cmake-build-debug/CMakeFiles/clion-log.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/home/neil/snap/clion-2019.1/bin/cmake/linux/bin/cmake -DCMAKE_BUILD_TYPE=Debug -G "CodeBlocks - Unix Makefiles" /home/neil/Workspace/self-driving-golf-cart/ros/src
-- Using CATKIN_DEVEL_PREFIX: /home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel
-- Using CMAKE_PREFIX_PATH: /home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic
-- This workspace overlays: /home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic
-- Using CMAKE_PREFIX_PATH: /opt/ros/melodic
-- This workspace overlays: /opt/ros/melodic
-- Found PythonInterp: /usr/bin/python2 (found suitable version "2.7.15", minimum required is "2")
-- Using PYTHON_EXECUTABLE: /usr/bin/python2
-- Using Debian Python package layout
Expand Down
2 changes: 1 addition & 1 deletion ros/src/cmake-build-debug/CMakeFiles/progress.marks
Original file line number Diff line number Diff line change
@@ -1 +1 @@
91
90
14 changes: 14 additions & 0 deletions ros/src/cmake-build-debug/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2273,6 +2273,19 @@ map_msgs_generate_messages_nodejs/fast:
$(MAKE) -f navigation/mapping/CMakeFiles/map_msgs_generate_messages_nodejs.dir/build.make navigation/mapping/CMakeFiles/map_msgs_generate_messages_nodejs.dir/build
.PHONY : map_msgs_generate_messages_nodejs/fast

#=============================================================================
# Target rules for targets named robot_pose_publisher

# Build rule for target.
robot_pose_publisher: cmake_check_build_system
$(MAKE) -f CMakeFiles/Makefile2 robot_pose_publisher
.PHONY : robot_pose_publisher

# fast build rule for target.
robot_pose_publisher/fast:
$(MAKE) -f navigation/mapping/CMakeFiles/robot_pose_publisher.dir/build.make navigation/mapping/CMakeFiles/robot_pose_publisher.dir/build
.PHONY : robot_pose_publisher/fast

#=============================================================================
# Target rules for targets named nav_msgs_generate_messages_eus

Expand Down Expand Up @@ -3644,6 +3657,7 @@ help:
@echo "... nav_msgs_generate_messages_nodejs"
@echo "... bond_generate_messages_cpp"
@echo "... map_msgs_generate_messages_nodejs"
@echo "... robot_pose_publisher"
@echo "... nav_msgs_generate_messages_eus"
@echo "... nav_msgs_generate_messages_cpp"
@echo "... visualization_msgs_generate_messages_eus"
Expand Down
437 changes: 121 additions & 316 deletions ros/src/cmake-build-debug/Project.cbp

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from catkin.environment_cache import generate_environment_script
except ImportError:
# search for catkin package in all workspaces and prepend to path
for workspace in "/home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic".split(';'):
for workspace in "/opt/ros/melodic".split(';'):
python_path = os.path.join(workspace, 'lib/python2.7/dist-packages')
if os.path.isdir(os.path.join(python_path, 'catkin')):
sys.path.insert(0, python_path)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def _parse_arguments(args=None):

if not args.local:
# environment at generation time
CMAKE_PREFIX_PATH = '/home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic'.split(';')
CMAKE_PREFIX_PATH = '/opt/ros/melodic'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
source_root_dir = "/home/neil/Workspace/self-driving-golf-cart/ros/src"
whitelisted_packages = "".split(';') if "" != "" else []
blacklisted_packages = "".split(';') if "" != "" else []
underlay_workspaces = "/home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic".split(';') if "/home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic" != "" else []
underlay_workspaces = "/opt/ros/melodic".split(';') if "/opt/ros/melodic" != "" else []
2 changes: 1 addition & 1 deletion ros/src/cmake-build-debug/catkin_generated/setup_cached.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ export CMAKE_PREFIX_PATH="/home/neil/Workspace/self-driving-golf-cart/ros/src/cm
export LD_LIBRARY_PATH="/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel/lib:$LD_LIBRARY_PATH"
export PKG_CONFIG_PATH="/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel/lib/pkgconfig:$PKG_CONFIG_PATH"
export PYTHONPATH="/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel/lib/python2.7/dist-packages:$PYTHONPATH"
export ROSLISP_PACKAGE_DIRECTORIES="/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel/share/common-lisp:$ROSLISP_PACKAGE_DIRECTORIES"
export ROSLISP_PACKAGE_DIRECTORIES="/home/neil/Workspace/self-driving-golf-cart/ros/src/cmake-build-debug/devel/share/common-lisp"
export ROS_PACKAGE_PATH="/home/neil/Workspace/self-driving-golf-cart/ros/src:$ROS_PACKAGE_PATH"
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ if __name__ == '__main__':

if not args.local:
# environment at generation time
CMAKE_PREFIX_PATH = '/home/neil/Workspace/self-driving-golf-cart/ros/devel;/opt/ros/melodic'.split(';')
CMAKE_PREFIX_PATH = '/opt/ros/melodic'.split(';')
else:
# don't consider any other prefix path than this one
CMAKE_PREFIX_PATH = []
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 22
CMAKE_PROGRESS_2 = 23
CMAKE_PROGRESS_1 = 21
CMAKE_PROGRESS_2 = 22

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_1 = 23
CMAKE_PROGRESS_2 = 24
CMAKE_PROGRESS_3 = 25

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 26
CMAKE_PROGRESS_2 = 27
CMAKE_PROGRESS_2 =

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 28
CMAKE_PROGRESS_2 = 29
CMAKE_PROGRESS_1 = 27
CMAKE_PROGRESS_2 = 28

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 = 30
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_1 = 29
CMAKE_PROGRESS_2 = 30
CMAKE_PROGRESS_3 = 31

Original file line number Diff line number Diff line change
@@ -1 +1 @@
10
11
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_PROGRESS_1 = 7
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 7
CMAKE_PROGRESS_3 = 8

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 15
CMAKE_PROGRESS_2 =
CMAKE_PROGRESS_1 = 14
CMAKE_PROGRESS_2 = 15

Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 33
CMAKE_PROGRESS_2 = 34
CMAKE_PROGRESS_2 =

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 35
CMAKE_PROGRESS_2 = 36
CMAKE_PROGRESS_1 = 34
CMAKE_PROGRESS_2 = 35

Original file line number Diff line number Diff line change
@@ -1 +1 @@
8
6
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_1 = 40

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 39
CMAKE_PROGRESS_2 = 40
CMAKE_PROGRESS_1 =
CMAKE_PROGRESS_2 = 41

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CMAKE_PROGRESS_1 = 41
CMAKE_PROGRESS_1 = 42

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
CMAKE_PROGRESS_1 = 42
CMAKE_PROGRESS_1 = 43

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
CMAKE_PROGRESS_1 = 43
CMAKE_PROGRESS_2 = 44
CMAKE_PROGRESS_1 = 44
CMAKE_PROGRESS_2 = 45

Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ foreach(library ${libraries})
set(lib_path "")
set(lib "${library}-NOTFOUND")
# since the path where the library is found is returned we have to iterate over the paths manually
foreach(path /usr/local/lib;/home/neil/Workspace/self-driving-golf-cart/ros/devel/lib;/opt/ros/melodic/lib)
foreach(path /usr/local/lib;/opt/ros/melodic/lib)
find_library(lib ${library}
PATHS ${path}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
Expand Down
Loading

0 comments on commit f23f0c0

Please sign in to comment.