Skip to content

Commit

Permalink
refactor(stop_filter): prefix package and namespace with autoware (au…
Browse files Browse the repository at this point in the history
…towarefoundation#7789)

* refactor(stop_filter): prefix package and namespace with autoware

Signed-off-by: Esteve Fernandez <[email protected]>

* fix launch files and update CODEOWNERS

Signed-off-by: Esteve Fernandez <[email protected]>

---------

Signed-off-by: Esteve Fernandez <[email protected]>
  • Loading branch information
esteve authored Jul 3, 2024
1 parent 82d86dc commit fbbc44c
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ launch/tier4_vehicle_launch/** [email protected]
localization/autoware_landmark_based_localizer/autoware_ar_tag_based_localizer/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/autoware_landmark_based_localizer/autoware_landmark_manager/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/autoware_pose_covariance_modifier/** [email protected]
localization/autoware_stop_filter/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/ekf_localizer/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/geo_pose_projector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/gyro_odometer/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
Expand All @@ -91,7 +92,6 @@ localization/pose2twist/** [email protected] [email protected] masah
localization/pose_estimator_arbiter/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/pose_initializer/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/pose_instability_detector/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/stop_filter/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/twist2accel/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/yabloc/yabloc_common/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
localization/yabloc/yabloc_image_processing/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</group>

<group>
<include file="$(find-pkg-share stop_filter)/launch/stop_filter.launch.xml">
<include file="$(find-pkg-share autoware_stop_filter)/launch/stop_filter.launch.xml">
<arg name="use_twist_with_covariance" value="True"/>
<arg name="input_odom_name" value="/localization/pose_twist_fusion_filter/kinematic_state"/>
<arg name="input_twist_with_covariance_name" value="/localization/pose_twist_fusion_filter/twist_with_covariance"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
cmake_minimum_required(VERSION 3.14)
project(stop_filter)
project(autoware_stop_filter)

find_package(autoware_cmake REQUIRED)
autoware_package()

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

rclcpp_components_register_node(${PROJECT_NAME}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<launch>
<arg name="param_path" default="$(find-pkg-share stop_filter)/config/stop_filter.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_stop_filter)/config/stop_filter.param.yaml"/>
<arg name="input_odom_name" default="ekf_odom"/>
<arg name="output_odom_name" default="stop_filter_odom"/>
<arg name="debug_stop_flag" default="debug/stop_flag"/>
<node pkg="stop_filter" exec="stop_filter_node" output="both">
<node pkg="autoware_stop_filter" exec="autoware_stop_filter_node" output="both">
<remap from="input/odom" to="$(var input_odom_name)"/>

<remap from="output/odom" to="$(var output_odom_name)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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>stop_filter</name>
<name>autoware_stop_filter</name>
<version>0.0.0</version>
<description>The stop filter package</description>
<maintainer email="[email protected]">Koji Minoda</maintainer>
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 "stop_filter/stop_filter.hpp"
#include "stop_filter.hpp"

#include <rclcpp/logging.hpp>

Expand All @@ -24,6 +24,8 @@

using std::placeholders::_1;

namespace autoware::stop_filter
{
StopFilter::StopFilter(const rclcpp::NodeOptions & node_options)
: rclcpp::Node("stop_filter", node_options)
{
Expand Down Expand Up @@ -57,6 +59,7 @@ void StopFilter::callback_odometry(const nav_msgs::msg::Odometry::SharedPtr msg)
pub_stop_flag_->publish(stop_flag_msg);
pub_odom_->publish(odom_msg);
}
} // namespace autoware::stop_filter

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(StopFilter)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::stop_filter::StopFilter)
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 STOP_FILTER__STOP_FILTER_HPP_
#define STOP_FILTER__STOP_FILTER_HPP_
#ifndef STOP_FILTER_HPP_
#define STOP_FILTER_HPP_

#include <rclcpp/rclcpp.hpp>

Expand All @@ -34,6 +34,8 @@
#include <string>
#include <vector>

namespace autoware::stop_filter
{
class StopFilter : public rclcpp::Node
{
public:
Expand All @@ -54,4 +56,5 @@ class StopFilter : public rclcpp::Node
*/
void callback_odometry(const nav_msgs::msg::Odometry::SharedPtr msg);
};
#endif // STOP_FILTER__STOP_FILTER_HPP_
} // namespace autoware::stop_filter
#endif // STOP_FILTER_HPP_

0 comments on commit fbbc44c

Please sign in to comment.