From c5748be6297d8a388ac5072cce2be66bff9a8cfb Mon Sep 17 00:00:00 2001 From: Ramon Wijnands Date: Mon, 1 Jul 2024 14:40:42 +0200 Subject: [PATCH] Rename package to nobleo_socketcan_bridge --- CMakeLists.txt | 4 ++-- README.md | 2 +- .../socketcan_bridge.hpp | 4 ++-- .../socketcan_bridge_node.hpp | 6 +++--- package.xml | 2 +- src/socketcan_bridge.cpp | 6 +++--- src/socketcan_bridge_ee.cpp | 4 ++-- src/socketcan_bridge_node.cpp | 8 ++++---- test/benchmark.launch.xml | 4 ++-- test/comparison.launch.xml | 2 +- test/unittests.cpp | 6 +++--- 11 files changed, 24 insertions(+), 24 deletions(-) rename include/{ros2_socketcan_bridge => nobleo_socketcan_bridge}/socketcan_bridge.hpp (95%) rename include/{ros2_socketcan_bridge => nobleo_socketcan_bridge}/socketcan_bridge_node.hpp (76%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c74621..117d92e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 cmake_minimum_required(VERSION 3.8) -project(ros2_socketcan_bridge) +project(nobleo_socketcan_bridge) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) @@ -37,7 +37,7 @@ target_link_libraries(socketcan_bridge_component fmt::fmt) rclcpp_components_register_node( socketcan_bridge_component - PLUGIN "ros2_socketcan_bridge::SocketCanBridgeNode" + PLUGIN "nobleo_socketcan_bridge::SocketCanBridgeNode" EXECUTABLE socketcan_bridge ) diff --git a/README.md b/README.md index fcf5433..dc94c63 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Copyright (C) 2024 Nobleo Technology B.V. SPDX-License-Identifier: Apache-2.0 --> -# ros2_socketcan_bridge +# nobleo_socketcan_bridge This package provides functionality to expose CAN frames from SocketCAN to ROS2 topics. diff --git a/include/ros2_socketcan_bridge/socketcan_bridge.hpp b/include/nobleo_socketcan_bridge/socketcan_bridge.hpp similarity index 95% rename from include/ros2_socketcan_bridge/socketcan_bridge.hpp rename to include/nobleo_socketcan_bridge/socketcan_bridge.hpp index 77f6c78..4a3ef5d 100644 --- a/include/ros2_socketcan_bridge/socketcan_bridge.hpp +++ b/include/nobleo_socketcan_bridge/socketcan_bridge.hpp @@ -19,7 +19,7 @@ class Node; class Clock; } // namespace rclcpp -namespace ros2_socketcan_bridge +namespace nobleo_socketcan_bridge { class SocketCanBridge { @@ -61,4 +61,4 @@ can_frame from_msg(const can_msgs::msg::Frame & msg); can_msgs::msg::Frame to_msg(const can_frame & frame); ; -} // namespace ros2_socketcan_bridge +} // namespace nobleo_socketcan_bridge diff --git a/include/ros2_socketcan_bridge/socketcan_bridge_node.hpp b/include/nobleo_socketcan_bridge/socketcan_bridge_node.hpp similarity index 76% rename from include/ros2_socketcan_bridge/socketcan_bridge_node.hpp rename to include/nobleo_socketcan_bridge/socketcan_bridge_node.hpp index 170a04e..643ff24 100644 --- a/include/ros2_socketcan_bridge/socketcan_bridge_node.hpp +++ b/include/nobleo_socketcan_bridge/socketcan_bridge_node.hpp @@ -4,10 +4,10 @@ #pragma once +#include "nobleo_socketcan_bridge/socketcan_bridge.hpp" #include "rclcpp/node.hpp" -#include "ros2_socketcan_bridge/socketcan_bridge.hpp" -namespace ros2_socketcan_bridge +namespace nobleo_socketcan_bridge { class SocketCanBridgeNode : public rclcpp::Node { @@ -19,4 +19,4 @@ class SocketCanBridgeNode : public rclcpp::Node SocketCanBridge bridge; rclcpp::Subscription::SharedPtr can_sub; }; -} // namespace ros2_socketcan_bridge +} // namespace nobleo_socketcan_bridge diff --git a/package.xml b/package.xml index ab4bd6a..7d5967b 100644 --- a/package.xml +++ b/package.xml @@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0 --> - ros2_socketcan_bridge + nobleo_socketcan_bridge 0.0.0 Simple wrapper around SocketCAN Ramon Wijnands diff --git a/src/socketcan_bridge.cpp b/src/socketcan_bridge.cpp index 146aa31..ac4cc1e 100644 --- a/src/socketcan_bridge.cpp +++ b/src/socketcan_bridge.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "ros2_socketcan_bridge/socketcan_bridge.hpp" +#include "nobleo_socketcan_bridge/socketcan_bridge.hpp" #include #include @@ -15,7 +15,7 @@ #include "rclcpp/logging.hpp" -namespace ros2_socketcan_bridge +namespace nobleo_socketcan_bridge { std::ostream & operator<<(std::ostream & os, const can_msgs::msg::Frame & msg) { @@ -192,4 +192,4 @@ can_msgs::msg::Frame to_msg(const can_frame & frame) return msg; } -} // namespace ros2_socketcan_bridge +} // namespace nobleo_socketcan_bridge diff --git a/src/socketcan_bridge_ee.cpp b/src/socketcan_bridge_ee.cpp index e5c9f6d..3e8dbd1 100644 --- a/src/socketcan_bridge_ee.cpp +++ b/src/socketcan_bridge_ee.cpp @@ -2,10 +2,10 @@ // // SPDX-License-Identifier: Apache-2.0 +#include "nobleo_socketcan_bridge/socketcan_bridge_node.hpp" #include "rclcpp/experimental/executors/events_executor/events_executor.hpp" -#include "ros2_socketcan_bridge/socketcan_bridge_node.hpp" -using ros2_socketcan_bridge::SocketCanBridgeNode; +using nobleo_socketcan_bridge::SocketCanBridgeNode; int main(int argc, char * argv[]) { diff --git a/src/socketcan_bridge_node.cpp b/src/socketcan_bridge_node.cpp index aa0b4cf..eed6b34 100644 --- a/src/socketcan_bridge_node.cpp +++ b/src/socketcan_bridge_node.cpp @@ -2,11 +2,11 @@ // // SPDX-License-Identifier: Apache-2.0 -#include "ros2_socketcan_bridge/socketcan_bridge_node.hpp" +#include "nobleo_socketcan_bridge/socketcan_bridge_node.hpp" #include -namespace ros2_socketcan_bridge +namespace nobleo_socketcan_bridge { SocketCanBridgeNode::SocketCanBridgeNode(const rclcpp::NodeOptions & options) @@ -21,5 +21,5 @@ SocketCanBridgeNode::SocketCanBridgeNode(const rclcpp::NodeOptions & options) { } -} // namespace ros2_socketcan_bridge -RCLCPP_COMPONENTS_REGISTER_NODE(ros2_socketcan_bridge::SocketCanBridgeNode) +} // namespace nobleo_socketcan_bridge +RCLCPP_COMPONENTS_REGISTER_NODE(nobleo_socketcan_bridge::SocketCanBridgeNode) diff --git a/test/benchmark.launch.xml b/test/benchmark.launch.xml index c748e27..3dde09e 100644 --- a/test/benchmark.launch.xml +++ b/test/benchmark.launch.xml @@ -9,11 +9,11 @@ SPDX-License-Identifier: Apache-2.0 - + - + diff --git a/test/comparison.launch.xml b/test/comparison.launch.xml index 2634a24..494f006 100644 --- a/test/comparison.launch.xml +++ b/test/comparison.launch.xml @@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0 - + diff --git a/test/unittests.cpp b/test/unittests.cpp index d371c1b..d2f05ac 100644 --- a/test/unittests.cpp +++ b/test/unittests.cpp @@ -5,10 +5,10 @@ #include #include -#include "ros2_socketcan_bridge/socketcan_bridge.hpp" +#include "nobleo_socketcan_bridge/socketcan_bridge.hpp" -using ros2_socketcan_bridge::from_msg; -using ros2_socketcan_bridge::to_msg; +using nobleo_socketcan_bridge::from_msg; +using nobleo_socketcan_bridge::to_msg; TEST(from_msg, standard) {