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.

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

Rename package to nobleo_socketcan_bridge #8

Merged
merged 1 commit into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Node;
class Clock;
} // namespace rclcpp

namespace ros2_socketcan_bridge
namespace nobleo_socketcan_bridge
{
class SocketCanBridge
{
Expand Down Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand All @@ -19,4 +19,4 @@ class SocketCanBridgeNode : public rclcpp::Node
SocketCanBridge bridge;
rclcpp::Subscription<can_msgs::msg::Frame>::SharedPtr can_sub;
};
} // namespace ros2_socketcan_bridge
} // namespace nobleo_socketcan_bridge
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SPDX-License-Identifier: Apache-2.0
-->

<package format="3">
<name>ros2_socketcan_bridge</name>
<name>nobleo_socketcan_bridge</name>
<version>0.0.0</version>
<description>Simple wrapper around SocketCAN</description>
<maintainer email="[email protected]">Ramon Wijnands</maintainer>
Expand Down
6 changes: 3 additions & 3 deletions src/socketcan_bridge.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <fmt/core.h>
#include <fmt/ostream.h>
Expand All @@ -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)
{
Expand Down Expand Up @@ -192,4 +192,4 @@ can_msgs::msg::Frame to_msg(const can_frame & frame)
return msg;
}

} // namespace ros2_socketcan_bridge
} // namespace nobleo_socketcan_bridge
4 changes: 2 additions & 2 deletions src/socketcan_bridge_ee.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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[])
{
Expand Down
8 changes: 4 additions & 4 deletions src/socketcan_bridge_node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 <rclcpp_components/register_node_macro.hpp>

namespace ros2_socketcan_bridge
namespace nobleo_socketcan_bridge
{

SocketCanBridgeNode::SocketCanBridgeNode(const rclcpp::NodeOptions & options)
Expand All @@ -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)
4 changes: 2 additions & 2 deletions test/benchmark.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ SPDX-License-Identifier: Apache-2.0

<executable cmd="ros2 topic pub -r $(var rate) -p $(var rate)0 /bridge1/tx can_msgs/msg/Frame '{}'"/>

<node name="bridge1" pkg="ros2_socketcan_bridge" exec="socketcan_bridge">
<node name="bridge1" pkg="nobleo_socketcan_bridge" exec="socketcan_bridge">
<param name="interface" value="vcan0"/>
</node>

<node name="bridge2" pkg="ros2_socketcan_bridge" exec="socketcan_bridge">
<node name="bridge2" pkg="nobleo_socketcan_bridge" exec="socketcan_bridge">
<param name="interface" value="vcan0"/>
</node>

Expand Down
2 changes: 1 addition & 1 deletion test/comparison.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
<executable cmd="ros2 topic pub -r $(var rate) -p $(var rate)0 /to_can_bus can_msgs/msg/Frame '{id: 1}'"/>
<executable cmd="ros2 topic pub -r $(var rate) -p $(var rate)0 /socketcan_bridge/tx can_msgs/msg/Frame '{id: 2}'"/>

<node name="socketcan_bridge" pkg="ros2_socketcan_bridge" exec="$(var node)">
<node name="socketcan_bridge" pkg="nobleo_socketcan_bridge" exec="$(var node)">
<param name="interface" value="vcan0"/>
</node>

Expand Down
6 changes: 3 additions & 3 deletions test/unittests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include <gtest/gtest.h>
#include <linux/can.h>

#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)
{
Expand Down
Loading