diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 54d605870018f..8732f11d14202 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -244,8 +244,8 @@ system/system_monitor/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp system/topic_state_monitor/** ryohsuke.mitsudome@tier4.jp system/velodyne_monitor/** fumihito.ito@tier4.jp tools/reaction_analyzer/** berkay@leodrive.ai -vehicle/accel_brake_map_calibrator/** taiki.tanaka@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp +vehicle/autoware_accel_brake_map_calibrator/** taiki.tanaka@tier4.jp takeshi.miura@tier4.jp tomoya.kimura@tier4.jp vehicle/external_cmd_converter/** takamasa.horibe@tier4.jp vehicle/autoware_raw_vehicle_cmd_converter/** makoto.kurihara@tier4.jp taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp vehicle/autoware_steer_offset_estimator/** taiki.tanaka@tier4.jp diff --git a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp b/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp index 2c4da0b95b161..611984a4612d9 100644 --- a/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp +++ b/perception/autoware_crosswalk_traffic_light_estimator/src/node.cpp @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "autoware_crosswalk_traffic_light_estimator/node.hpp" +#include "crosswalk_traffic_light_estimator/node.hpp" #include #include diff --git a/vehicle/accel_brake_map_calibrator/CMakeLists.txt b/vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt similarity index 94% rename from vehicle/accel_brake_map_calibrator/CMakeLists.txt rename to vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt index f8aed0abb9056..d7c6d3ab25748 100644 --- a/vehicle/accel_brake_map_calibrator/CMakeLists.txt +++ b/vehicle/autoware_accel_brake_map_calibrator/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(accel_brake_map_calibrator) +project(autoware_accel_brake_map_calibrator) find_package(autoware_cmake REQUIRED) autoware_package() diff --git a/vehicle/accel_brake_map_calibrator/README.md b/vehicle/autoware_accel_brake_map_calibrator/README.md similarity index 92% rename from vehicle/accel_brake_map_calibrator/README.md rename to vehicle/autoware_accel_brake_map_calibrator/README.md index c2516eed5de3d..024c8059a169e 100644 --- a/vehicle/accel_brake_map_calibrator/README.md +++ b/vehicle/autoware_accel_brake_map_calibrator/README.md @@ -8,20 +8,20 @@ The base map, which is lexus's one by default, is updated iteratively with the l ### Launch Calibrator -After launching Autoware, run the `accel_brake_map_calibrator` by the following command and then perform autonomous driving. Note: You can collect data with manual driving if it is possible to use the same vehicle interface as during autonomous driving (e.g. using a joystick). +After launching Autoware, run the `autoware_accel_brake_map_calibrator` by the following command and then perform autonomous driving. Note: You can collect data with manual driving if it is possible to use the same vehicle interface as during autonomous driving (e.g. using a joystick). ```sh -ros2 launch accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true +ros2 launch autoware_accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true ``` Or if you want to use rosbag files, run the following commands. ```sh -ros2 launch accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true use_sim_time:=true +ros2 launch autoware_accel_brake_map_calibrator accel_brake_map_calibrator.launch.xml rviz:=true use_sim_time:=true ros2 bag play --clock ``` -During the calibration with setting the parameter `progress_file_output` to true, the log file is output in [directory of *accel_brake_map_calibrator*]/config/ . You can also see accel and brake maps in [directory of *accel_brake_map_calibrator*]/config/accel_map.csv and [directory of *accel_brake_map_calibrator*]/config/brake_map.csv after calibration. +During the calibration with setting the parameter `progress_file_output` to true, the log file is output in [directory of *autoware_accel_brake_map_calibrator*]/config/ . You can also see accel and brake maps in [directory of *autoware_accel_brake_map_calibrator*]/config/accel_map.csv and [directory of *autoware_accel_brake_map_calibrator*]/config/brake_map.csv after calibration. ### Calibration plugin @@ -86,7 +86,7 @@ The process of calibration can be visualized as below. Since these scripts need The following command shows the plot of used data in the calibration. In each plot of velocity ranges, you can see the distribution of the relationship between pedal and acceleration, and raw data points with colors according to their pitch angles. ```sh -ros2 run accel_brake_map_calibrator view_plot.py +ros2 run autoware_accel_brake_map_calibrator view_plot.py ``` ![sample pic](media/log_sample.png) @@ -102,7 +102,7 @@ The following command shows the statistics of the calibration: of all data in each map cell. ```sh -ros2 run accel_brake_map_calibrator view_statistics.py +ros2 run autoware_accel_brake_map_calibrator view_statistics.py ``` ![sample pic2](media/statistics_sample.png) @@ -141,7 +141,7 @@ You can also save accel and brake map in the default directory where Autoware re | pedal_accel_graph_output | bool | if true, it will output a log of the pedal accel graph. | true | | progress_file_output | bool | if true, it will output a log and csv file of the update process. | false | | default_map_dir | str | directory of default map | [directory of *autoware_raw_vehicle_cmd_converter*]/data/default/ | -| calibrated_map_dir | str | directory of calibrated map | [directory of *accel_brake_map_calibrator*]/config/ | +| calibrated_map_dir | str | directory of calibrated map | [directory of *autoware_accel_brake_map_calibrator*]/config/ | | update_hz | double | hz for update | 10.0 | ## Algorithm Parameters @@ -176,9 +176,9 @@ These scripts are useful to test for accel brake map calibration. These generate The `accel/brake_tester.py` receives a target accel/brake command from CLI. It sends a target value to `actuation_cmd_publisher.py` which generates the `ActuationCmd`. You can run these scripts by the following commands in the different terminals, and it will be as in the screenshot below. ```bash -ros2 run accel_brake_map_calibrator accel_tester.py -ros2 run accel_brake_map_calibrator brake_tester.py -ros2 run accel_brake_map_calibrator actuation_cmd_publisher.py +ros2 run autoware_accel_brake_map_calibrator accel_tester.py +ros2 run autoware_accel_brake_map_calibrator brake_tester.py +ros2 run autoware_accel_brake_map_calibrator actuation_cmd_publisher.py ``` ![actuation_cmd_publisher_util](./media/actuation_cmd_publisher_util.png) diff --git a/vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml b/vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml similarity index 100% rename from vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml rename to vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.param.yaml diff --git a/vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml b/vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml similarity index 100% rename from vehicle/accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml rename to vehicle/autoware_accel_brake_map_calibrator/config/accel_brake_map_calibrator.xml diff --git a/vehicle/accel_brake_map_calibrator/data/accel_map.csv b/vehicle/autoware_accel_brake_map_calibrator/data/accel_map.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/accel_map.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/accel_map.csv diff --git a/vehicle/accel_brake_map_calibrator/data/accel_map_double_res.csv b/vehicle/autoware_accel_brake_map_calibrator/data/accel_map_double_res.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/accel_map_double_res.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/accel_map_double_res.csv diff --git a/vehicle/accel_brake_map_calibrator/data/brake_map.csv b/vehicle/autoware_accel_brake_map_calibrator/data/brake_map.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/brake_map.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/brake_map.csv diff --git a/vehicle/accel_brake_map_calibrator/data/brake_map_double_res.csv b/vehicle/autoware_accel_brake_map_calibrator/data/brake_map_double_res.csv similarity index 100% rename from vehicle/accel_brake_map_calibrator/data/brake_map_double_res.csv rename to vehicle/autoware_accel_brake_map_calibrator/data/brake_map_double_res.csv diff --git a/vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp b/vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp similarity index 97% rename from vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp rename to vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp index e168def1b8ea5..ae20df45a0f93 100644 --- a/vehicle/accel_brake_map_calibrator/include/accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp +++ b/vehicle/autoware_accel_brake_map_calibrator/include/autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp @@ -14,8 +14,8 @@ // limitations under the License. // -#ifndef ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ -#define ACCEL_BRAKE_MAP_CALIBRATOR__ACCEL_BRAKE_MAP_CALIBRATOR_NODE_HPP_ +#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 "autoware_raw_vehicle_cmd_converter/accel_map.hpp" #include "autoware_raw_vehicle_cmd_converter/brake_map.hpp" @@ -53,7 +53,7 @@ #include #include -namespace accel_brake_map_calibrator +namespace autoware::accel_brake_map_calibrator { using autoware::raw_vehicle_cmd_converter::AccelMap; @@ -376,6 +376,6 @@ class AccelBrakeMapCalibrator : public rclcpp::Node explicit AccelBrakeMapCalibrator(const rclcpp::NodeOptions & node_options); }; -} // namespace accel_brake_map_calibrator +} // namespace autoware::accel_brake_map_calibrator -#endif // 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/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml b/vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml similarity index 72% rename from vehicle/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml rename to vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml index 37ee49fe3c4e0..1ff983149d2f9 100644 --- a/vehicle/accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml +++ b/vehicle/autoware_accel_brake_map_calibrator/launch/accel_brake_map_calibrator.launch.xml @@ -1,8 +1,8 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -20,16 +20,16 @@ - + - + - + diff --git a/vehicle/accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png b/vehicle/autoware_accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png rename to vehicle/autoware_accel_brake_map_calibrator/media/actuation_cmd_publisher_util.png diff --git a/vehicle/accel_brake_map_calibrator/media/add_panel.png b/vehicle/autoware_accel_brake_map_calibrator/media/add_panel.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/add_panel.png rename to vehicle/autoware_accel_brake_map_calibrator/media/add_panel.png diff --git a/vehicle/accel_brake_map_calibrator/media/calib_rviz_image_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/calib_rviz_image_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/calib_rviz_image_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/calib_rviz_image_sample.png diff --git a/vehicle/accel_brake_map_calibrator/media/calibrator_button_panel.png b/vehicle/autoware_accel_brake_map_calibrator/media/calibrator_button_panel.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/calibrator_button_panel.png rename to vehicle/autoware_accel_brake_map_calibrator/media/calibrator_button_panel.png diff --git a/vehicle/accel_brake_map_calibrator/media/fourcell_RLS.png b/vehicle/autoware_accel_brake_map_calibrator/media/fourcell_RLS.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/fourcell_RLS.png rename to vehicle/autoware_accel_brake_map_calibrator/media/fourcell_RLS.png diff --git a/vehicle/accel_brake_map_calibrator/media/log_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/log_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/log_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/log_sample.png diff --git a/vehicle/accel_brake_map_calibrator/media/push_calibration_button.png b/vehicle/autoware_accel_brake_map_calibrator/media/push_calibration_button.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/push_calibration_button.png rename to vehicle/autoware_accel_brake_map_calibrator/media/push_calibration_button.png diff --git a/vehicle/accel_brake_map_calibrator/media/statistics_sample.png b/vehicle/autoware_accel_brake_map_calibrator/media/statistics_sample.png similarity index 100% rename from vehicle/accel_brake_map_calibrator/media/statistics_sample.png rename to vehicle/autoware_accel_brake_map_calibrator/media/statistics_sample.png diff --git a/vehicle/accel_brake_map_calibrator/package.xml b/vehicle/autoware_accel_brake_map_calibrator/package.xml similarity index 96% rename from vehicle/accel_brake_map_calibrator/package.xml rename to vehicle/autoware_accel_brake_map_calibrator/package.xml index 0fb299b199742..b2e3b97620272 100644 --- a/vehicle/accel_brake_map_calibrator/package.xml +++ b/vehicle/autoware_accel_brake_map_calibrator/package.xml @@ -1,7 +1,7 @@ - accel_brake_map_calibrator + autoware_accel_brake_map_calibrator 0.1.0 The accel_brake_map_calibrator Tomoya Kimura diff --git a/vehicle/accel_brake_map_calibrator/rviz/occupancy.rviz b/vehicle/autoware_accel_brake_map_calibrator/rviz/occupancy.rviz similarity index 100% rename from vehicle/accel_brake_map_calibrator/rviz/occupancy.rviz rename to vehicle/autoware_accel_brake_map_calibrator/rviz/occupancy.rviz diff --git a/vehicle/accel_brake_map_calibrator/scripts/__init__.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/__init__.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/__init__.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/__init__.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/accel_tester.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/accel_tester.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/accel_tester.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/accel_tester.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/actuation_cmd_publisher.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/brake_tester.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/brake_tester.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/brake_tester.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/brake_tester.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/calc_utils.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/calc_utils.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/calc_utils.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/calc_utils.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/config.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/config.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/config.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/config.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/csv_reader.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/csv_reader.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/csv_reader.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/csv_reader.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py index eb2bce380fd92..c2849513e3f54 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/delay_estimator.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/delay_estimator.py @@ -29,7 +29,7 @@ class DelayEstimator(Node): def __init__(self): # get parameter super().__init__("delay_estimator") - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter("log_file", package_path + "/config/log.csv") log_file = self.get_parameter("log_file").get_parameter_value().string_value self.declare_parameter("velocity_min_threshold", 0.1) diff --git a/vehicle/accel_brake_map_calibrator/scripts/log_analyzer.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/log_analyzer.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/log_analyzer.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/log_analyzer.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py similarity index 99% rename from vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py index 35bcfd09eaa38..8d04faccc5679 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/new_accel_brake_map_server.py @@ -50,7 +50,7 @@ def __init__(self): .string_value ) - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter( "/accel_brake_map_calibrator/csv_calibrated_map_dir", package_path + "/config/" ) diff --git a/vehicle/accel_brake_map_calibrator/scripts/plotter.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/plotter.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/scripts/plotter.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/plotter.py diff --git a/vehicle/accel_brake_map_calibrator/scripts/view_plot.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/view_plot.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py index 8041f361be3ce..2f1815b3dcf3a 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/view_plot.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_plot.py @@ -56,7 +56,7 @@ def __init__(self, args): ) if calibrated_map_dir is None: - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter( "/accel_brake_map_calibrator/csv_calibrated_map_dir", package_path + "/config/" ) @@ -269,7 +269,7 @@ def main(args=None): if __name__ == "__main__": - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") parser = argparse.ArgumentParser() parser.add_argument( "-d", "--default-map-dir", default=None, type=str, help="directory of default map" diff --git a/vehicle/accel_brake_map_calibrator/scripts/view_statistics.py b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py similarity index 98% rename from vehicle/accel_brake_map_calibrator/scripts/view_statistics.py rename to vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py index 83cfb8693b0e6..decc947e6850f 100755 --- a/vehicle/accel_brake_map_calibrator/scripts/view_statistics.py +++ b/vehicle/autoware_accel_brake_map_calibrator/scripts/view_statistics.py @@ -28,7 +28,7 @@ class ViewPlot(Node): def __init__(self): super().__init__("statistics_viewer") # get parameter - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") self.declare_parameter("log_file", package_path + "/config/log.csv") log_file = self.get_parameter("log_file").get_parameter_value().string_value self.declare_parameter("velocity_min_threshold", 0.1) diff --git a/vehicle/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 similarity index 99% rename from vehicle/accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp rename to vehicle/autoware_accel_brake_map_calibrator/src/accel_brake_map_calibrator_node.cpp index 37f0a11165df3..8c1a35c263712 100644 --- a/vehicle/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 @@ -14,7 +14,7 @@ // limitations under the License. // -#include "accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" +#include "autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" #include "rclcpp/logging.hpp" @@ -26,7 +26,7 @@ #include #include -namespace accel_brake_map_calibrator +namespace autoware::accel_brake_map_calibrator { AccelBrakeMapCalibrator::AccelBrakeMapCalibrator(const rclcpp::NodeOptions & node_options) @@ -305,6 +305,7 @@ void AccelBrakeMapCalibrator::timerCallback() // lack of data RCLCPP_WARN_STREAM_THROTTLE( get_logger(), *get_clock(), 5000, "lack of topics (twist, steer, accel, brake)"); + lack_of_data_count_++; return; } @@ -1691,4 +1692,4 @@ void AccelBrakeMapCalibrator::addLogToCSV( << ", " << new_accel_mse << "," << rmse_rate << std::endl; } -} // namespace accel_brake_map_calibrator +} // namespace autoware::accel_brake_map_calibrator diff --git a/vehicle/accel_brake_map_calibrator/src/main.cpp b/vehicle/autoware_accel_brake_map_calibrator/src/main.cpp similarity index 79% rename from vehicle/accel_brake_map_calibrator/src/main.cpp rename to vehicle/autoware_accel_brake_map_calibrator/src/main.cpp index 01dfe20307f80..df3a5cf470b6b 100644 --- a/vehicle/accel_brake_map_calibrator/src/main.cpp +++ b/vehicle/autoware_accel_brake_map_calibrator/src/main.cpp @@ -14,7 +14,7 @@ // limitations under the License. // -#include "accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" +#include "autoware_accel_brake_map_calibrator/accel_brake_map_calibrator_node.hpp" #include @@ -22,7 +22,8 @@ int main(int argc, char ** argv) { rclcpp::init(argc, argv); rclcpp::NodeOptions node_options; - rclcpp::spin(std::make_shared(node_options)); + rclcpp::spin( + std::make_shared(node_options)); rclcpp::shutdown(); return 0; } diff --git a/vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py b/vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py similarity index 97% rename from vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py rename to vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py index 1bbb5820bd24a..1771df7bff562 100755 --- a/vehicle/accel_brake_map_calibrator/test/plot_csv_client_node.py +++ b/vehicle/autoware_accel_brake_map_calibrator/test/plot_csv_client_node.py @@ -82,7 +82,7 @@ def main(args=None): if __name__ == "__main__": - package_path = get_package_share_directory("accel_brake_map_calibrator") + package_path = get_package_share_directory("autoware_accel_brake_map_calibrator") parser = argparse.ArgumentParser() parser.add_argument( "-d", "--default-map-dir", default=None, type=str, help="directory of default map" diff --git a/vehicle/accel_brake_map_calibrator/test/sim_actuation_status_publisher.py b/vehicle/autoware_accel_brake_map_calibrator/test/sim_actuation_status_publisher.py similarity index 100% rename from vehicle/accel_brake_map_calibrator/test/sim_actuation_status_publisher.py rename to vehicle/autoware_accel_brake_map_calibrator/test/sim_actuation_status_publisher.py diff --git a/vehicle/autoware_raw_vehicle_cmd_converter/README.md b/vehicle/autoware_raw_vehicle_cmd_converter/README.md index c204346d9d834..25e816e6f8692 100644 --- a/vehicle/autoware_raw_vehicle_cmd_converter/README.md +++ b/vehicle/autoware_raw_vehicle_cmd_converter/README.md @@ -22,7 +22,7 @@ Once the acceleration map is crafted, it should be loaded when the RawVehicleCmd ### Auto-Calibration Tool -For ease of calibration and adjustments to the lookup table, an auto-calibration tool is available. More information and instructions for this tool can be found [here](https://github.com/autowarefoundation/autoware.universe/blob/main/vehicle/accel_brake_map_calibrator/accel_brake_map_calibrator/README.md). +For ease of calibration and adjustments to the lookup table, an auto-calibration tool is available. More information and instructions for this tool can be found [here](https://github.com/autowarefoundation/autoware.universe/blob/main/vehicle/autoware_accel_brake_map_calibrator/README.md). ## Input topics