Skip to content

Commit 40aff9f

Browse files
authored
feat: apply autoware_ prefix for velodyne_monitor (autowarefoundation#9976)
Signed-off-by: Junya Sasaki <junya.sasaki@tier4.jp> Signed-off-by: Ryohsuke Mitsudome <ryohsuke.mitsudome@tier4.jp>
1 parent ea214c5 commit 40aff9f

13 files changed

+26
-15
lines changed

system/velodyne_monitor/CHANGELOG.rst system/autoware_velodyne_monitor/CHANGELOG.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2-
Changelog for package velodyne_monitor
3-
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package autoware_velodyne_monitor
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

55
0.40.0 (2024-12-12)
66
-------------------

system/velodyne_monitor/CMakeLists.txt system/autoware_velodyne_monitor/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(velodyne_monitor)
2+
project(autoware_velodyne_monitor)
33

44
find_package(autoware_cmake REQUIRED)
55
find_package(fmt)
@@ -13,7 +13,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
1313
target_link_libraries(${PROJECT_NAME} cpprest crypto fmt)
1414

1515
rclcpp_components_register_node(${PROJECT_NAME}
16-
PLUGIN "VelodyneMonitor"
16+
PLUGIN "autoware::velodyne_monitor::VelodyneMonitor"
1717
EXECUTABLE ${PROJECT_NAME}_node
1818
)
1919

system/velodyne_monitor/README.md system/autoware_velodyne_monitor/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# velodyne_monitor
1+
# autoware_velodyne_monitor
22

33
## Purpose
44

system/velodyne_monitor/include/velodyne_monitor/velodyne_monitor.hpp system/autoware_velodyne_monitor/include/autoware/velodyne_monitor/velodyne_monitor.hpp

+8-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 VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
16-
#define VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
15+
#ifndef AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
16+
#define AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
1717

1818
/**
1919
* @file velodyne_monitor.hpp
@@ -31,6 +31,9 @@
3131
// Include after diagnostic_updater because it causes errors
3232
#include <cpprest/http_client.h>
3333

34+
namespace autoware::velodyne_monitor
35+
{
36+
3437
namespace http = web::http;
3538
namespace client = web::http::client;
3639
namespace json = web::json;
@@ -115,4 +118,6 @@ class VelodyneMonitor : public rclcpp::Node
115118
{DiagStatus::OK, "OK"}, {DiagStatus::WARN, "RPM low"}, {DiagStatus::ERROR, "RPM too low"}};
116119
};
117120

118-
#endif // VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
121+
} // namespace autoware::velodyne_monitor
122+
123+
#endif // AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_

system/velodyne_monitor/launch/velodyne_monitor.launch.xml system/autoware_velodyne_monitor/launch/velodyne_monitor.launch.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<launch>
2-
<arg name="velodyne_monitor_param_file" default="$(find-pkg-share velodyne_monitor)/config/VLP-16.param.yaml"/>
2+
<arg name="velodyne_monitor_param_file" default="$(find-pkg-share autoware_velodyne_monitor)/config/VLP-16.param.yaml"/>
33
<arg name="ip_address" default="192.168.1.201"/>
44

5-
<node pkg="velodyne_monitor" exec="velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
5+
<node pkg="autoware_velodyne_monitor" exec="autoware_velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
66
<param from="$(var velodyne_monitor_param_file)"/>
77
<param name="ip_address" value="$(var ip_address)"/>
88
</node>

system/velodyne_monitor/package.xml system/autoware_velodyne_monitor/package.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
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>velodyne_monitor</name>
4+
<name>autoware_velodyne_monitor</name>
55
<version>0.40.0</version>
6-
<description>The velodyne_monitor package</description>
6+
<description>The autoware_velodyne_monitor package</description>
77
<maintainer email="fumihito.ito@tier4.jp">Fumihito Ito</maintainer>
8+
<maintainer email="junya.sasaki@tier4.jp">Junya Sasaki</maintainer>
89
<license>Apache License 2.0</license>
910

1011
<buildtool_depend>ament_cmake_auto</buildtool_depend>

system/velodyne_monitor/src/velodyne_monitor.cpp system/autoware_velodyne_monitor/src/velodyne_monitor.cpp

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* @brief Velodyne monitor class
1818
*/
1919

20-
#include "velodyne_monitor/velodyne_monitor.hpp"
20+
#include "autoware/velodyne_monitor/velodyne_monitor.hpp"
2121

2222
#include <boost/algorithm/string/join.hpp>
2323

@@ -30,6 +30,9 @@
3030
#define FMT_HEADER_ONLY
3131
#include <fmt/format.h>
3232

33+
namespace autoware::velodyne_monitor
34+
{
35+
3336
VelodyneMonitor::VelodyneMonitor(const rclcpp::NodeOptions & options)
3437
: Node("velodyne_monitor", options), updater_(this)
3538
{
@@ -231,5 +234,7 @@ float VelodyneMonitor::convertTemperature(int raw)
231234
return std::sqrt(2.1962e6 + (1.8639 - static_cast<float>(raw) * 5.0 / 4096) / 3.88e-6) - 1481.96;
232235
}
233236

237+
} // namespace autoware::velodyne_monitor
238+
234239
#include <rclcpp_components/register_node_macro.hpp>
235-
RCLCPP_COMPONENTS_REGISTER_NODE(VelodyneMonitor)
240+
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::velodyne_monitor::VelodyneMonitor)

0 commit comments

Comments
 (0)