Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(pacmod): fix include file name autoware_vehicle_info_utils #80

Merged
merged 2 commits into from
Jun 10, 2024
Merged

fix(pacmod): fix include file name autoware_vehicle_info_utils #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac0dc1
fix(pacmod): fix include
satoshi-ota Jun 7, 2024
064d7ee
style(pre-commit): autofix
pre-commit-ci[bot] Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pacmod_interface/include/pacmod_interface/pacmod_interface.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
#ifndef PACMOD_INTERFACE__PACMOD_INTERFACE_HPP_
#define PACMOD_INTERFACE__PACMOD_INTERFACE_HPP_

#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
#include <rclcpp/rclcpp.hpp>
#include <tier4_api_utils/tier4_api_utils.hpp>
#include <vehicle_info_util/vehicle_info_util.hpp>

#include <autoware_control_msgs/msg/control.hpp>
#include <autoware_vehicle_msgs/msg/control_mode_report.hpp>
Expand Down Expand Up @@ -154,7 +154,7 @@ class PacmodInterface : public rclcpp::Node

double margin_time_for_gear_change_; // [s]

vehicle_info_util::VehicleInfo vehicle_info_;
autoware::vehicle_info_utils::VehicleInfo vehicle_info_;

// Service
tier4_api_utils::Service<tier4_external_api_msgs::srv::SetDoor>::SharedPtr srv_;
Expand Down
4 changes: 2 additions & 2 deletions pacmod_interface/include/pacmod_steer_test/pacmod_steer_test.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#ifndef PACMOD_STEER_TEST__PACMOD_STEER_TEST_HPP_
#define PACMOD_STEER_TEST__PACMOD_STEER_TEST_HPP_

#include <autoware_vehicle_info_utils/vehicle_info_utils.hpp>
#include <rclcpp/rclcpp.hpp>
#include <vehicle_info_util/vehicle_info_util.hpp>

#include <autoware_vehicle_msgs/msg/control_mode_report.hpp>
#include <autoware_vehicle_msgs/msg/engage.hpp>
Expand Down Expand Up @@ -86,7 +86,7 @@ class PacmodSteerTest : public rclcpp::Node
rclcpp::Publisher<autoware_vehicle_msgs::msg::TurnIndicatorsReport>::SharedPtr
turn_signal_status_pub_;

vehicle_info_util::VehicleInfo vehicle_info_;
autoware::vehicle_info_utils::VehicleInfo vehicle_info_;
rclcpp::TimerBase::SharedPtr timer_;

/* ros param */
Expand Down
2 changes: 1 addition & 1 deletion pacmod_interface/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>

<depend>autoware_control_msgs</depend>
<depend>autoware_vehicle_info_utils</depend>
<depend>autoware_vehicle_msgs</depend>
<depend>can_msgs</depend>
<depend>diagnostic_updater</depend>
Expand All @@ -28,7 +29,6 @@
<depend>tier4_debug_msgs</depend>
<depend>tier4_external_api_msgs</depend>
<depend>tier4_vehicle_msgs</depend>
<depend>vehicle_info_util</depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>autoware_lint_common</test_depend>
Expand Down
2 changes: 1 addition & 1 deletion pacmod_interface/src/pacmod_interface/pacmod_interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

PacmodInterface::PacmodInterface()
: Node("pacmod_interface"),
vehicle_info_(vehicle_info_util::VehicleInfoUtil(*this).getVehicleInfo())
vehicle_info_(autoware::vehicle_info_utils::VehicleInfoUtils(*this).getVehicleInfo())
{
/* setup parameters */
base_frame_id_ = declare_parameter("base_frame_id", "base_link");
Expand Down
2 changes: 1 addition & 1 deletion pacmod_interface/src/pacmod_steer_test/pacmod_steer_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

PacmodSteerTest::PacmodSteerTest()
: Node("pacmod_steer_test"),
vehicle_info_(vehicle_info_util::VehicleInfoUtil(*this).getVehicleInfo())
vehicle_info_(autoware::vehicle_info_utils::VehicleInfoUtils(*this).getVehicleInfo())
{
/* setup parameters */
/* setup parameters */
Expand Down
Loading