Skip to content

Commit bfbabdc

Browse files
committed
Update laser mapping topics
1 parent 26fffd1 commit bfbabdc

9 files changed

Lines changed: 24 additions & 348 deletions

File tree

exercises/laser_mapping/cpp_lib/src/HAL.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ std::thread HAL::spin_thread_;
1717
void HAL::init()
1818
{
1919
if (!motors_node_) {
20-
odometry_node_ = std::make_shared<OdometryNode>("/turtlebot3/odom", "hal_odometry");
21-
noisy_odometry_node_ = std::make_shared<OdometryNode>("/turtlebot3/odom_noisy", "hal_noisy_odometry_node");
22-
motors_node_ = std::make_shared<MotorsNode>("/turtlebot3/cmd_vel", 4.0, 0.3, "hal_motors");
23-
laser_node_ = std::make_shared<LaserNode>("/turtlebot3/laser/scan", "hal_laser");
20+
odometry_node_ = std::make_shared<OdometryNode>("/odom", "hal_odometry");
21+
noisy_odometry_node_ = std::make_shared<OdometryNode>("/odom_noisy", "hal_noisy_odometry_node");
22+
motors_node_ = std::make_shared<MotorsNode>("/cmd_vel", 4.0, 0.3, "hal_motors");
23+
laser_node_ = std::make_shared<LaserNode>("/laser/scan", "hal_laser");
2424

2525
executor_ = std::make_shared<rclcpp::executors::MultiThreadedExecutor>();
2626
executor_->add_node(odometry_node_);

exercises/laser_mapping/cpp_lib/src/WebGUI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ class WebGUINode : public BaseWebGUI
2222
, map_util_([this](){ return odom_node_->getPose3d(); },
2323
[this](){ return noisy_odom_node_->getPose3d(); })
2424
{
25-
odom_node_ = std::make_shared<OdometryNode>("/turtlebot3/odom", "webgui_odom");
26-
noisy_odom_node_ = std::make_shared<OdometryNode>("/turtlebot3/odom_noisy", "webgui_noisy_odom");
25+
odom_node_ = std::make_shared<OdometryNode>("/odom", "webgui_odom");
26+
noisy_odom_node_ = std::make_shared<OdometryNode>("/odom_noisy", "webgui_noisy_odom");
2727
aux_node_ = std::make_shared<rclcpp::Node>("webgui_aux");
2828

2929
auto qos_transient = rclcpp::QoS(rclcpp::KeepLast(1)).transient_local().reliable();
-24 Bytes
Binary file not shown.
-96 Bytes
Binary file not shown.
Lines changed: 12 additions & 44 deletions
Loading

exercises/laser_mapping/frontend/resources/vacuum.svg

Lines changed: 0 additions & 136 deletions
This file was deleted.

exercises/laser_mapping/python_template/HAL.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,10 @@ def __auto_spin() -> None:
3131
if not rclpy.ok():
3232
rclpy.init(args=sys.argv)
3333

34-
motor_node = MotorsNode("/turtlebot3/cmd_vel", 4, 0.3)
35-
odometry_node = OdometryNode("/turtlebot3/odom")
36-
noisy_odometry_node = OdometryNode(
37-
"/turtlebot3/odom_noisy", node_name="noisy_odometry_node"
38-
)
39-
laser_node = LaserNode("/turtlebot3/laser/scan")
34+
motor_node = MotorsNode("/cmd_vel", 4, 0.3)
35+
odometry_node = OdometryNode("/odom")
36+
noisy_odometry_node = OdometryNode("/odom_noisy", node_name="noisy_odometry_node")
37+
laser_node = LaserNode("/laser/scan")
4038

4139
executor = rclpy.executors.MultiThreadedExecutor()
4240
executor.add_node(odometry_node)

0 commit comments

Comments
 (0)