Skip to content

Commit

Permalink
refactor(livox_tag_filter): prefix package and namespace with autoware (
Browse files Browse the repository at this point in the history
autowarefoundation#7788)

Signed-off-by: Esteve Fernandez <esteve.fernandez@tier4.jp>
  • Loading branch information
esteve authored and tby-udel committed Jul 14, 2024
1 parent 1e4c7be commit dca2b8f
Show file tree
Hide file tree
Showing 9 changed files with 39 additions and 38 deletions.
26 changes: 26 additions & 0 deletions sensing/livox/autoware_livox_tag_filter/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
cmake_minimum_required(VERSION 3.14)
project(autoware_livox_tag_filter)

find_package(autoware_cmake REQUIRED)
autoware_package()

find_package(PCL REQUIRED)

ament_auto_add_library(${PROJECT_NAME} SHARED
src/livox_tag_filter_node.cpp
src/livox_tag_filter_node.hpp
)

target_link_libraries(${PROJECT_NAME}
${PCL_LIBRARIES}
)

rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "autoware::livox_tag_filter::LivoxTagFilterNode"
EXECUTABLE ${PROJECT_NAME}_node
)

ament_auto_package(INSTALL_TO_SHARE
launch
config
)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<launch>
<arg name="input" description="input topic name"/>
<arg name="output" description="output topic name"/>
<arg name="param_file" default="$(find-pkg-share livox_tag_filter)/config/livox_tag_filter.param.yaml"/>
<arg name="param_file" default="$(find-pkg-share autoware_livox_tag_filter)/config/livox_tag_filter.param.yaml"/>

<node pkg="livox_tag_filter" exec="livox_tag_filter_node" name="livox_tag_filter_node" output="screen">
<node pkg="autoware_livox_tag_filter" exec="autoware_livox_tag_filter_node" name="livox_tag_filter_node" output="screen">
<remap from="input" to="$(var input)"/>
<remap from="output" to="$(var output)"/>
<param from="$(var param_file)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>livox_tag_filter</name>
<name>autoware_livox_tag_filter</name>
<version>0.1.0</version>
<description>The livox_tag_filter package</description>
<description>The autoware_livox_tag_filter package</description>
<maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
<maintainer email="kenzo.lobos@tier4.jp">Kenzo Lobos-Tsunekawa</maintainer>
<license>Apache License 2.0</license>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "livox_tag_filter/livox_tag_filter_node.hpp"
#include "livox_tag_filter_node.hpp"

#include <pcl_conversions/pcl_conversions.h>

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

namespace livox_tag_filter
namespace autoware::livox_tag_filter
{
LivoxTagFilterNode::LivoxTagFilterNode(const rclcpp::NodeOptions & node_options)
: Node("livox_tag_filter", node_options)
Expand Down Expand Up @@ -84,7 +84,7 @@ void LivoxTagFilterNode::onPointCloud(const sensor_msgs::msg::PointCloud2::Const
pub_pointcloud_->publish(std::move(tag_filtered_msg_ptr));
}

} // namespace livox_tag_filter
} // namespace autoware::livox_tag_filter

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(livox_tag_filter::LivoxTagFilterNode)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::livox_tag_filter::LivoxTagFilterNode)
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
#define LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
#ifndef LIVOX_TAG_FILTER_NODE_HPP_
#define LIVOX_TAG_FILTER_NODE_HPP_

#include <rclcpp/rclcpp.hpp>

Expand All @@ -22,7 +22,7 @@
#include <memory>
#include <vector>

namespace livox_tag_filter
namespace autoware::livox_tag_filter
{
class LivoxTagFilterNode : public rclcpp::Node
{
Expand All @@ -41,6 +41,6 @@ class LivoxTagFilterNode : public rclcpp::Node
// Publisher
rclcpp::Publisher<sensor_msgs::msg::PointCloud2>::SharedPtr pub_pointcloud_;
};
} // namespace livox_tag_filter
} // namespace autoware::livox_tag_filter

#endif // LIVOX_TAG_FILTER__LIVOX_TAG_FILTER_NODE_HPP_
#endif // LIVOX_TAG_FILTER_NODE_HPP_
25 changes: 0 additions & 25 deletions sensing/livox/livox_tag_filter/CMakeLists.txt

This file was deleted.

0 comments on commit dca2b8f

Please sign in to comment.