mavros: fix indentation

Author: vooon

mavros/include/mavros/mavros_uas.hpp

@@ -379,27 +379,33 @@ class UAS : public rclcpp::Node
     const std::string & frame_id, const std::string & child_id,
     const Eigen::Affine3d & tr);
 
-	inline void set_base_link_frame_id(const std::string frame_id) {
-		base_link_frame_id = frame_id;
-	}
-	inline void set_odom_frame_id(const std::string frame_id) {
-		odom_frame_id = frame_id;
-	}
-	inline void set_map_frame_id(const std::string frame_id) {
-		map_frame_id = frame_id;
-	}
-	inline std::string get_base_link_frame_id() {
-		return base_link_frame_id;
-	}
-	inline std::string get_odom_frame_id() {
-		return odom_frame_id;
-	}
-	inline std::string get_map_frame_id() {
-		return map_frame_id;
-	}
-
-    //! Publish helper TFs used for frame transformation in the odometry plugin
-	void setup_static_tf();
+  inline void set_base_link_frame_id(const std::string frame_id)
+  {
+    base_link_frame_id = frame_id;
+  }
+  inline void set_odom_frame_id(const std::string frame_id)
+  {
+    odom_frame_id = frame_id;
+  }
+  inline void set_map_frame_id(const std::string frame_id)
+  {
+    map_frame_id = frame_id;
+  }
+  inline std::string get_base_link_frame_id()
+  {
+    return base_link_frame_id;
+  }
+  inline std::string get_odom_frame_id()
+  {
+    return odom_frame_id;
+  }
+  inline std::string get_map_frame_id()
+  {
+    return map_frame_id;
+  }
+
+  //! Publish helper TFs used for frame transformation in the odometry plugin
+  void setup_static_tf();
 
   /* -*- time sync -*- */
 

mavros/src/lib/uas_data.cpp

@@ -20,7 +20,6 @@
 #include "mavros/utils.hpp"
 #include "mavros/px4_custom_mode.hpp"
 
-<<<<<<< HEAD
 using namespace mavros::uas;  // NOLINT
 
 std::once_flag Data::init_flag;

mavros/src/lib/uas_tf.cpp

@@ -50,15 +50,15 @@ void UAS::publish_static_transform(
 
 void UAS::setup_static_tf()
 {
-	std::vector<geometry_msgs::TransformStamped> transform_vector;
-	add_static_transform(map_frame_id, map_frame_id+"_ned",
+  std::vector<geometry_msgs::TransformStamped> transform_vector;
+  add_static_transform(map_frame_id, map_frame_id + "_ned",
             Eigen::Affine3d(ftf::quaternion_from_rpy(M_PI, 0, M_PI_2)),
             transform_vector);
-	add_static_transform(odom_frame_id, odom_frame_id+"_ned",
+  add_static_transform(odom_frame_id, odom_frame_id + "_ned",
             Eigen::Affine3d(ftf::quaternion_from_rpy(M_PI, 0, M_PI_2)),
             transform_vector);
-	add_static_transform(base_link_frame_id, base_link_frame_id+"_frd",
+  add_static_transform(base_link_frame_id, base_link_frame_id + "_frd",
             Eigen::Affine3d(ftf::quaternion_from_rpy(M_PI, 0, 0)),
             transform_vector);
-	tf2_static_broadcaster.sendTransform(transform_vector);
+  tf2_static_broadcaster.sendTransform(transform_vector);
 }

mavros_extras/src/plugins/odom.cpp

@@ -57,7 +57,7 @@ class OdometryPlugin : public plugin::Plugin
 
   explicit OdometryPlugin(plugin::UASPtr uas_)
   : Plugin(uas_, "odometry"),
-		fcu_map_id_des("map"),
+    fcu_map_id_des("map"),
     fcu_odom_parent_id_des("map"),
     fcu_odom_child_id_des("base_link")
   {
@@ -99,9 +99,9 @@ class OdometryPlugin : public plugin::Plugin
   rclcpp::Publisher<nav_msgs::msg::Odometry>::SharedPtr odom_pub;
   rclcpp::Subscription<nav_msgs::msg::Odometry>::SharedPtr odom_sub;
 
-	std::string fcu_odom_parent_id_des;			//!< desired orientation of the fcu odometry message's parent frame
-	std::string fcu_odom_child_id_des;			//!< desired orientation of the fcu odometry message's child frame
-	std::string fcu_map_id_des;					//!< desired orientation of the fcu map frame
+  std::string fcu_odom_parent_id_des;                           //!< desired orientation of the fcu odometry message's parent frame
+  std::string fcu_odom_child_id_des;                            //!< desired orientation of the fcu odometry message's child frame
+  std::string fcu_map_id_des;                                           //!< desired orientation of the fcu map frame
 
   /**
    * @brief Lookup static transform with error handling
@@ -149,11 +149,11 @@ class OdometryPlugin : public plugin::Plugin
     Eigen::Affine3d tf_parent2parent_des;
     Eigen::Affine3d tf_child2child_des;
 
-		lookup_static_transform(
-                fcu_map_id_des, fcu_map_id_des+"_ned",
+    lookup_static_transform(
+                fcu_map_id_des, fcu_map_id_des + "_ned",
                 tf_parent2parent_des);
-		lookup_static_transform(
-                fcu_odom_child_id_des, fcu_odom_child_id_des+"_frd",
+    lookup_static_transform(
+                fcu_odom_child_id_des, fcu_odom_child_id_des + "_frd",
                 tf_child2child_des);
 
     //! Build 6x6 pose covariance matrix to be transformed and sent