From ba3dad763e607643b9228aaa185390fc48e59ec8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 28 Jul 2024 16:57:40 +0900 Subject: [PATCH 1/2] build(deps): bump pre-commit autoupdate (#102) Co-authored-by: Autumn60 --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f0f41f9..0e73c14 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -85,7 +85,7 @@ repos: exclude: .cu - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.29.0 + rev: 0.29.1 hooks: - id: check-metaschema files: ^.+/schema/.*schema\.json$ From acc6521728fc07bdb08354088f3d81cc44392d18 Mon Sep 17 00:00:00 2001 From: Autumn60 <37181352+Autumn60@users.noreply.github.com> Date: Sun, 28 Jul 2024 17:32:33 +0900 Subject: [PATCH 2/2] chore(common): change utils package name from wheel_stuck_utils to wheel_stuck_common_utils (#101) * change package dir name Signed-off-by: Autumn60 * change include dir name Signed-off-by: Autumn60 * update namespaces Signed-off-by: Autumn60 * change test code file name Signed-off-by: Autumn60 * fix CMakeLists and package.xml Signed-off-by: Autumn60 * update CODEOWNERS Signed-off-by: Autumn60 * replace wheel_stuck_utils to wheel_stuck_common_utils Signed-off-by: Autumn60 --------- Signed-off-by: Autumn60 --- .github/CODEOWNERS | 2 +- .../CMakeLists.txt | 6 +++--- .../include/wheel_stuck_common_utils}/math/math.hpp | 10 +++++----- .../wheel_stuck_common_utils}/ros/function_timer.hpp | 10 +++++----- .../ros/no_callback_subscription.hpp | 10 +++++----- .../package.xml | 4 ++-- .../test/math/test_clamp01.cpp | 4 ++-- .../test/math/test_inverse_lerp.cpp | 4 ++-- .../test/math/test_lerp.cpp | 4 ++-- .../test/math/test_max.cpp | 4 ++-- .../test/math/test_min.cpp | 4 ++-- .../test/math/test_sign.cpp | 4 ++-- .../test/test_wheel_stuck_common_utils.cpp} | 0 .../velodyne_cloud_separator.hpp | 4 ++-- src/perception/velodyne_cloud_separator/package.xml | 2 +- .../dwa_planner/include/dwa_planner/dwa_planner.hpp | 9 +++++---- src/planning/dwa_planner/package.xml | 2 +- src/planning/dwa_planner/src/dwa_planner.cpp | 6 +++--- .../simple_int_publisher/simple_int_publisher.hpp | 4 ++-- src/sample/simple_int_publisher/package.xml | 2 +- .../simple_int_subscriber/polling_int_subscriber.hpp | 4 ++-- src/sample/simple_int_subscriber/package.xml | 2 +- 22 files changed, 51 insertions(+), 50 deletions(-) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/CMakeLists.txt (73%) rename src/common/{wheel_stuck_utils/include/wheel_stuck_utils => wheel_stuck_common_utils/include/wheel_stuck_common_utils}/math/math.hpp (87%) rename src/common/{wheel_stuck_utils/include/wheel_stuck_utils => wheel_stuck_common_utils/include/wheel_stuck_common_utils}/ros/function_timer.hpp (85%) rename src/common/{wheel_stuck_utils/include/wheel_stuck_utils => wheel_stuck_common_utils/include/wheel_stuck_common_utils}/ros/no_callback_subscription.hpp (87%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/package.xml (82%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_clamp01.cpp (88%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_inverse_lerp.cpp (89%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_lerp.cpp (89%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_max.cpp (88%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_min.cpp (88%) rename src/common/{wheel_stuck_utils => wheel_stuck_common_utils}/test/math/test_sign.cpp (89%) rename src/common/{wheel_stuck_utils/test/test_wheel_stuck_utils.cpp => wheel_stuck_common_utils/test/test_wheel_stuck_common_utils.cpp} (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 4ebc048..eac78cc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,4 +1,4 @@ -src/common/wheel_stuck_utils/** @Autumn60 @Bey9434 +src/common/wheel_stuck_common_utils/** @Autumn60 @Bey9434 src/control/joy2twist/** @Bey9434 src/perception/velodyne_cloud_separator/** @Autumn60 src/planning/dwa_planner/** @Autumn60 diff --git a/src/common/wheel_stuck_utils/CMakeLists.txt b/src/common/wheel_stuck_common_utils/CMakeLists.txt similarity index 73% rename from src/common/wheel_stuck_utils/CMakeLists.txt rename to src/common/wheel_stuck_common_utils/CMakeLists.txt index fe04a58..3266b8d 100644 --- a/src/common/wheel_stuck_utils/CMakeLists.txt +++ b/src/common/wheel_stuck_common_utils/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(wheel_stuck_utils) +project(wheel_stuck_common_utils) if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 17) @@ -18,9 +18,9 @@ if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) ament_lint_auto_find_test_dependencies() - ament_auto_add_gtest(test_wheel_stuck_utils test/test_wheel_stuck_utils.cpp) + ament_auto_add_gtest(test_wheel_stuck_common_utils test/test_wheel_stuck_common_utils.cpp) file(GLOB TEST_SOURCES "test/**/*.cpp") - target_sources(test_wheel_stuck_utils PRIVATE ${TEST_SOURCES}) + target_sources(test_wheel_stuck_common_utils PRIVATE ${TEST_SOURCES}) endif() ament_auto_package() diff --git a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/math/math.hpp b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/math/math.hpp similarity index 87% rename from src/common/wheel_stuck_utils/include/wheel_stuck_utils/math/math.hpp rename to src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/math/math.hpp index eb2137b..1886579 100644 --- a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/math/math.hpp +++ b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/math/math.hpp @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef WHEEL_STUCK_UTILS__MATH__MATH_HPP_ -#define WHEEL_STUCK_UTILS__MATH__MATH_HPP_ +#ifndef WHEEL_STUCK_COMMON_UTILS__MATH__MATH_HPP_ +#define WHEEL_STUCK_COMMON_UTILS__MATH__MATH_HPP_ #include -namespace wheel_stuck_utils::math +namespace wheel_stuck_common_utils::math { inline double clamp01(const double value) { @@ -79,6 +79,6 @@ inline T max(T b, Args... args) return std::max(b, max(args...)); } -} // namespace wheel_stuck_utils::math +} // namespace wheel_stuck_common_utils::math -#endif // WHEEL_STUCK_UTILS__MATH__MATH_HPP_ +#endif // WHEEL_STUCK_COMMON_UTILS__MATH__MATH_HPP_ diff --git a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/function_timer.hpp b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/function_timer.hpp similarity index 85% rename from src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/function_timer.hpp rename to src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/function_timer.hpp index 609b5a9..1cf8905 100644 --- a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/function_timer.hpp +++ b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/function_timer.hpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef WHEEL_STUCK_UTILS__ROS__FUNCTION_TIMER_HPP_ -#define WHEEL_STUCK_UTILS__ROS__FUNCTION_TIMER_HPP_ +#ifndef WHEEL_STUCK_COMMON_UTILS__ROS__FUNCTION_TIMER_HPP_ +#define WHEEL_STUCK_COMMON_UTILS__ROS__FUNCTION_TIMER_HPP_ #include #include #include -namespace wheel_stuck_utils::ros +namespace wheel_stuck_common_utils::ros { class FunctionTimer @@ -51,6 +51,6 @@ class FunctionTimer } }; -} // namespace wheel_stuck_utils::ros +} // namespace wheel_stuck_common_utils::ros -#endif // WHEEL_STUCK_UTILS__ROS__FUNCTION_TIMER_HPP_ +#endif // WHEEL_STUCK_COMMON_UTILS__ROS__FUNCTION_TIMER_HPP_ diff --git a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/no_callback_subscription.hpp similarity index 87% rename from src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp rename to src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/no_callback_subscription.hpp index 79c76ca..769b20b 100644 --- a/src/common/wheel_stuck_utils/include/wheel_stuck_utils/ros/no_callback_subscription.hpp +++ b/src/common/wheel_stuck_common_utils/include/wheel_stuck_common_utils/ros/no_callback_subscription.hpp @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef WHEEL_STUCK_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ -#define WHEEL_STUCK_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ +#ifndef WHEEL_STUCK_COMMON_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ +#define WHEEL_STUCK_COMMON_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ #include #include #include -namespace wheel_stuck_utils::ros +namespace wheel_stuck_common_utils::ros { template @@ -60,6 +60,6 @@ class NoCallbackSubscription } }; -} // namespace wheel_stuck_utils::ros +} // namespace wheel_stuck_common_utils::ros -#endif // WHEEL_STUCK_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ +#endif // WHEEL_STUCK_COMMON_UTILS__ROS__NO_CALLBACK_SUBSCRIPTION_HPP_ diff --git a/src/common/wheel_stuck_utils/package.xml b/src/common/wheel_stuck_common_utils/package.xml similarity index 82% rename from src/common/wheel_stuck_utils/package.xml rename to src/common/wheel_stuck_common_utils/package.xml index 2d0dd66..413c301 100644 --- a/src/common/wheel_stuck_utils/package.xml +++ b/src/common/wheel_stuck_common_utils/package.xml @@ -1,9 +1,9 @@ - wheel_stuck_utils + wheel_stuck_common_utils 0.1.0 - The wheel_stuck_utils package + The wheel_stuck_common_utils package Akiro Harada Apache 2 diff --git a/src/common/wheel_stuck_utils/test/math/test_clamp01.cpp b/src/common/wheel_stuck_common_utils/test/math/test_clamp01.cpp similarity index 88% rename from src/common/wheel_stuck_utils/test/math/test_clamp01.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_clamp01.cpp index d640026..29a7497 100644 --- a/src/common/wheel_stuck_utils/test/math/test_clamp01.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_clamp01.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(clamp01, clamp01) { - using wheel_stuck_utils::math::clamp01; + using wheel_stuck_common_utils::math::clamp01; EXPECT_DOUBLE_EQ(clamp01(0.5), 0.5); EXPECT_DOUBLE_EQ(clamp01(1.5), 1.0); diff --git a/src/common/wheel_stuck_utils/test/math/test_inverse_lerp.cpp b/src/common/wheel_stuck_common_utils/test/math/test_inverse_lerp.cpp similarity index 89% rename from src/common/wheel_stuck_utils/test/math/test_inverse_lerp.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_inverse_lerp.cpp index e304a64..51a725e 100644 --- a/src/common/wheel_stuck_utils/test/math/test_inverse_lerp.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_inverse_lerp.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(inverse_lerp, inverse_lerp) { - using wheel_stuck_utils::math::inverse_lerp; + using wheel_stuck_common_utils::math::inverse_lerp; EXPECT_DOUBLE_EQ(inverse_lerp(0.0, 10.0, 5), 0.5); EXPECT_DOUBLE_EQ(inverse_lerp(0.0, 10.0, 15.0), 1.0); diff --git a/src/common/wheel_stuck_utils/test/math/test_lerp.cpp b/src/common/wheel_stuck_common_utils/test/math/test_lerp.cpp similarity index 89% rename from src/common/wheel_stuck_utils/test/math/test_lerp.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_lerp.cpp index 4513ed1..fe424ba 100644 --- a/src/common/wheel_stuck_utils/test/math/test_lerp.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_lerp.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(lerp, lerp) { - using wheel_stuck_utils::math::lerp; + using wheel_stuck_common_utils::math::lerp; EXPECT_DOUBLE_EQ(lerp(0.0, 10.0, 0.5), 5.0); EXPECT_DOUBLE_EQ(lerp(0.0, 10.0, 1.5), 10.0); diff --git a/src/common/wheel_stuck_utils/test/math/test_max.cpp b/src/common/wheel_stuck_common_utils/test/math/test_max.cpp similarity index 88% rename from src/common/wheel_stuck_utils/test/math/test_max.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_max.cpp index 5abf64b..148e3af 100644 --- a/src/common/wheel_stuck_utils/test/math/test_max.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_max.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(max, max) { - using wheel_stuck_utils::math::max; + using wheel_stuck_common_utils::math::max; EXPECT_EQ(max(5), 5); EXPECT_EQ(max(5, 2, 8, -1), 8); diff --git a/src/common/wheel_stuck_utils/test/math/test_min.cpp b/src/common/wheel_stuck_common_utils/test/math/test_min.cpp similarity index 88% rename from src/common/wheel_stuck_utils/test/math/test_min.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_min.cpp index 8470093..6361b99 100644 --- a/src/common/wheel_stuck_utils/test/math/test_min.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_min.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(min, min) { - using wheel_stuck_utils::math::min; + using wheel_stuck_common_utils::math::min; EXPECT_EQ(min(5), 5); EXPECT_EQ(min(5, 2, 8, -1), -1); diff --git a/src/common/wheel_stuck_utils/test/math/test_sign.cpp b/src/common/wheel_stuck_common_utils/test/math/test_sign.cpp similarity index 89% rename from src/common/wheel_stuck_utils/test/math/test_sign.cpp rename to src/common/wheel_stuck_common_utils/test/math/test_sign.cpp index e2a5d3d..1766bf7 100644 --- a/src/common/wheel_stuck_utils/test/math/test_sign.cpp +++ b/src/common/wheel_stuck_common_utils/test/math/test_sign.cpp @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "wheel_stuck_utils/math/math.hpp" +#include "wheel_stuck_common_utils/math/math.hpp" #include TEST(sign, sign) { - using wheel_stuck_utils::math::sign; + using wheel_stuck_common_utils::math::sign; EXPECT_EQ(sign(0), 0); EXPECT_EQ(sign(1), 1); diff --git a/src/common/wheel_stuck_utils/test/test_wheel_stuck_utils.cpp b/src/common/wheel_stuck_common_utils/test/test_wheel_stuck_common_utils.cpp similarity index 100% rename from src/common/wheel_stuck_utils/test/test_wheel_stuck_utils.cpp rename to src/common/wheel_stuck_common_utils/test/test_wheel_stuck_common_utils.cpp diff --git a/src/perception/velodyne_cloud_separator/include/velodyne_cloud_separator/velodyne_cloud_separator.hpp b/src/perception/velodyne_cloud_separator/include/velodyne_cloud_separator/velodyne_cloud_separator.hpp index 122881b..c30e737 100644 --- a/src/perception/velodyne_cloud_separator/include/velodyne_cloud_separator/velodyne_cloud_separator.hpp +++ b/src/perception/velodyne_cloud_separator/include/velodyne_cloud_separator/velodyne_cloud_separator.hpp @@ -18,7 +18,7 @@ #include "pcl/point_types.hpp" #include -#include +#include #include @@ -34,7 +34,7 @@ namespace velodyne_cloud_separator using PointXYZIR = pcl::PointXYZIR; using PointCloud2 = sensor_msgs::msg::PointCloud2; -using PointCloud2Subscription = wheel_stuck_utils::ros::NoCallbackSubscription; +using PointCloud2Subscription = wheel_stuck_common_utils::ros::NoCallbackSubscription; using PointCloud2Publisher = rclcpp::Publisher; class VelodyneCloudSeparator : public rclcpp::Node diff --git a/src/perception/velodyne_cloud_separator/package.xml b/src/perception/velodyne_cloud_separator/package.xml index 29c6b74..30ec1ee 100644 --- a/src/perception/velodyne_cloud_separator/package.xml +++ b/src/perception/velodyne_cloud_separator/package.xml @@ -15,7 +15,7 @@ rclcpp rclcpp_components sensor_msgs - wheel_stuck_utils + wheel_stuck_common_utils ament_lint_auto diff --git a/src/planning/dwa_planner/include/dwa_planner/dwa_planner.hpp b/src/planning/dwa_planner/include/dwa_planner/dwa_planner.hpp index 604045a..1e04e62 100644 --- a/src/planning/dwa_planner/include/dwa_planner/dwa_planner.hpp +++ b/src/planning/dwa_planner/include/dwa_planner/dwa_planner.hpp @@ -16,7 +16,7 @@ #define DWA_PLANNER__DWA_PLANNER_HPP_ #include -#include +#include #include #include @@ -34,9 +34,10 @@ using PoseStamped = geometry_msgs::msg::PoseStamped; using Twist = geometry_msgs::msg::Twist; using TwistStamped = geometry_msgs::msg::TwistStamped; -using OccupancyGridSubscription = wheel_stuck_utils::ros::NoCallbackSubscription; -using OdometrySubscription = wheel_stuck_utils::ros::NoCallbackSubscription; -using PoseStampedSubscription = wheel_stuck_utils::ros::NoCallbackSubscription; +using OccupancyGridSubscription = + wheel_stuck_common_utils::ros::NoCallbackSubscription; +using OdometrySubscription = wheel_stuck_common_utils::ros::NoCallbackSubscription; +using PoseStampedSubscription = wheel_stuck_common_utils::ros::NoCallbackSubscription; using TwistStampedPublisher = rclcpp::Publisher; class DWAPlanner : public rclcpp::Node diff --git a/src/planning/dwa_planner/package.xml b/src/planning/dwa_planner/package.xml index 6e93156..898209a 100644 --- a/src/planning/dwa_planner/package.xml +++ b/src/planning/dwa_planner/package.xml @@ -14,7 +14,7 @@ nav_msgs rclcpp rclcpp_components - wheel_stuck_utils + wheel_stuck_common_utils ament_lint_auto diff --git a/src/planning/dwa_planner/src/dwa_planner.cpp b/src/planning/dwa_planner/src/dwa_planner.cpp index 5bb53a4..42e4fb8 100644 --- a/src/planning/dwa_planner/src/dwa_planner.cpp +++ b/src/planning/dwa_planner/src/dwa_planner.cpp @@ -14,7 +14,7 @@ #include "dwa_planner/dwa_planner.hpp" -#include +#include #include @@ -199,10 +199,10 @@ DWAPlanner::Trajectory DWAPlanner::planning() Trajectory best_trajectory; for (int v = 0; v < velocity_resolution_; v++) { - double velocity = wheel_stuck_utils::math::lerp( + double velocity = wheel_stuck_common_utils::math::lerp( window.min_velocity, window.max_velocity, v * velocity_resolution_inv_); for (int a = 0; a < angular_velocity_resolution_; a++) { - double angular_velocity = wheel_stuck_utils::math::lerp( + double angular_velocity = wheel_stuck_common_utils::math::lerp( window.min_angular_velocity, window.max_angular_velocity, a * angular_velocity_resolution_inv_); diff --git a/src/sample/simple_int_publisher/include/simple_int_publisher/simple_int_publisher.hpp b/src/sample/simple_int_publisher/include/simple_int_publisher/simple_int_publisher.hpp index 082a43c..f66cc15 100644 --- a/src/sample/simple_int_publisher/include/simple_int_publisher/simple_int_publisher.hpp +++ b/src/sample/simple_int_publisher/include/simple_int_publisher/simple_int_publisher.hpp @@ -16,7 +16,7 @@ #define SIMPLE_INT_PUBLISHER__SIMPLE_INT_PUBLISHER_HPP_ #include -#include +#include #include @@ -25,7 +25,7 @@ namespace simple_int_publisher using Int32 = std_msgs::msg::Int32; -using FunctionTimer = wheel_stuck_utils::ros::FunctionTimer; +using FunctionTimer = wheel_stuck_common_utils::ros::FunctionTimer; using Int32Publisher = rclcpp::Publisher; class SimpleIntPublisher : public rclcpp::Node diff --git a/src/sample/simple_int_publisher/package.xml b/src/sample/simple_int_publisher/package.xml index 0d53e99..b584762 100644 --- a/src/sample/simple_int_publisher/package.xml +++ b/src/sample/simple_int_publisher/package.xml @@ -13,7 +13,7 @@ rclcpp rclcpp_components std_msgs - wheel_stuck_utils + wheel_stuck_common_utils ament_lint_auto diff --git a/src/sample/simple_int_subscriber/include/simple_int_subscriber/polling_int_subscriber.hpp b/src/sample/simple_int_subscriber/include/simple_int_subscriber/polling_int_subscriber.hpp index 24b0f2b..f69dede 100644 --- a/src/sample/simple_int_subscriber/include/simple_int_subscriber/polling_int_subscriber.hpp +++ b/src/sample/simple_int_subscriber/include/simple_int_subscriber/polling_int_subscriber.hpp @@ -16,7 +16,7 @@ #define SIMPLE_INT_SUBSCRIBER__POLLING_INT_SUBSCRIBER_HPP_ #include -#include +#include #include @@ -25,7 +25,7 @@ namespace simple_int_subscriber using Int32 = std_msgs::msg::Int32; -using Int32Subscription = wheel_stuck_utils::ros::NoCallbackSubscription; +using Int32Subscription = wheel_stuck_common_utils::ros::NoCallbackSubscription; class PollingIntSubscriber : public rclcpp::Node { diff --git a/src/sample/simple_int_subscriber/package.xml b/src/sample/simple_int_subscriber/package.xml index c82354c..8029381 100644 --- a/src/sample/simple_int_subscriber/package.xml +++ b/src/sample/simple_int_subscriber/package.xml @@ -13,7 +13,7 @@ rclcpp rclcpp_components std_msgs - wheel_stuck_utils + wheel_stuck_common_utils ament_lint_auto