Skip to content

Commit 50fe5d0

Browse files
authored
refactor(livox_tag_filter): prefix package and namespace with autoware (#7788)
Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
1 parent 72064eb commit 50fe5d0

9 files changed

+39
-38
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cmake_minimum_required(VERSION 3.14)
2+
project(autoware_livox_tag_filter)
3+
4+
find_package(autoware_cmake REQUIRED)
5+
autoware_package()
6+
7+
find_package(PCL REQUIRED)
8+
9+
ament_auto_add_library(${PROJECT_NAME} SHARED
10+
src/livox_tag_filter_node.cpp
11+
src/livox_tag_filter_node.hpp
12+
)
13+
14+
target_link_libraries(${PROJECT_NAME}
15+
${PCL_LIBRARIES}
16+
)
17+
18+
rclcpp_components_register_node(${PROJECT_NAME}
19+
PLUGIN "autoware::livox_tag_filter::LivoxTagFilterNode"
20+
EXECUTABLE ${PROJECT_NAME}_node
21+
)
22+
23+
ament_auto_package(INSTALL_TO_SHARE
24+
launch
25+
config
26+
)

sensing/livox/livox_tag_filter/launch/livox_tag_filter.launch.xml sensing/livox/autoware_livox_tag_filter/launch/livox_tag_filter.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<launch>
22
<arg name="input" description="input topic name"/>
33
<arg name="output" description="output topic name"/>
4-
<arg name="param_file" default="$(find-pkg-share livox_tag_filter)/config/livox_tag_filter.param.yaml"/>
4+
<arg name="param_file" default="$(find-pkg-share autoware_livox_tag_filter)/config/livox_tag_filter.param.yaml"/>
55

6-
<node pkg="livox_tag_filter" exec="livox_tag_filter_node" name="livox_tag_filter_node" output="screen">
6+
<node pkg="autoware_livox_tag_filter" exec="autoware_livox_tag_filter_node" name="livox_tag_filter_node" output="screen">
77
<remap from="input" to="$(var input)"/>
88
<remap from="output" to="$(var output)"/>
99
<param from="$(var param_file)"/>

sensing/livox/livox_tag_filter/package.xml sensing/livox/autoware_livox_tag_filter/package.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>livox_tag_filter</name>
4+
<name>autoware_livox_tag_filter</name>
55
<version>0.1.0</version>
6-
<description>The livox_tag_filter package</description>
6+
<description>The autoware_livox_tag_filter package</description>
77
<maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
88
<maintainer email="kenzo.lobos@tier4.jp">Kenzo Lobos-Tsunekawa</maintainer>
99
<license>Apache License 2.0</license>

sensing/livox/livox_tag_filter/src/livox_tag_filter_node/livox_tag_filter_node.cpp sensing/livox/autoware_livox_tag_filter/src/livox_tag_filter_node.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#include "livox_tag_filter/livox_tag_filter_node.hpp"
15+
#include "livox_tag_filter_node.hpp"
1616

1717
#include <pcl_conversions/pcl_conversions.h>
1818

@@ -34,7 +34,7 @@ POINT_CLOUD_REGISTER_POINT_STRUCT(
3434
LivoxPoint, (float, x, x)(float, y, y)(float, z, z)(float, intensity, intensity)(
3535
std::uint8_t, tag, tag)(std::uint8_t, line, line))
3636

37-
namespace livox_tag_filter
37+
namespace autoware::livox_tag_filter
3838
{
3939
LivoxTagFilterNode::LivoxTagFilterNode(const rclcpp::NodeOptions & node_options)
4040
: Node("livox_tag_filter", node_options)
@@ -84,7 +84,7 @@ void LivoxTagFilterNode::onPointCloud(const sensor_msgs::msg::PointCloud2::Const
8484
pub_pointcloud_->publish(std::move(tag_filtered_msg_ptr));
8585
}
8686

87-
} // namespace livox_tag_filter
87+
} // namespace autoware::livox_tag_filter
8888

8989
#include <rclcpp_components/register_node_macro.hpp>
90-
RCLCPP_COMPONENTS_REGISTER_NODE(livox_tag_filter::LivoxTagFilterNode)
90+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::livox_tag_filter::LivoxTagFilterNode)

sensing/livox/livox_tag_filter/include/livox_tag_filter/livox_tag_filter_node.hpp sensing/livox/autoware_livox_tag_filter/src/livox_tag_filter_node.hpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
#ifndef LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
16-
#define LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
15+
#ifndef LIVOX_TAG_FILTER_NODE_HPP_
16+
#define LIVOX_TAG_FILTER_NODE_HPP_
1717

1818
#include <rclcpp/rclcpp.hpp>
1919

@@ -22,7 +22,7 @@
2222
#include <memory>
2323
#include <vector>
2424

25-
namespace livox_tag_filter
25+
namespace autoware::livox_tag_filter
2626
{
2727
class LivoxTagFilterNode : public rclcpp::Node
2828
{
@@ -41,6 +41,6 @@ class LivoxTagFilterNode : public rclcpp::Node
4141
// Publisher
4242
rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr pub_pointcloud_;
4343
};
44-
} // namespace livox_tag_filter
44+
} // namespace autoware::livox_tag_filter
4545

46-
#endif // LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
46+
#endif // LIVOX_TAG_FILTER_NODE_HPP_

sensing/livox/livox_tag_filter/CMakeLists.txt

-25
This file was deleted.

0 commit comments

Comments
 (0)