Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: apply autoware_ prefix for velodyne_monitor #9976

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package velodyne_monitor
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Changelog for package autoware_velodyne_monitor
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0.40.0 (2024-12-12)
-------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(velodyne_monitor)
project(autoware_velodyne_monitor)

find_package(autoware_cmake REQUIRED)
find_package(fmt)
Expand All @@ -13,7 +13,7 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
target_link_libraries(${PROJECT_NAME} cpprest crypto fmt)

rclcpp_components_register_node(${PROJECT_NAME}
PLUGIN "VelodyneMonitor"
PLUGIN "autoware::velodyne_monitor::VelodyneMonitor"
EXECUTABLE ${PROJECT_NAME}_node
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# velodyne_monitor
# autoware_velodyne_monitor

## Purpose

Expand Down
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 VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
#define VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
#ifndef AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
#define AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_

/**
* @file velodyne_monitor.hpp
Expand All @@ -31,6 +31,9 @@
// Include after diagnostic_updater because it causes errors
#include <cpprest/http_client.h>

namespace autoware::velodyne_monitor
{

namespace http = web::http;
namespace client = web::http::client;
namespace json = web::json;
Expand Down Expand Up @@ -115,4 +118,6 @@ class VelodyneMonitor : public rclcpp::Node
{DiagStatus::OK, "OK"}, {DiagStatus::WARN, "RPM low"}, {DiagStatus::ERROR, "RPM too low"}};
};

#endif // VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
} // namespace autoware::velodyne_monitor

#endif // AUTOWARE__VELODYNE_MONITOR__VELODYNE_MONITOR_HPP_
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<launch>
<arg name="velodyne_monitor_param_file" default="$(find-pkg-share velodyne_monitor)/config/VLP-16.param.yaml"/>
<arg name="velodyne_monitor_param_file" default="$(find-pkg-share autoware_velodyne_monitor)/config/VLP-16.param.yaml"/>
<arg name="ip_address" default="192.168.1.201"/>

<node pkg="velodyne_monitor" exec="velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
<node pkg="autoware_velodyne_monitor" exec="autoware_velodyne_monitor_node" name="velodyne_monitor" output="log" respawn="true">
<param from="$(var velodyne_monitor_param_file)"/>
<param name="ip_address" value="$(var ip_address)"/>
</node>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<?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>velodyne_monitor</name>
<name>autoware_velodyne_monitor</name>
<version>0.40.0</version>
<description>The velodyne_monitor package</description>
<description>The autoware_velodyne_monitor package</description>
<maintainer email="[email protected]">Fumihito Ito</maintainer>
<maintainer email="[email protected]">Junya Sasaki</maintainer>
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake_auto</buildtool_depend>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @brief Velodyne monitor class
*/

#include "velodyne_monitor/velodyne_monitor.hpp"
#include "autoware/velodyne_monitor/velodyne_monitor.hpp"

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

Expand All @@ -30,6 +30,9 @@
#define FMT_HEADER_ONLY
#include <fmt/format.h>

namespace autoware::velodyne_monitor
{

VelodyneMonitor::VelodyneMonitor(const rclcpp::NodeOptions & options)
: Node("velodyne_monitor", options), updater_(this)
{
Expand Down Expand Up @@ -231,5 +234,7 @@
return std::sqrt(2.1962e6 + (1.8639 - static_cast<float>(raw) * 5.0 / 4096) / 3.88e-6) - 1481.96;
}

} // namespace autoware::velodyne_monitor

#include <rclcpp_components/register_node_macro.hpp>
RCLCPP_COMPONENTS_REGISTER_NODE(VelodyneMonitor)
RCLCPP_COMPONENTS_REGISTER_NODE(autoware::velodyne_monitor::VelodyneMonitor)

Check warning on line 240 in system/autoware_velodyne_monitor/src/velodyne_monitor.cpp

View check run for this annotation

Codecov / codecov/patch

system/autoware_velodyne_monitor/src/velodyne_monitor.cpp#L240

Added line #L240 was not covered by tests
Loading