Updated to work with Ugv_sdk V0.10

westonrobot · Jan 9, 2025 · 408fc7f · 408fc7f
1 parent eea539d
commit 408fc7f
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/bunker_base/src/bunker_base_ros.cpp b/bunker_base/src/bunker_base_ros.cpp
@@ -18,7 +18,6 @@ namespace westonrobot {
 
 BunkerBaseRos::BunkerBaseRos(std::string node_name)
     : rclcpp::Node(node_name), keep_running_(false) {
-<<<<<<< HEAD
   this->declare_parameter("port_name", "can0");
 
   this->declare_parameter("odom_frame", "odom");
@@ -29,17 +28,6 @@ BunkerBaseRos::BunkerBaseRos(std::string node_name)
   this->declare_parameter("bunker_variant_",
                           static_cast<int>(BunkerRobot::Variant::kBunkerV1));
   this->declare_parameter("control_rate", 50);
-=======
-  this->declare_parameter("port_name");   
-
-  this->declare_parameter("odom_frame");
-  this->declare_parameter("base_frame");
-  this->declare_parameter("odom_topic_name");
-
-  this->declare_parameter("is_bunker_mini");
-  this->declare_parameter("simulated_robot");
-  this->declare_parameter("control_rate");
->>>>>>> parent of fee2a4c (Changed syntax to run in humble)
 
   LoadParameters();
 }