resovled conflicts

2026-01-13 19:40:03 +08:00 · 2020-08-21 16:50:53 +08:00
parent 9dfc9af81c 61824fb4c8
commit dc3654ed8e
82 changed files with 8838 additions and 130 deletions
--- a/scout_gazebo_sim/src/scout_skid_steer_controller.cpp
+++ b/scout_gazebo_sim/src/scout_skid_steer_controller.cpp
@@ -11,7 +11,7 @@ using namespace westonrobot;

 int main(int argc, char **argv) {
  // setup ROS node
-  ros::init(argc, argv, "scout_odom");
+  ros::init(argc, argv, "scout_skid_steer");
  ros::NodeHandle node(""), private_node("~");

  // fetch parameters