From 40321b0dfba73917995b21a3a30e089ca3be2c0a Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Mon, 28 Dec 2020 18:34:09 -0500 Subject: [PATCH 01/10] Slight formatting changes in kart_rosbag.launch. --- src/kart_2dnav/launch/kart_rosbag.launch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/kart_2dnav/launch/kart_rosbag.launch b/src/kart_2dnav/launch/kart_rosbag.launch index 2d9dd90..fe3e51f 100644 --- a/src/kart_2dnav/launch/kart_rosbag.launch +++ b/src/kart_2dnav/launch/kart_rosbag.launch @@ -2,6 +2,7 @@ - + From 4e24aed081acd061a2af50927f2ccb70510669b5 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Wed, 30 Dec 2020 11:04:33 -0500 Subject: [PATCH 02/10] Move previous sim launch files to archive. --- ...m_autocross_track_only_goal_setting.launch | 69 +++++++++++++++++++ .../sim_square_track_only_goal_setting.launch | 68 ++++++++++++++++++ 2 files changed, 137 insertions(+) create mode 100644 src/kart_2dnav/launch/archived/sim_autocross_track_only_goal_setting.launch create mode 100644 src/kart_2dnav/launch/archived/sim_square_track_only_goal_setting.launch diff --git a/src/kart_2dnav/launch/archived/sim_autocross_track_only_goal_setting.launch b/src/kart_2dnav/launch/archived/sim_autocross_track_only_goal_setting.launch new file mode 100644 index 0000000..ac04c29 --- /dev/null +++ b/src/kart_2dnav/launch/archived/sim_autocross_track_only_goal_setting.launch @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/kart_2dnav/launch/archived/sim_square_track_only_goal_setting.launch b/src/kart_2dnav/launch/archived/sim_square_track_only_goal_setting.launch new file mode 100644 index 0000000..b7e7f54 --- /dev/null +++ b/src/kart_2dnav/launch/archived/sim_square_track_only_goal_setting.launch @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From f21e092d40d8eb5810095d409bcc14808dbd6e63 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Wed, 30 Dec 2020 19:14:01 -0500 Subject: [PATCH 03/10] Failed attempt to try to remove/ignore stageros' frames. I tried to use tf_remap to change the names of the tf frames so that our nodes can publish the tfs we have like in the kart launch files. But this does not work because there is no good way to remove tfs from stageros. See a pretty good explination here: https://answers.ros.org/question/175013/removingdeletingignoring-odom-tf-data/. Like option 1 in that post, I am also going to try to directly modify stageros to force it to not publish the base_footprint and odom frames. --- .../launch/sim_autocross_track.launch | 112 ++++++++++-------- 1 file changed, 63 insertions(+), 49 deletions(-) diff --git a/src/kart_2dnav/launch/sim_autocross_track.launch b/src/kart_2dnav/launch/sim_autocross_track.launch index ac04c29..c5fba1c 100644 --- a/src/kart_2dnav/launch/sim_autocross_track.launch +++ b/src/kart_2dnav/launch/sim_autocross_track.launch @@ -1,69 +1,83 @@ - - - + - - - + + + + + + + - - - - - - - - - - - - + - - - + + + + + + - - - + + + + + + - + + + + + + + + - + - - - - - - - - - - - - - + - + Note: This should only be set when running the system with simulated + sensor data (rosbags). + --> + From 79109aea21352076245676f0c68328021901b4b3 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Sat, 2 Jan 2021 19:38:30 -0500 Subject: [PATCH 04/10] Remove the duplicated (old) stage_ros node. --- src/kart_2dnav/launch/sim_autocross_track.launch | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/kart_2dnav/launch/sim_autocross_track.launch b/src/kart_2dnav/launch/sim_autocross_track.launch index efaa1f8..91e7ac0 100644 --- a/src/kart_2dnav/launch/sim_autocross_track.launch +++ b/src/kart_2dnav/launch/sim_autocross_track.launch @@ -5,8 +5,6 @@ - From 49761bf6a654b8829d792724407172df0b6513c5 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Sat, 2 Jan 2021 19:40:51 -0500 Subject: [PATCH 05/10] Get rid of duplicate sim launch for square track. --- src/kart_2dnav/launch/sim_square_track.launch | 68 ------------------- 1 file changed, 68 deletions(-) delete mode 100644 src/kart_2dnav/launch/sim_square_track.launch diff --git a/src/kart_2dnav/launch/sim_square_track.launch b/src/kart_2dnav/launch/sim_square_track.launch deleted file mode 100644 index b7e7f54..0000000 --- a/src/kart_2dnav/launch/sim_square_track.launch +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 235b75bdc1c7c64d334233ad15c068aef1ffda71 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Sat, 2 Jan 2021 20:32:45 -0500 Subject: [PATCH 06/10] Add new stage_ros modified package to top level files of kart_2dnav. --- src/kart_2dnav/CMakeLists.txt | 1 + src/kart_2dnav/package.xml | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/kart_2dnav/CMakeLists.txt b/src/kart_2dnav/CMakeLists.txt index b9eac04..aa025a6 100644 --- a/src/kart_2dnav/CMakeLists.txt +++ b/src/kart_2dnav/CMakeLists.txt @@ -15,6 +15,7 @@ find_package(catkin REQUIRED COMPONENTS velodyne_pointcloud pointcloud_to_laserscan laser_scan_matcher_odom + stage_ros_mod_tf hector_mapping base_local_planner global_planner diff --git a/src/kart_2dnav/package.xml b/src/kart_2dnav/package.xml index be1381f..a661c48 100644 --- a/src/kart_2dnav/package.xml +++ b/src/kart_2dnav/package.xml @@ -57,15 +57,13 @@ velodyne_pointcloud pointcloud_to_laserscan laser_scan_matcher_odom + stage_ros_mod_tf hector_mapping base_local_planner global_planner move_base teb_local_planner teb_local_planner_tutorials - From 0677821280a8c3f5269063932e63e63ec61b2528 Mon Sep 17 00:00:00 2001 From: Zach Ghera Date: Tue, 5 Jan 2021 18:43:27 -0500 Subject: [PATCH 07/10] No need for tf_remap node now due to work in #12 and #13. --- src/kart_2dnav/launch/sim_autocross_track.launch | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/kart_2dnav/launch/sim_autocross_track.launch b/src/kart_2dnav/launch/sim_autocross_track.launch index 91e7ac0..b4eb08e 100644 --- a/src/kart_2dnav/launch/sim_autocross_track.launch +++ b/src/kart_2dnav/launch/sim_autocross_track.launch @@ -13,17 +13,6 @@ - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + and outputting estimated odometry information as a tf (odom->base_link) + and by publishing nav_msgs/Odometry messages to the /odom topic. --> @@ -26,9 +26,9 @@ + (/top/scan) and publishes topics for the created map (/map) and + estimated pose (/slam_out_pose) of the kart relative to the map. + This node is also responsible for publishing the tf map->odom. --> @@ -36,9 +36,9 @@ + This node takes 2D laser scans (/top/scan) then constructs a goal message and + creates an ActionClient to sends the goal as ROS actions to SimpleActionServer + on move_base. --> @@ -50,9 +50,9 @@ + microcontroller. This node subscribed to the /cmd_vel topic published by + move_base and then then sends packets containing the velocity and steering + angle to the MCU over a serial connection. -->