From 5f87acfa38303089567e2c4222d15c5e65601ff8 Mon Sep 17 00:00:00 2001 From: Henrique Scharlau Coelho Date: Fri, 29 Dec 2023 13:50:29 -0300 Subject: [PATCH] added rtabmap slam(uncalibrated) --- twil_2dnav/launch/gazebo.launch.xml | 2 +- twil_2dnav/launch/localization_amcl.launch.xml | 12 ------ twil_2dnav/launch/localization_rtabmap.launch.xml | 32 ++++++++++++++ .../launch/localization_slam_toolbox.launch.xml | 11 ----- twil_2dnav/launch/localization_static.launch.xml | 11 ----- twil_2dnav/launch/nav2_navigator.launch.xml | 49 +++++++++++++++------- twil_2dnav/launch/odom_controller.launch.xml | 2 + .../launch/odom_noisy_ground_truth.launch.xml | 3 ++ twil_2dnav/launch/odom_rtabmap_viodom.launch.xml | 5 +++ 9 files changed, 77 insertions(+), 50 deletions(-) create mode 100644 twil_2dnav/launch/localization_rtabmap.launch.xml diff --git a/twil_2dnav/launch/gazebo.launch.xml b/twil_2dnav/launch/gazebo.launch.xml index 88299ce..280cb91 100644 --- a/twil_2dnav/launch/gazebo.launch.xml +++ b/twil_2dnav/launch/gazebo.launch.xml @@ -27,7 +27,7 @@ - + diff --git a/twil_2dnav/launch/localization_amcl.launch.xml b/twil_2dnav/launch/localization_amcl.launch.xml index d695f0c..c54b914 100644 --- a/twil_2dnav/launch/localization_amcl.launch.xml +++ b/twil_2dnav/launch/localization_amcl.launch.xml @@ -5,17 +5,5 @@ - - - - - - diff --git a/twil_2dnav/launch/localization_rtabmap.launch.xml b/twil_2dnav/launch/localization_rtabmap.launch.xml new file mode 100644 index 0000000..36e556a --- /dev/null +++ b/twil_2dnav/launch/localization_rtabmap.launch.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/twil_2dnav/launch/localization_slam_toolbox.launch.xml b/twil_2dnav/launch/localization_slam_toolbox.launch.xml index b2dae96..6619894 100644 --- a/twil_2dnav/launch/localization_slam_toolbox.launch.xml +++ b/twil_2dnav/launch/localization_slam_toolbox.launch.xml @@ -6,15 +6,4 @@ - - - - - - diff --git a/twil_2dnav/launch/localization_static.launch.xml b/twil_2dnav/launch/localization_static.launch.xml index edbfed2..73cafac 100644 --- a/twil_2dnav/launch/localization_static.launch.xml +++ b/twil_2dnav/launch/localization_static.launch.xml @@ -3,16 +3,5 @@ - - - - - - diff --git a/twil_2dnav/launch/nav2_navigator.launch.xml b/twil_2dnav/launch/nav2_navigator.launch.xml index c541cc4..f86e877 100644 --- a/twil_2dnav/launch/nav2_navigator.launch.xml +++ b/twil_2dnav/launch/nav2_navigator.launch.xml @@ -24,8 +24,24 @@ - + + + + + + + + + + + + + + + + + @@ -45,7 +61,6 @@ - @@ -56,19 +71,23 @@ - - - - - + + + + + + - - - - - - - - diff --git a/twil_2dnav/launch/odom_controller.launch.xml b/twil_2dnav/launch/odom_controller.launch.xml index bd5ec33..316e635 100644 --- a/twil_2dnav/launch/odom_controller.launch.xml +++ b/twil_2dnav/launch/odom_controller.launch.xml @@ -1,7 +1,9 @@  + + diff --git a/twil_2dnav/launch/odom_noisy_ground_truth.launch.xml b/twil_2dnav/launch/odom_noisy_ground_truth.launch.xml index 7fe12c3..95d5fc3 100644 --- a/twil_2dnav/launch/odom_noisy_ground_truth.launch.xml +++ b/twil_2dnav/launch/odom_noisy_ground_truth.launch.xml @@ -1,5 +1,8 @@  + + + diff --git a/twil_2dnav/launch/odom_rtabmap_viodom.launch.xml b/twil_2dnav/launch/odom_rtabmap_viodom.launch.xml index 1ad0717..8bceecb 100644 --- a/twil_2dnav/launch/odom_rtabmap_viodom.launch.xml +++ b/twil_2dnav/launch/odom_rtabmap_viodom.launch.xml @@ -1,6 +1,11 @@  + + + + + -- 2.12.0