Merge branch 'feat/use_takeData_in_abc' of github.com:N-Eiki/autoware…

….universe into feat/use_takeData_in_abc
N-Eiki · Jun 11, 2024 · bb98c73 · bb98c73
2 parents d04bda2 + 22f41b4
commit bb98c73
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...alibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp b/...alibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp
@@ -17,14 +17,13 @@
 #ifndef AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_
 #define AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_
 
-#include "tier4_autoware_utils/ros/polling_subscriber.hpp"
-
 #include "autoware_raw_vehicle_cmd_converter/accel_map.hpp"
 #include "autoware_raw_vehicle_cmd_converter/brake_map.hpp"
 #include "diagnostic_updater/diagnostic_updater.hpp"
 #include "rclcpp/rclcpp.hpp"
 #include "tf2/utils.h"
 #include "tier4_autoware_utils/ros/logger_level_configure.hpp"
+#include "tier4_autoware_utils/ros/polling_subscriber.hpp"
 #include "tier4_autoware_utils/ros/transform_listener.hpp"
 
 #include <Eigen/Dense>
@@ -383,4 +382,4 @@ class AccelBrakeMapCalibrator : public rclcpp::Node
 
 }  // namespace autoware::accel_brake_map_calibrator
 
-#endif  // AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_
+#endif  // AUTOWARE_ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_
diff --git a/vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp b/vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp
@@ -1707,4 +1707,4 @@ void AccelBrakeMapCalibrator::add_log_to_csv(
             << ", " << new_accel_mse << "," << rmse_rate << std::endl;
 }
 
-}  // autoware::namespace accel_brake_map_calibrator
+}  // namespace autoware::accel_brake_map_calibrator