Skip to content

Commit b132a88

Browse files
fix(autoware_dummy_diag_publisher): add autowre prefix (autowarefoundation#9958)
* fic: add autoare_ prefix Signed-off-by: TetsuKawa <kawaguchitnon@icloud.com> * fix: add autoare_ prefix codeowner Signed-off-by: TetsuKawa <kawaguchitnon@icloud.com> * style(pre-commit): autofix --------- Signed-off-by: TetsuKawa <kawaguchitnon@icloud.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent f36d072 commit b132a88

13 files changed

+31
-28
lines changed

.github/CODEOWNERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ system/default_ad_api_helpers/ad_api_visualizers/** isamu.takagi@tier4.jp ryohsu
217217
system/default_ad_api_helpers/automatic_pose_initializer/** isamu.takagi@tier4.jp ryohsuke.mitsudome@tier4.jp yukihiro.saito@tier4.jp
218218
system/diagnostic_graph_aggregator/** isamu.takagi@tier4.jp
219219
system/diagnostic_graph_utils/** isamu.takagi@tier4.jp
220-
system/dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp
220+
system/autoware_dummy_diag_publisher/** fumihito.ito@tier4.jp tetsuhiro.kawaguchi@tier4.jp
221221
system/dummy_infrastructure/** ryohsuke.mitsudome@tier4.jp
222222
system/duplicated_node_checker/** mamoru.sobue@tier4.jp shumpei.wakabayashi@tier4.jp uken.ryu@tier4.jp
223223
system/hazard_status_converter/** isamu.takagi@tier4.jp

system/dummy_diag_publisher/CMakeLists.txt system/autoware_dummy_diag_publisher/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(dummy_diag_publisher)
2+
project(autoware_dummy_diag_publisher)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
@@ -9,7 +9,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
99
)
1010

1111
rclcpp_components_register_node(${PROJECT_NAME}
12-
PLUGIN "DummyDiagPublisher"
12+
PLUGIN "autoware::dummy_diag_publisher::DummyDiagPublisher"
1313
EXECUTABLE ${PROJECT_NAME}_node
1414
)
1515

system/dummy_diag_publisher/README.md system/autoware_dummy_diag_publisher/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TBD.
4242
### launch
4343

4444
```sh
45-
ros2 launch dummy_diag_publisher dummy_diag_publisher.launch.xml
45+
ros2 launch autoware_dummy_diag_publisher dummy_diag_publisher.launch.xml
4646
```
4747

4848
### reconfigure

system/dummy_diag_publisher/include/dummy_diag_publisher/dummy_diag_publisher_core.hpp system/autoware_dummy_diag_publisher/include/autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp

+6-3
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 DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_
16-
#define DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_
15+
#ifndef AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_
16+
#define AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_
1717

1818
#include <rclcpp/rclcpp.hpp>
1919

@@ -23,6 +23,8 @@
2323
#include <string>
2424
#include <vector>
2525

26+
namespace autoware::dummy_diag_publisher
27+
{
2628
struct DiagConfig
2729
{
2830
std::string hardware_id;
@@ -75,5 +77,6 @@ class DummyDiagPublisher : public rclcpp::Node
7577
rclcpp::TimerBase::SharedPtr timer_;
7678
rclcpp::Publisher<diagnostic_msgs::msg::DiagnosticArray>::SharedPtr pub_;
7779
};
80+
} // namespace autoware::dummy_diag_publisher
7881

79-
#endif // DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_
82+
#endif // AUTOWARE__DUMMY_DIAG_PUBLISHER__DUMMY_DIAG_PUBLISHER_CORE_HPP_

system/dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml system/autoware_dummy_diag_publisher/launch/dummy_diag_publisher.launch.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<launch>
2-
<arg name="config_file" default="$(find-pkg-share dummy_diag_publisher)/config/_empty.param.yaml"/>
3-
<arg name="extra_config_file_sensor" default="$(find-pkg-share dummy_diag_publisher)/config/_empty.param.yaml"/>
2+
<arg name="config_file" default="$(find-pkg-share autoware_dummy_diag_publisher)/config/_empty.param.yaml"/>
3+
<arg name="extra_config_file_sensor" default="$(find-pkg-share autoware_dummy_diag_publisher)/config/_empty.param.yaml"/>
44
<arg name="update_rate" default="10.0"/>
55

66
<arg name="launch_rqt_reconfigure" default="true"/>
@@ -26,7 +26,7 @@
2626
</node>
2727
</group>
2828

29-
<include file="$(find-pkg-share dummy_diag_publisher)/launch/dummy_diag_publisher_node.launch.xml">
29+
<include file="$(find-pkg-share autoware_dummy_diag_publisher)/launch/dummy_diag_publisher_node.launch.xml">
3030
<arg name="config_file" value="$(var config_file)"/>
3131
<arg name="extra_config_file_sensor" value="$(var extra_config_file_sensor)"/>
3232
<arg name="update_rate" value="$(var update_rate)"/>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<launch>
2+
<arg name="config_file" default="$(find-pkg-share autoware_dummy_diag_publisher)/config/dummy_diag_publisher.param.yaml"/>
3+
<arg name="extra_config_file_sensor" default="$(find-pkg-share autoware_dummy_diag_publisher)/config/extra.param.yaml"/>
4+
<arg name="update_rate" default="10.0"/>
5+
6+
<group>
7+
<node pkg="autoware_dummy_diag_publisher" exec="autoware_dummy_diag_publisher_node" name="dummy_diag_publisher" output="screen">
8+
<param from="$(var config_file)"/>
9+
<param from="$(var extra_config_file_sensor)"/>
10+
<param name="update_rate" value="$(var update_rate)"/>
11+
</node>
12+
</group>
13+
</launch>

system/dummy_diag_publisher/package.xml system/autoware_dummy_diag_publisher/package.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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>dummy_diag_publisher</name>
4+
<name>autoware_dummy_diag_publisher</name>
55
<version>0.40.0</version>
66
<description>The dummy_diag_publisher ROS 2 package</description>
77
<maintainer email="fumihito.ito@tier4.jp">Fumihito Ito</maintainer>

system/dummy_diag_publisher/src/dummy_diag_publisher_core.cpp system/autoware_dummy_diag_publisher/src/dummy_diag_publisher_core.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 "dummy_diag_publisher/dummy_diag_publisher_core.hpp"
15+
#include "autoware/dummy_diag_publisher/dummy_diag_publisher_core.hpp"
1616

1717
#include <set>
1818
#include <string>
@@ -24,7 +24,7 @@
2424

2525
#include <sstream>
2626

27-
namespace
27+
namespace autoware::dummy_diag_publisher
2828
{
2929
std::vector<std::string> split(const std::string & str, const char delim)
3030
{
@@ -36,7 +36,6 @@ std::vector<std::string> split(const std::string & str, const char delim)
3636
}
3737
return elems;
3838
}
39-
} // namespace
4039

4140
std::optional<DummyDiagPublisher::Status> DummyDiagPublisher::convertStrToStatus(
4241
const std::string & status_str)
@@ -226,6 +225,7 @@ DummyDiagPublisher::DummyDiagPublisher(const rclcpp::NodeOptions & options)
226225
param_callback_handle_ = this->add_on_set_parameters_callback(
227226
std::bind(&DummyDiagPublisher::onSetParams, this, std::placeholders::_1));
228227
}
228+
} // namespace autoware::dummy_diag_publisher
229229

230230
#include <rclcpp_components/register_node_macro.hpp>
231-
RCLCPP_COMPONENTS_REGISTER_NODE(DummyDiagPublisher)
231+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::dummy_diag_publisher::DummyDiagPublisher)

system/dummy_diag_publisher/launch/dummy_diag_publisher_node.launch.xml

-13
This file was deleted.

0 commit comments

Comments
 (0)