From d408f44d3fc319c89f209d6a4a7cec4a4499c6c0 Mon Sep 17 00:00:00 2001 From: rafal-gorecki Date: Wed, 11 Dec 2024 15:23:42 +0100 Subject: [PATCH] husarion_ugv_msg -> husarion_ugv_msgs --- ROS_API.md | 12 +++++----- husarion_ugv_battery/CMakeLists.txt | 8 +++---- husarion_ugv_battery/README.md | 6 ++--- .../husarion_ugv_battery/battery/battery.hpp | 4 ++-- .../battery/roboteq_battery.hpp | 8 +++---- .../battery_driver_node.hpp | 4 ++-- .../battery_publisher/battery_publisher.hpp | 8 +++---- husarion_ugv_battery/package.xml | 2 +- .../test/battery/test_adc_battery.cpp | 4 ++-- .../test/battery/test_battery.cpp | 4 ++-- .../test/battery/test_roboteq_battery.cpp | 10 ++++---- .../test_battery_publisher.cpp | 4 ++-- .../test_dual_battery_publisher.cpp | 4 ++-- .../test/test_battery_driver_node_roboteq.cpp | 4 ++-- .../test/utils/test_battery_driver_node.hpp | 8 +++---- husarion_ugv_diagnostics/CMakeLists.txt | 2 +- husarion_ugv_diagnostics/README.md | 2 +- .../system_monitor_node.hpp | 6 ++--- husarion_ugv_diagnostics/package.xml | 2 +- .../src/system_monitor_node.cpp | 8 +++---- .../integration/system_monitor_node.test.py | 2 +- .../test/unit/test_system_monitor_node.cpp | 2 +- .../CMakeLists.txt | 24 +++++++++---------- husarion_ugv_hardware_interfaces/README.md | 4 ++-- .../robot_driver/roboteq_data_converters.hpp | 12 +++++----- .../robot_system/system_ros_interface.hpp | 12 +++++----- husarion_ugv_hardware_interfaces/package.xml | 2 +- .../robot_driver/roboteq_data_converters.cpp | 12 +++++----- .../test_roboteq_data_converters.cpp | 6 ++--- .../test_system_ros_interface.cpp | 2 +- husarion_ugv_lights/CMakeLists.txt | 6 ++--- husarion_ugv_lights/CONFIGURATION.md | 2 +- husarion_ugv_lights/README.md | 4 ++-- .../lights_controller_node.hpp | 4 ++-- .../lights_driver_node.hpp | 4 ++-- husarion_ugv_lights/package.xml | 2 +- .../src/lights_controller_node.cpp | 2 +- .../src/lights_driver_node.cpp | 2 +- .../integration/husarion_ugv_lights.test.py | 4 ++-- .../test/unit/test_lights_driver_node.cpp | 4 ++-- husarion_ugv_manager/CMakeLists.txt | 14 +++++------ husarion_ugv_manager/CONFIGURATION.md | 22 ++++++++--------- husarion_ugv_manager/README.md | 8 +++---- .../lights_manager_node.hpp | 4 ++-- .../call_set_led_animation_service_node.hpp | 7 +++--- .../safety_manager_node.hpp | 12 +++++----- husarion_ugv_manager/package.xml | 2 +- ...st_call_set_led_animation_service_node.cpp | 16 ++++++------- .../test/test_lights_behavior_tree.cpp | 8 +++---- .../test/test_safety_behavior_tree.cpp | 8 +++---- .../test/test_safety_manager_node.cpp | 8 +++---- .../test/utils/plugin_test_utils.hpp | 2 +- husarion_ugv_msg/msg/DriverState.msg | 14 ----------- husarion_ugv_msg/srv/SetLEDImageAnimation.srv | 7 ------ .../CHANGELOG.rst | 0 .../CMakeLists.txt | 2 +- .../README.md | 2 +- .../msg/ChargingStatus.msg | 0 husarion_ugv_msgs/msg/DriverState.msg | 14 +++++++++++ .../msg/DriverStateNamed.msg | 2 +- .../msg/FaultFlag.msg | 0 .../msg/IOState.msg | 0 .../msg/LEDAnimation.msg | 0 .../msg/LEDAnimationQueue.msg | 0 .../msg/LEDImageAnimation.msg | 0 .../msg/RobotDriverState.msg | 2 +- .../msg/RuntimeError.msg | 0 .../msg/ScriptFlag.msg | 0 .../msg/SystemStatus.msg | 0 .../package.xml | 2 +- .../srv/SetLEDAnimation.srv | 2 +- .../srv/SetLEDBrightness.srv | 0 .../srv/SetLEDImageAnimation.srv | 7 ++++++ 73 files changed, 194 insertions(+), 193 deletions(-) delete mode 100644 husarion_ugv_msg/msg/DriverState.msg delete mode 100644 husarion_ugv_msg/srv/SetLEDImageAnimation.srv rename {husarion_ugv_msg => husarion_ugv_msgs}/CHANGELOG.rst (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/CMakeLists.txt (96%) rename {husarion_ugv_msg => husarion_ugv_msgs}/README.md (72%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/ChargingStatus.msg (100%) create mode 100644 husarion_ugv_msgs/msg/DriverState.msg rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/DriverStateNamed.msg (73%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/FaultFlag.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/IOState.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/LEDAnimation.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/LEDAnimationQueue.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/LEDImageAnimation.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/RobotDriverState.msg (71%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/RuntimeError.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/ScriptFlag.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/msg/SystemStatus.msg (100%) rename {husarion_ugv_msg => husarion_ugv_msgs}/package.xml (97%) rename {husarion_ugv_msg => husarion_ugv_msgs}/srv/SetLEDAnimation.srv (53%) rename {husarion_ugv_msg => husarion_ugv_msgs}/srv/SetLEDBrightness.srv (100%) create mode 100644 husarion_ugv_msgs/srv/SetLEDImageAnimation.srv diff --git a/ROS_API.md b/ROS_API.md index 7522843f..c5eb4675 100644 --- a/ROS_API.md +++ b/ROS_API.md @@ -68,7 +68,7 @@ Below is information about the physical robot API. For the simulation, topics an | 🤖 | 🖥️ | Topic | Description | | --- | --- | ----------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ✅ | ✅ | `battery/battery_status` | Mean values of both batteries will be published if the robot has two batteries. Otherwise, the state of the single battery will be published.
[*sensor_msgs/BatteryState*](https://docs.ros2.org/latest/api/sensor_msgs/msg/BatteryState.html) | -| ✅ | ❌ | `battery/charging_status` | Battery charging status value.
[*husarion_ugv_msg/ChargingStatus*](https://github.com/husarion/husarion_ugv_msg) | +| ✅ | ❌ | `battery/charging_status` | Battery charging status value.
[*husarion_ugv_msgs/ChargingStatus*](https://github.com/husarion/husarion_ugv_msgs) | | ✅ | ✅ | `cmd_vel` | Command velocity value.
[*geometry_msgs/Twist*](https://docs.ros2.org/latest/api/geometry_msgs/msg/Twist.html) | | ✅ | ✅ | `diagnostics` | Diagnostic data.
[*diagnostic_msgs/DiagnosticArray*](https://docs.ros2.org/latest/api/diagnostic_msgs/msg/DiagnosticArray.html) | | ✅ | ✅ | `dynamic_joint_states` | Information about the state of various movable joints in a robotic system.
[*control_msgs/DynamicJointState*](https://github.com/ros-controls/control_msgs/blob/master/control_msgs/msg/DynamicJointState.msg) | @@ -77,8 +77,8 @@ Below is information about the physical robot API. For the simulation, topics an | ✅ | ❌ | `gps/time_reference` | The timestamp from the GPS device.
[*sensor_msgs/TimeReference*](https://docs.ros2.org/latest/api/sensor_msgs/msg/TimeReference.html) | | ✅ | ❌ | `gps/vel` | Velocity output from the GPS device.
[*geometry_msgs/TwistStamped*](https://docs.ros2.org/latest/api/geometry_msgs/msg/TwistStamped.html) | | ✅ | ✅ | `hardware/e_stop` | Current E-stop state.
[*std_msgs/Bool*](https://docs.ros2.org/latest/api/std_msgs/msg/Bool.html). | -| ✅ | ❌ | `hardware/io_state` | Current IO state.
[*husarion_ugv_msg/IOState*](https://github.com/husarion/husarion_ugv_msg) | -| ✅ | ✅ | `hardware/robot_driver_state` | Current motor controllers' state and error flags. Subscribed if using Roboteq motor controllers data.
[*husarion_ugv_msg/RobotDriverState*](https://github.com/husarion/husarion_ugv_msg) | +| ✅ | ❌ | `hardware/io_state` | Current IO state.
[*husarion_ugv_msgs/IOState*](https://github.com/husarion/husarion_ugv_msgs) | +| ✅ | ✅ | `hardware/robot_driver_state` | Current motor controllers' state and error flags. Subscribed if using Roboteq motor controllers data.
[*husarion_ugv_msgs/RobotDriverState*](https://github.com/husarion/husarion_ugv_msgs) | | ✅ | ✅ | `imu/data` | Filtered IMU data.
[*sensor_msgs/Imu*](https://docs.ros2.org/latest/api/sensor_msgs/msg/Imu.html) | | ✅ | ✅ | `joint_states` | Provides information about the state of various joints in a robotic system.
[*sensor_msgs/JointState*](https://docs.ros2.org/latest/api/sensor_msgs/msg/JointState.html) | | ✅ | ✅ | `lights/channel_1_frame` | Frame to be displayed on robot Front Bumper Lights.
[*sensor_msgs/Image*](https://docs.ros2.org/latest/api/sensor_msgs/msg/Image.html) | @@ -87,7 +87,7 @@ Below is information about the physical robot API. For the simulation, topics an | ✅ | ✅ | `odometry/filtered` | Contains information about the filtered position and orientation. When `localization_mode` is `relative`, the position and orientation are relative to the starting point. When `localization_mode` is `enu`, the orientation is relative to the east-north-up (ENU) coordinates.
[*nav_msgs/Odometry*](https://docs.ros2.org/latest/api/nav_msgs/msg/Odometry.html) | | ✅ | ✅ | `odometry/wheels` | Robot odometry calculated from wheels.
[*nav_msgs/Odometry*](https://docs.ros2.org/latest/api/nav_msgs/msg/Odometry.html) | | ✅ | ✅ | `robot_description` | Contains information about robot description from URDF file.
[*std_msgs/String*](https://docs.ros2.org/latest/api/std_msgs/msg/String.html) | -| ✅ | ❌ | `system_status` | State of the system, including Built-in Computer's CPU temperature and load.
[*husarion_ugv_msg/SystemStatus*](https://github.com/husarion/husarion_ugv_msg) | +| ✅ | ❌ | `system_status` | State of the system, including Built-in Computer's CPU temperature and load.
[*husarion_ugv_msgs/SystemStatus*](https://github.com/husarion/husarion_ugv_msgs) | | ✅ | ✅ | `tf` | Transforms of robot system.
[*tf2_msgs/TFMessage*](https://docs.ros2.org/latest/api/tf2_msgs/msg/TFMessage.html) | | ✅ | ✅ | `tf_static` | Static transforms of robot system.
[*tf2_msgs/TFMessage*](https://docs.ros2.org/latest/api/tf2_msgs/msg/TFMessage.html) | @@ -121,8 +121,8 @@ Below is information about the physical robot API. For the simulation, topics an | ✅ | ✅ | `hardware/e_stop_trigger` | Triggers E-stop.
[std_srvs/srv/Trigger](https://docs.ros2.org/latest/api/std_srvs/srv/Trigger.html) | | ✅ | ❌ | `hardware/fan_enable` | Enables or disables fan.
[std_srvs/srv/SetBool](https://docs.ros2.org/latest/api/std_srvs/srv/SetBool.html) | | ✅ | ❌ | `hardware/motor_power_enable` | Enables or disables motor power.
[std_srvs/srv/SetBool](https://docs.ros2.org/latest/api/std_srvs/srv/SetBool.html) | -| ✅ | ✅ | `lights/set_animation` | Sets LED animation.
[husarion_ugv_msg/srv/SetLEDAnimation](https://github.com/husarion/husarion_ugv_msg) | +| ✅ | ✅ | `lights/set_animation` | Sets LED animation.
[husarion_ugv_msgs/srv/SetLEDAnimation](https://github.com/husarion/husarion_ugv_msgs) | | ✅ | ✅ | `localization/enable` | Enable EKF node.
[std_srvs/srv/Empty](https://docs.ros2.org/latest/api/std_srvs/srv/Empty.html) | -| ✅ | ❌ | `lights/set_brightness` | Sets global LED brightness, value ranges from **0.0** to **1.0**.
[husarion_ugv_msg/SetLEDBrightness](https://github.com/husarion/husarion_ugv_msg) | +| ✅ | ❌ | `lights/set_brightness` | Sets global LED brightness, value ranges from **0.0** to **1.0**.
[husarion_ugv_msgs/SetLEDBrightness](https://github.com/husarion/husarion_ugv_msgs) | | ✅ | ✅ | `localization/set_pose` | Set pose of EKF node.
[robot_localization/srv/SetPose](https://github.com/cra-ros-pkg/robot_localization/tree/ros2) | | ✅ | ✅ | `localization/toggle` | Toggle filter processing in the EKF node.
[robot_localization/srv/ToggleFilterProcessing](https://github.com/cra-ros-pkg/robot_localization/tree/ros2) | diff --git a/husarion_ugv_battery/CMakeLists.txt b/husarion_ugv_battery/CMakeLists.txt index 91a52e78..f6834a3a 100644 --- a/husarion_ugv_battery/CMakeLists.txt +++ b/husarion_ugv_battery/CMakeLists.txt @@ -5,7 +5,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) endif() -set(PACKAGE_DEPENDENCIES ament_cmake diagnostic_updater husarion_ugv_msg +set(PACKAGE_DEPENDENCIES ament_cmake diagnostic_updater husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs) foreach(PACKAGE IN ITEMS ${PACKAGE_DEPENDENCIES}) @@ -45,7 +45,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_battery rclcpp sensor_msgs - husarion_ugv_msg) + husarion_ugv_msgs) ament_add_gtest(${PROJECT_NAME}_test_adc_battery test/battery/test_adc_battery.cpp src/battery/adc_battery.cpp) @@ -54,7 +54,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_adc_battery rclcpp sensor_msgs - husarion_ugv_msg) + husarion_ugv_msgs) ament_add_gtest( ${PROJECT_NAME}_test_roboteq_battery test/battery/test_roboteq_battery.cpp @@ -64,7 +64,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_roboteq_battery - husarion_ugv_msg rclcpp sensor_msgs) + husarion_ugv_msgs rclcpp sensor_msgs) ament_add_gtest( ${PROJECT_NAME}_test_battery_publisher diff --git a/husarion_ugv_battery/README.md b/husarion_ugv_battery/README.md index cc67f082..9c5f6700 100644 --- a/husarion_ugv_battery/README.md +++ b/husarion_ugv_battery/README.md @@ -19,13 +19,13 @@ Publishes battery state read from ADC unit. - `_battery/battery_1_status_raw` [*sensor_msgs/BatteryState*]: First battery raw state. - `_battery/battery_2_status_raw` [*sensor_msgs/BatteryState*]: Second battery raw state. Published if second battery detected. - `battery/battery_status` [*sensor_msgs/BatteryState*]: Mean values of both batteries if robot has two batteries. Otherwise, the state of the single battery will be published. -- `battery/charging_status` [*husarion_ugv_msg/ChargingStatus*]: Battery charging status. +- `battery/charging_status` [*husarion_ugv_msgs/ChargingStatus*]: Battery charging status. - `diagnostics` [*diagnostic_msgs/DiagnosticArray*]: Battery diagnostic messages. #### Subscribers -- `hardware/io_state` [*husarion_ugv_msg/IOState*]: Current state of IO. -- `hardware/robot_driver_state` [*husarion_ugv_msg/RobotDriverState*]: Current motor controllers' state and error flags. Subscribed if using Roboteq motor controllers data. +- `hardware/io_state` [*husarion_ugv_msgs/IOState*]: Current state of IO. +- `hardware/robot_driver_state` [*husarion_ugv_msgs/RobotDriverState*]: Current motor controllers' state and error flags. Subscribed if using Roboteq motor controllers data. #### Parameters diff --git a/husarion_ugv_battery/include/husarion_ugv_battery/battery/battery.hpp b/husarion_ugv_battery/include/husarion_ugv_battery/battery/battery.hpp index 8a914c54..396445dd 100644 --- a/husarion_ugv_battery/include/husarion_ugv_battery/battery/battery.hpp +++ b/husarion_ugv_battery/include/husarion_ugv_battery/battery/battery.hpp @@ -25,13 +25,13 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/charging_status.hpp" +#include "husarion_ugv_msgs/msg/charging_status.hpp" namespace husarion_ugv_battery { using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using ChargingStatusMsg = husarion_ugv_msg::msg::ChargingStatus; +using ChargingStatusMsg = husarion_ugv_msgs::msg::ChargingStatus; class Battery { diff --git a/husarion_ugv_battery/include/husarion_ugv_battery/battery/roboteq_battery.hpp b/husarion_ugv_battery/include/husarion_ugv_battery/battery/roboteq_battery.hpp index 8423d4b8..bced7013 100644 --- a/husarion_ugv_battery/include/husarion_ugv_battery/battery/roboteq_battery.hpp +++ b/husarion_ugv_battery/include/husarion_ugv_battery/battery/roboteq_battery.hpp @@ -21,8 +21,8 @@ #include "rclcpp/rclcpp.hpp" -#include "husarion_ugv_msg/msg/driver_state_named.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/driver_state_named.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" #include "husarion_ugv_battery/battery/battery.hpp" #include "husarion_ugv_utils/moving_average.hpp" @@ -30,8 +30,8 @@ namespace husarion_ugv_battery { -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; -using DriverStateNamedMsg = husarion_ugv_msg::msg::DriverStateNamed; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; +using DriverStateNamedMsg = husarion_ugv_msgs::msg::DriverStateNamed; struct RoboteqBatteryParams { diff --git a/husarion_ugv_battery/include/husarion_ugv_battery/battery_driver_node.hpp b/husarion_ugv_battery/include/husarion_ugv_battery/battery_driver_node.hpp index ea9069f8..10f17070 100644 --- a/husarion_ugv_battery/include/husarion_ugv_battery/battery_driver_node.hpp +++ b/husarion_ugv_battery/include/husarion_ugv_battery/battery_driver_node.hpp @@ -21,7 +21,7 @@ #include "diagnostic_updater/diagnostic_updater.hpp" #include "rclcpp/rclcpp.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" #include "husarion_ugv_battery/adc_data_reader.hpp" #include "husarion_ugv_battery/battery/battery.hpp" @@ -30,7 +30,7 @@ namespace husarion_ugv_battery { -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; class BatteryDriverNode : public rclcpp::Node { diff --git a/husarion_ugv_battery/include/husarion_ugv_battery/battery_publisher/battery_publisher.hpp b/husarion_ugv_battery/include/husarion_ugv_battery/battery_publisher/battery_publisher.hpp index 51b166a4..9dd76f7c 100644 --- a/husarion_ugv_battery/include/husarion_ugv_battery/battery_publisher/battery_publisher.hpp +++ b/husarion_ugv_battery/include/husarion_ugv_battery/battery_publisher/battery_publisher.hpp @@ -22,15 +22,15 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/charging_status.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/charging_status.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" namespace husarion_ugv_battery { using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using ChargingStatusMsg = husarion_ugv_msg::msg::ChargingStatus; -using IOStateMsg = husarion_ugv_msg::msg::IOState; +using ChargingStatusMsg = husarion_ugv_msgs::msg::ChargingStatus; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; class BatteryPublisher { diff --git a/husarion_ugv_battery/package.xml b/husarion_ugv_battery/package.xml index c75ea9aa..d0051539 100644 --- a/husarion_ugv_battery/package.xml +++ b/husarion_ugv_battery/package.xml @@ -17,7 +17,7 @@ ament_cmake diagnostic_updater - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs diff --git a/husarion_ugv_battery/test/battery/test_adc_battery.cpp b/husarion_ugv_battery/test/battery/test_adc_battery.cpp index 53607796..5decb41d 100644 --- a/husarion_ugv_battery/test/battery/test_adc_battery.cpp +++ b/husarion_ugv_battery/test/battery/test_adc_battery.cpp @@ -22,13 +22,13 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/charging_status.hpp" +#include "husarion_ugv_msgs/msg/charging_status.hpp" #include "husarion_ugv_battery/battery/adc_battery.hpp" #include "husarion_ugv_utils/test/test_utils.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using ChargingStatusMsg = husarion_ugv_msg::msg::ChargingStatus; +using ChargingStatusMsg = husarion_ugv_msgs::msg::ChargingStatus; class TestADCBattery : public testing::Test { diff --git a/husarion_ugv_battery/test/battery/test_battery.cpp b/husarion_ugv_battery/test/battery/test_battery.cpp index 5f5536bf..ad9b3e03 100644 --- a/husarion_ugv_battery/test/battery/test_battery.cpp +++ b/husarion_ugv_battery/test/battery/test_battery.cpp @@ -22,13 +22,13 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/charging_status.hpp" +#include "husarion_ugv_msgs/msg/charging_status.hpp" #include "husarion_ugv_battery/battery/battery.hpp" #include "husarion_ugv_utils/test/test_utils.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using ChargingStatusMsg = husarion_ugv_msg::msg::ChargingStatus; +using ChargingStatusMsg = husarion_ugv_msgs::msg::ChargingStatus; class BatteryWrapper : public husarion_ugv_battery::Battery { diff --git a/husarion_ugv_battery/test/battery/test_roboteq_battery.cpp b/husarion_ugv_battery/test/battery/test_roboteq_battery.cpp index 089e989d..7fad2649 100644 --- a/husarion_ugv_battery/test/battery/test_roboteq_battery.cpp +++ b/husarion_ugv_battery/test/battery/test_roboteq_battery.cpp @@ -24,14 +24,14 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/driver_state_named.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/driver_state_named.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" #include "husarion_ugv_battery/battery/roboteq_battery.hpp" #include "husarion_ugv_utils/test/test_utils.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; class RoboteqBatteryWrapper : public husarion_ugv_battery::RoboteqBattery { @@ -81,8 +81,8 @@ void TestRoboteqBattery::UpdateBattery(const float voltage, const float current) { if (!driver_state_) { driver_state_ = std::make_shared(); - driver_state_->driver_states.push_back(husarion_ugv_msg::msg::DriverStateNamed()); - driver_state_->driver_states.push_back(husarion_ugv_msg::msg::DriverStateNamed()); + driver_state_->driver_states.push_back(husarion_ugv_msgs::msg::DriverStateNamed()); + driver_state_->driver_states.push_back(husarion_ugv_msgs::msg::DriverStateNamed()); } auto stamp = rclcpp::Time(0, 0, RCL_ROS_TIME); diff --git a/husarion_ugv_battery/test/battery_publisher/test_battery_publisher.cpp b/husarion_ugv_battery/test/battery_publisher/test_battery_publisher.cpp index 249c3193..a571411a 100644 --- a/husarion_ugv_battery/test/battery_publisher/test_battery_publisher.cpp +++ b/husarion_ugv_battery/test/battery_publisher/test_battery_publisher.cpp @@ -22,12 +22,12 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" #include "husarion_ugv_battery/battery_publisher/battery_publisher.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using IOStateMsg = husarion_ugv_msg::msg::IOState; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; class BatteryPublisherWrapper : public husarion_ugv_battery::BatteryPublisher { diff --git a/husarion_ugv_battery/test/battery_publisher/test_dual_battery_publisher.cpp b/husarion_ugv_battery/test/battery_publisher/test_dual_battery_publisher.cpp index 959febfc..46cabbf9 100644 --- a/husarion_ugv_battery/test/battery_publisher/test_dual_battery_publisher.cpp +++ b/husarion_ugv_battery/test/battery_publisher/test_dual_battery_publisher.cpp @@ -22,7 +22,7 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/charging_status.hpp" +#include "husarion_ugv_msgs/msg/charging_status.hpp" #include "husarion_ugv_battery/battery/adc_battery.hpp" #include "husarion_ugv_battery/battery/battery.hpp" @@ -30,7 +30,7 @@ #include "husarion_ugv_utils/test/ros_test_utils.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using ChargingStatusMsg = husarion_ugv_msg::msg::ChargingStatus; +using ChargingStatusMsg = husarion_ugv_msgs::msg::ChargingStatus; class DualBatteryPublisherWrapper : public husarion_ugv_battery::DualBatteryPublisher { diff --git a/husarion_ugv_battery/test/test_battery_driver_node_roboteq.cpp b/husarion_ugv_battery/test/test_battery_driver_node_roboteq.cpp index 5e02ab8c..8158c8b8 100644 --- a/husarion_ugv_battery/test/test_battery_driver_node_roboteq.cpp +++ b/husarion_ugv_battery/test/test_battery_driver_node_roboteq.cpp @@ -44,7 +44,7 @@ TEST_F(TestBatteryNodeRoboteq, BatteryValues) EXPECT_EQ(BatteryStateMsg::POWER_SUPPLY_STATUS_UNKNOWN, battery_state_->power_supply_status); EXPECT_EQ(BatteryStateMsg::POWER_SUPPLY_HEALTH_UNKNOWN, battery_state_->power_supply_health); - husarion_ugv_msg::msg::DriverStateNamed motor_controller; + husarion_ugv_msgs::msg::DriverStateNamed motor_controller; motor_controller.state.voltage = 35.0f; motor_controller.state.current = 0.1f; @@ -84,7 +84,7 @@ TEST_F(TestBatteryNodeRoboteq, BatteryTimeout) EXPECT_EQ(BatteryStateMsg::POWER_SUPPLY_HEALTH_UNKNOWN, battery_state_->power_supply_health); // Publish some values - husarion_ugv_msg::msg::DriverStateNamed motor_controller; + husarion_ugv_msgs::msg::DriverStateNamed motor_controller; motor_controller.state.voltage = 35.0f; motor_controller.state.current = 0.1f; diff --git a/husarion_ugv_battery/test/utils/test_battery_driver_node.hpp b/husarion_ugv_battery/test/utils/test_battery_driver_node.hpp index 5e061fbd..2e496b88 100644 --- a/husarion_ugv_battery/test/utils/test_battery_driver_node.hpp +++ b/husarion_ugv_battery/test/utils/test_battery_driver_node.hpp @@ -28,14 +28,14 @@ #include "sensor_msgs/msg/battery_state.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" #include "husarion_ugv_battery/battery_driver_node.hpp" using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; -using IOStateMsg = husarion_ugv_msg::msg::IOState; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; class TestBatteryNode : public testing::Test { diff --git a/husarion_ugv_diagnostics/CMakeLists.txt b/husarion_ugv_diagnostics/CMakeLists.txt index 35282f60..a4d9d02e 100644 --- a/husarion_ugv_diagnostics/CMakeLists.txt +++ b/husarion_ugv_diagnostics/CMakeLists.txt @@ -20,7 +20,7 @@ set(PACKAGE_DEPENDENCIES diagnostic_msgs diagnostic_updater generate_parameter_library - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils PkgConfig rclcpp diff --git a/husarion_ugv_diagnostics/README.md b/husarion_ugv_diagnostics/README.md index 78440b1b..f21439ca 100644 --- a/husarion_ugv_diagnostics/README.md +++ b/husarion_ugv_diagnostics/README.md @@ -19,7 +19,7 @@ Publishes the built-in computer system status , monitoring parameters as such as #### Publishes - `diagnostics` [*diagnostic_msgs/DiagnosticArray*]: System monitor diagnostic messages. -- `system_status` [*husarion_ugv_msg/SystemStatus*]: Built-in computer system status, includes the most important computation-related parameters. +- `system_status` [*husarion_ugv_msgs/SystemStatus*]: Built-in computer system status, includes the most important computation-related parameters. #### Parameters diff --git a/husarion_ugv_diagnostics/include/husarion_ugv_diagnostics/system_monitor_node.hpp b/husarion_ugv_diagnostics/include/husarion_ugv_diagnostics/system_monitor_node.hpp index 4941b9be..73bf9918 100644 --- a/husarion_ugv_diagnostics/include/husarion_ugv_diagnostics/system_monitor_node.hpp +++ b/husarion_ugv_diagnostics/include/husarion_ugv_diagnostics/system_monitor_node.hpp @@ -20,7 +20,7 @@ #include #include -#include "husarion_ugv_msg/msg/system_status.hpp" +#include "husarion_ugv_msgs/msg/system_status.hpp" #include "system_monitor_parameters.hpp" @@ -63,7 +63,7 @@ class SystemMonitorNode : public rclcpp::Node * @param status The SystemStatus object to be converted. * @return The converted SystemStatus message. */ - husarion_ugv_msg::msg::SystemStatus SystemStatusToMessage(const SystemStatus & status); + husarion_ugv_msgs::msg::SystemStatus SystemStatusToMessage(const SystemStatus & status); private: void TimerCallback(); @@ -73,7 +73,7 @@ class SystemMonitorNode : public rclcpp::Node diagnostic_updater::Updater diagnostic_updater_; rclcpp::TimerBase::SharedPtr timer_; - rclcpp::Publisher::SharedPtr system_status_publisher_; + rclcpp::Publisher::SharedPtr system_status_publisher_; system_monitor::Params params_; std::shared_ptr param_listener_; diff --git a/husarion_ugv_diagnostics/package.xml b/husarion_ugv_diagnostics/package.xml index 98beb762..f3102cd3 100644 --- a/husarion_ugv_diagnostics/package.xml +++ b/husarion_ugv_diagnostics/package.xml @@ -20,7 +20,7 @@ diagnostic_msgs diagnostic_updater generate_parameter_library - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp std_msgs diff --git a/husarion_ugv_diagnostics/src/system_monitor_node.cpp b/husarion_ugv_diagnostics/src/system_monitor_node.cpp index bdcf20e1..09be7e04 100644 --- a/husarion_ugv_diagnostics/src/system_monitor_node.cpp +++ b/husarion_ugv_diagnostics/src/system_monitor_node.cpp @@ -22,7 +22,7 @@ #include #include -#include "husarion_ugv_msg/msg/system_status.hpp" +#include "husarion_ugv_msgs/msg/system_status.hpp" #include "husarion_ugv_utils/common_utilities.hpp" #include "husarion_ugv_utils/ros_utils.hpp" @@ -44,7 +44,7 @@ SystemMonitorNode::SystemMonitorNode( std::make_shared(this->get_node_parameters_interface()); params_ = param_listener_->get_params(); - system_status_publisher_ = this->create_publisher( + system_status_publisher_ = this->create_publisher( "system_status", 10); const auto timer_interval_ms = static_cast(1000.0 / params_.publish_frequency); @@ -149,10 +149,10 @@ float SystemMonitorNode::GetDiskUsage() const return disk_usage; } -husarion_ugv_msg::msg::SystemStatus SystemMonitorNode::SystemStatusToMessage( +husarion_ugv_msgs::msg::SystemStatus SystemMonitorNode::SystemStatusToMessage( const SystemStatus & status) { - husarion_ugv_msg::msg::SystemStatus message; + husarion_ugv_msgs::msg::SystemStatus message; message.header.stamp = this->get_clock()->now(); message.cpu_percent = status.core_usages; diff --git a/husarion_ugv_diagnostics/test/integration/system_monitor_node.test.py b/husarion_ugv_diagnostics/test/integration/system_monitor_node.test.py index e5d5df43..4fe7da96 100644 --- a/husarion_ugv_diagnostics/test/integration/system_monitor_node.test.py +++ b/husarion_ugv_diagnostics/test/integration/system_monitor_node.test.py @@ -24,7 +24,7 @@ from launch_ros.actions import Node from launch_testing_ros import WaitForTopics -from husarion_ugv_msg.msg import SystemStatus +from husarion_ugv_msgs.msg import SystemStatus @pytest.mark.launch_test diff --git a/husarion_ugv_diagnostics/test/unit/test_system_monitor_node.cpp b/husarion_ugv_diagnostics/test/unit/test_system_monitor_node.cpp index c48ca35c..522e4408 100644 --- a/husarion_ugv_diagnostics/test/unit/test_system_monitor_node.cpp +++ b/husarion_ugv_diagnostics/test/unit/test_system_monitor_node.cpp @@ -62,7 +62,7 @@ class SystemMonitorNodeWrapper : public husarion_ugv_diagnostics::SystemMonitorN float GetDiskUsage() const { return husarion_ugv_diagnostics::SystemMonitorNode::GetDiskUsage(); } - husarion_ugv_msg::msg::SystemStatus SystemStatusToMessage( + husarion_ugv_msgs::msg::SystemStatus SystemStatusToMessage( const husarion_ugv_diagnostics::SystemStatus & status) { diff --git a/husarion_ugv_hardware_interfaces/CMakeLists.txt b/husarion_ugv_hardware_interfaces/CMakeLists.txt index 2036cda0..abeb42ef 100644 --- a/husarion_ugv_hardware_interfaces/CMakeLists.txt +++ b/husarion_ugv_hardware_interfaces/CMakeLists.txt @@ -23,7 +23,7 @@ set(PACKAGE_DEPENDENCIES geometry_msgs hardware_interface imu_filter_madgwick - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils phidgets_api PkgConfig @@ -100,7 +100,7 @@ if(BUILD_TESTING) test/phidget_imu_sensor/test_phidget_imu_sensor.cpp) ament_target_dependencies( ${PROJECT_NAME}_test_phidget_imu_sensor hardware_interface rclcpp - husarion_ugv_utils husarion_ugv_msg phidgets_api) + husarion_ugv_utils husarion_ugv_msgs phidgets_api) target_link_libraries(${PROJECT_NAME}_test_phidget_imu_sensor ${PROJECT_NAME} phidgets_spatial_parameters) @@ -118,7 +118,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_roboteq_data_converters - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_roboteq_data_converters PkgConfig::LIBLELY_COAPP) @@ -131,7 +131,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_canopen_manager rclcpp - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_canopen_manager PkgConfig::LIBLELY_COAPP) @@ -146,7 +146,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_roboteq_driver rclcpp - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_roboteq_driver PkgConfig::LIBLELY_COAPP) @@ -163,7 +163,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_roboteq_robot_driver rclcpp - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_roboteq_robot_driver PkgConfig::LIBLELY_COAPP) @@ -181,7 +181,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_lynx_robot_driver rclcpp - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_lynx_robot_driver PkgConfig::LIBLELY_COAPP) @@ -199,7 +199,7 @@ if(BUILD_TESTING) PUBLIC $ $) ament_target_dependencies(${PROJECT_NAME}_test_panther_robot_driver rclcpp - husarion_ugv_msg husarion_ugv_utils) + husarion_ugv_msgs husarion_ugv_utils) target_link_libraries(${PROJECT_NAME}_test_panther_robot_driver PkgConfig::LIBLELY_COAPP) @@ -228,7 +228,7 @@ if(BUILD_TESTING) ${PROJECT_NAME}_test_system_ros_interface diagnostic_updater rclcpp - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils realtime_tools std_srvs) @@ -256,7 +256,7 @@ if(BUILD_TESTING) diagnostic_updater hardware_interface rclcpp - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils std_msgs std_srvs) @@ -289,7 +289,7 @@ if(BUILD_TESTING) diagnostic_updater hardware_interface rclcpp - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils std_msgs std_srvs) @@ -323,7 +323,7 @@ if(BUILD_TESTING) diagnostic_updater hardware_interface rclcpp - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils std_msgs std_srvs) diff --git a/husarion_ugv_hardware_interfaces/README.md b/husarion_ugv_hardware_interfaces/README.md index a34b865a..da6e06ae 100644 --- a/husarion_ugv_hardware_interfaces/README.md +++ b/husarion_ugv_hardware_interfaces/README.md @@ -14,8 +14,8 @@ Plugins for Panther and Lynx are based on an abstraction called UGVSystem. Most - `diagnostics` [*diagnostic_msgs/DiagnosticArray*]: System diagnostic messages. - `hardware/e_stop` [*std_msgs/Bool*]: Current E-stop state. -- `hardware/io_state` [*husarion_ugv_msg/IOState*]: Current IO state. -- `hardware/robot_driver_state` [*husarion_ugv_msg/RobotDriverState*]: Current motor controllers' state and error flags. +- `hardware/io_state` [*husarion_ugv_msgs/IOState*]: Current IO state. +- `hardware/robot_driver_state` [*husarion_ugv_msgs/RobotDriverState*]: Current motor controllers' state and error flags. #### Service Servers diff --git a/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_data_converters.hpp b/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_data_converters.hpp index 81cdf787..b5607a81 100644 --- a/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_data_converters.hpp +++ b/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_data_converters.hpp @@ -21,9 +21,9 @@ #include #include -#include "husarion_ugv_msg/msg/fault_flag.hpp" -#include "husarion_ugv_msg/msg/runtime_error.hpp" -#include "husarion_ugv_msg/msg/script_flag.hpp" +#include "husarion_ugv_msgs/msg/fault_flag.hpp" +#include "husarion_ugv_msgs/msg/runtime_error.hpp" +#include "husarion_ugv_msgs/msg/script_flag.hpp" #include "husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_driver.hpp" #include "husarion_ugv_hardware_interfaces/utils.hpp" @@ -124,7 +124,7 @@ class FaultFlag : public FlagError { public: FaultFlag(); - husarion_ugv_msg::msg::FaultFlag GetMessage() const; + husarion_ugv_msgs::msg::FaultFlag GetMessage() const; std::map GetErrorMap() const; }; @@ -132,7 +132,7 @@ class ScriptFlag : public FlagError { public: ScriptFlag(); - husarion_ugv_msg::msg::ScriptFlag GetMessage() const; + husarion_ugv_msgs::msg::ScriptFlag GetMessage() const; std::map GetErrorMap() const; }; @@ -140,7 +140,7 @@ class RuntimeError : public FlagError { public: RuntimeError(); - husarion_ugv_msg::msg::RuntimeError GetMessage() const; + husarion_ugv_msgs::msg::RuntimeError GetMessage() const; std::map GetErrorMap() const; }; diff --git a/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/system_ros_interface.hpp b/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/system_ros_interface.hpp index 48a1abf8..bf7ce90a 100644 --- a/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/system_ros_interface.hpp +++ b/husarion_ugv_hardware_interfaces/include/husarion_ugv_hardware_interfaces/robot_system/system_ros_interface.hpp @@ -30,9 +30,9 @@ #include #include -#include "husarion_ugv_msg/msg/driver_state_named.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/driver_state_named.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" #include "husarion_ugv_hardware_interfaces/robot_system/gpio/gpio_controller.hpp" #include "husarion_ugv_hardware_interfaces/robot_system/robot_driver/roboteq_data_converters.hpp" @@ -43,9 +43,9 @@ namespace husarion_ugv_hardware_interfaces { using BoolMsg = std_msgs::msg::Bool; -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; -using IOStateMsg = husarion_ugv_msg::msg::IOState; -using DriverStateNamedMsg = husarion_ugv_msg::msg::DriverStateNamed; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; +using DriverStateNamedMsg = husarion_ugv_msgs::msg::DriverStateNamed; using SetBoolSrv = std_srvs::srv::SetBool; using TriggerSrv = std_srvs::srv::Trigger; diff --git a/husarion_ugv_hardware_interfaces/package.xml b/husarion_ugv_hardware_interfaces/package.xml index b45a4d6f..06aefd77 100644 --- a/husarion_ugv_hardware_interfaces/package.xml +++ b/husarion_ugv_hardware_interfaces/package.xml @@ -31,7 +31,7 @@ generate_parameter_library geometry_msgs hardware_interface - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils imu_filter_madgwick phidgets_api diff --git a/husarion_ugv_hardware_interfaces/src/robot_system/robot_driver/roboteq_data_converters.cpp b/husarion_ugv_hardware_interfaces/src/robot_system/robot_driver/roboteq_data_converters.cpp index 6f3974c9..ead97328 100644 --- a/husarion_ugv_hardware_interfaces/src/robot_system/robot_driver/roboteq_data_converters.cpp +++ b/husarion_ugv_hardware_interfaces/src/robot_system/robot_driver/roboteq_data_converters.cpp @@ -110,9 +110,9 @@ FaultFlag::FaultFlag() { } -husarion_ugv_msg::msg::FaultFlag FaultFlag::GetMessage() const +husarion_ugv_msgs::msg::FaultFlag FaultFlag::GetMessage() const { - husarion_ugv_msg::msg::FaultFlag fault_flags_msg; + husarion_ugv_msgs::msg::FaultFlag fault_flags_msg; fault_flags_msg.overheat = flags_.test(0); fault_flags_msg.overvoltage = flags_.test(1); @@ -137,9 +137,9 @@ std::map FaultFlag::GetErrorMap() const ScriptFlag::ScriptFlag() : FlagError({"loop_error", "encoder_disconnected", "amp_limiter"}) {} -husarion_ugv_msg::msg::ScriptFlag ScriptFlag::GetMessage() const +husarion_ugv_msgs::msg::ScriptFlag ScriptFlag::GetMessage() const { - husarion_ugv_msg::msg::ScriptFlag script_flags_msg; + husarion_ugv_msgs::msg::ScriptFlag script_flags_msg; script_flags_msg.loop_error = flags_.test(0); script_flags_msg.encoder_disconnected = flags_.test(1); @@ -178,9 +178,9 @@ RuntimeError::RuntimeError() { } -husarion_ugv_msg::msg::RuntimeError RuntimeError::GetMessage() const +husarion_ugv_msgs::msg::RuntimeError RuntimeError::GetMessage() const { - husarion_ugv_msg::msg::RuntimeError runtime_errors_msg; + husarion_ugv_msgs::msg::RuntimeError runtime_errors_msg; runtime_errors_msg.amps_limit_active = flags_.test(0); runtime_errors_msg.motor_stall = flags_.test(1); diff --git a/husarion_ugv_hardware_interfaces/test/unit/robot_system/robot_driver/test_roboteq_data_converters.cpp b/husarion_ugv_hardware_interfaces/test/unit/robot_system/robot_driver/test_roboteq_data_converters.cpp index 7f40f6c7..53cf5a88 100644 --- a/husarion_ugv_hardware_interfaces/test/unit/robot_system/robot_driver/test_roboteq_data_converters.cpp +++ b/husarion_ugv_hardware_interfaces/test/unit/robot_system/robot_driver/test_roboteq_data_converters.cpp @@ -24,7 +24,7 @@ #include "utils/test_constants.hpp" void TestFaultFlagMsg( - const husarion_ugv_msg::msg::FaultFlag & msg, const std::vector & expected_values) + const husarion_ugv_msgs::msg::FaultFlag & msg, const std::vector & expected_values) { if (expected_values.size() != 8) { throw std::runtime_error("Wrong size of expected_values in TestFaultFlagMsg"); @@ -41,7 +41,7 @@ void TestFaultFlagMsg( } void TestScriptFlagMsg( - const husarion_ugv_msg::msg::ScriptFlag & msg, const std::vector & expected_values) + const husarion_ugv_msgs::msg::ScriptFlag & msg, const std::vector & expected_values) { if (expected_values.size() != 3) { throw std::runtime_error("Wrong size of expected_values in TestScriptFlagMsg"); @@ -53,7 +53,7 @@ void TestScriptFlagMsg( } void TestRuntimeErrorMsg( - const husarion_ugv_msg::msg::RuntimeError & msg, const std::vector & expected_values) + const husarion_ugv_msgs::msg::RuntimeError & msg, const std::vector & expected_values) { if (expected_values.size() != 7) { throw std::runtime_error("Wrong size of expected_values in TestFaultFlagMsg"); diff --git a/husarion_ugv_hardware_interfaces/test/unit/robot_system/test_system_ros_interface.cpp b/husarion_ugv_hardware_interfaces/test/unit/robot_system/test_system_ros_interface.cpp index 271215c3..f51d502c 100644 --- a/husarion_ugv_hardware_interfaces/test/unit/robot_system/test_system_ros_interface.cpp +++ b/husarion_ugv_hardware_interfaces/test/unit/robot_system/test_system_ros_interface.cpp @@ -26,7 +26,7 @@ #include "utils/test_constants.hpp" -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; class SystemROSInterfaceWrapper : public husarion_ugv_hardware_interfaces::SystemROSInterface { diff --git a/husarion_ugv_lights/CMakeLists.txt b/husarion_ugv_lights/CMakeLists.txt index c8b06b3c..80b7985c 100644 --- a/husarion_ugv_lights/CMakeLists.txt +++ b/husarion_ugv_lights/CMakeLists.txt @@ -9,7 +9,7 @@ set(PACKAGE_DEPENDENCIES ament_cmake diagnostic_updater image_transport - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils pluginlib rclcpp @@ -37,7 +37,7 @@ ament_target_dependencies( lights_driver_node_component diagnostic_updater image_transport - husarion_ugv_msg + husarion_ugv_msgs rclcpp rclcpp_components sensor_msgs @@ -50,7 +50,7 @@ add_library( src/led_components/led_animations_queue.cpp) ament_target_dependencies( lights_controller_node_component - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils pluginlib rclcpp diff --git a/husarion_ugv_lights/CONFIGURATION.md b/husarion_ugv_lights/CONFIGURATION.md index 5e3f31d4..b471198b 100644 --- a/husarion_ugv_lights/CONFIGURATION.md +++ b/husarion_ugv_lights/CONFIGURATION.md @@ -158,7 +158,7 @@ ros2 launch husarion_ugv_bringup bringup.launch user_animations_file:=/my_awesom Test new animations: ```bash -ros2 service call /lights/set_animation husarion_ugv_msg/srv/SetLEDAnimation "{animation: {id: 0, param: ''}, repeating: true}" +ros2 service call /lights/set_animation husarion_ugv_msgs/srv/SetLEDAnimation "{animation: {id: 0, param: ''}, repeating: true}" ``` ## Defining a Custom Animation Type diff --git a/husarion_ugv_lights/README.md b/husarion_ugv_lights/README.md index 124f1055..12bc7696 100644 --- a/husarion_ugv_lights/README.md +++ b/husarion_ugv_lights/README.md @@ -26,7 +26,7 @@ This node is of type rclcpp_components is responsible for processing animations #### Service Servers -- `lights/set_animation` [*husarion_ugv_msg/SetLEDAnimation*]: Allows setting animation on Bumper Lights based on animation ID. +- `lights/set_animation` [*husarion_ugv_msgs/SetLEDAnimation*]: Allows setting animation on Bumper Lights based on animation ID. #### Parameters @@ -49,7 +49,7 @@ This node is of type rclcpp_components is responsible for displaying frames on t #### Service Servers -- `lights/set_brightness` [*husarion_ugv_msg/SetLEDBrightness*]: Allows setting global LED brightness, value ranges from **0.0** to **1.0**. +- `lights/set_brightness` [*husarion_ugv_msgs/SetLEDBrightness*]: Allows setting global LED brightness, value ranges from **0.0** to **1.0**. #### Service Clients diff --git a/husarion_ugv_lights/include/husarion_ugv_lights/lights_controller_node.hpp b/husarion_ugv_lights/include/husarion_ugv_lights/lights_controller_node.hpp index 2af12c82..79715bac 100644 --- a/husarion_ugv_lights/include/husarion_ugv_lights/lights_controller_node.hpp +++ b/husarion_ugv_lights/include/husarion_ugv_lights/lights_controller_node.hpp @@ -25,7 +25,7 @@ #include "sensor_msgs/msg/image.hpp" -#include "husarion_ugv_msg/srv/set_led_animation.hpp" +#include "husarion_ugv_msgs/srv/set_led_animation.hpp" #include "husarion_ugv_lights/animation/animation.hpp" #include "husarion_ugv_lights/led_components/led_animations_queue.hpp" @@ -36,7 +36,7 @@ namespace husarion_ugv_lights { using ImageMsg = sensor_msgs::msg::Image; -using SetLEDAnimationSrv = husarion_ugv_msg::srv::SetLEDAnimation; +using SetLEDAnimationSrv = husarion_ugv_msgs::srv::SetLEDAnimation; class LightsControllerNode : public rclcpp::Node { diff --git a/husarion_ugv_lights/include/husarion_ugv_lights/lights_driver_node.hpp b/husarion_ugv_lights/include/husarion_ugv_lights/lights_driver_node.hpp index 70107f62..4464e2a6 100644 --- a/husarion_ugv_lights/include/husarion_ugv_lights/lights_driver_node.hpp +++ b/husarion_ugv_lights/include/husarion_ugv_lights/lights_driver_node.hpp @@ -24,7 +24,7 @@ #include "sensor_msgs/msg/image.hpp" #include "std_srvs/srv/set_bool.hpp" -#include "husarion_ugv_msg/srv/set_led_brightness.hpp" +#include "husarion_ugv_msgs/srv/set_led_brightness.hpp" #include "husarion_ugv_lights/apa102.hpp" @@ -33,7 +33,7 @@ namespace husarion_ugv_lights using ImageMsg = sensor_msgs::msg::Image; using SetBoolSrv = std_srvs::srv::SetBool; -using SetLEDBrightnessSrv = husarion_ugv_msg::srv::SetLEDBrightness; +using SetLEDBrightnessSrv = husarion_ugv_msgs::srv::SetLEDBrightness; /** * @brief Class for controlling APA102 LEDs based on a ROS Image topic. diff --git a/husarion_ugv_lights/package.xml b/husarion_ugv_lights/package.xml index 99c67104..59be60e3 100644 --- a/husarion_ugv_lights/package.xml +++ b/husarion_ugv_lights/package.xml @@ -17,7 +17,7 @@ ament_cmake diagnostic_updater - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils image_transport libpng-dev diff --git a/husarion_ugv_lights/src/lights_controller_node.cpp b/husarion_ugv_lights/src/lights_controller_node.cpp index 1092f0ba..7350a6e4 100644 --- a/husarion_ugv_lights/src/lights_controller_node.cpp +++ b/husarion_ugv_lights/src/lights_controller_node.cpp @@ -29,7 +29,7 @@ #include "sensor_msgs/msg/image.hpp" -#include "husarion_ugv_msg/srv/set_led_animation.hpp" +#include "husarion_ugv_msgs/srv/set_led_animation.hpp" #include "husarion_ugv_lights/led_components/led_animations_queue.hpp" #include "husarion_ugv_lights/led_components/led_panel.hpp" diff --git a/husarion_ugv_lights/src/lights_driver_node.cpp b/husarion_ugv_lights/src/lights_driver_node.cpp index 880811a5..7d730328 100644 --- a/husarion_ugv_lights/src/lights_driver_node.cpp +++ b/husarion_ugv_lights/src/lights_driver_node.cpp @@ -29,7 +29,7 @@ #include "sensor_msgs/msg/image.hpp" #include "std_srvs/srv/set_bool.hpp" -#include "husarion_ugv_msg/srv/set_led_brightness.hpp" +#include "husarion_ugv_msgs/srv/set_led_brightness.hpp" #include "husarion_ugv_lights/apa102.hpp" diff --git a/husarion_ugv_lights/test/integration/husarion_ugv_lights.test.py b/husarion_ugv_lights/test/integration/husarion_ugv_lights.test.py index 4aaa1725..2c107baa 100644 --- a/husarion_ugv_lights/test/integration/husarion_ugv_lights.test.py +++ b/husarion_ugv_lights/test/integration/husarion_ugv_lights.test.py @@ -31,8 +31,8 @@ from sensor_msgs.msg import Image from std_srvs.srv import SetBool -from husarion_ugv_msg.msg import LEDAnimation -from husarion_ugv_msg.srv import SetLEDAnimation +from husarion_ugv_msgs.msg import LEDAnimation +from husarion_ugv_msgs.srv import SetLEDAnimation def generate_test_description(): diff --git a/husarion_ugv_lights/test/unit/test_lights_driver_node.cpp b/husarion_ugv_lights/test/unit/test_lights_driver_node.cpp index 5a941e51..770721a0 100644 --- a/husarion_ugv_lights/test/unit/test_lights_driver_node.cpp +++ b/husarion_ugv_lights/test/unit/test_lights_driver_node.cpp @@ -23,7 +23,7 @@ #include #include -#include "husarion_ugv_msg/srv/set_led_brightness.hpp" +#include "husarion_ugv_msgs/srv/set_led_brightness.hpp" #include "husarion_ugv_lights/apa102.hpp" #include "husarion_ugv_lights/lights_driver_node.hpp" @@ -31,7 +31,7 @@ using ImageMsg = sensor_msgs::msg::Image; using SetBoolSrv = std_srvs::srv::SetBool; -using SetLEDBrightnessSrv = husarion_ugv_msg::srv::SetLEDBrightness; +using SetLEDBrightnessSrv = husarion_ugv_msgs::srv::SetLEDBrightness; class MockAPA102 : public husarion_ugv_lights::APA102Interface { diff --git a/husarion_ugv_manager/CMakeLists.txt b/husarion_ugv_manager/CMakeLists.txt index 04783438..60cb7bf5 100644 --- a/husarion_ugv_manager/CMakeLists.txt +++ b/husarion_ugv_manager/CMakeLists.txt @@ -11,7 +11,7 @@ set(PACKAGE_DEPENDENCIES behaviortree_cpp behaviortree_ros2 libssh - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp rclcpp_action @@ -66,7 +66,7 @@ add_executable( ament_target_dependencies( safety_manager_node behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs @@ -79,7 +79,7 @@ add_executable( ament_target_dependencies( lights_manager_node behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs @@ -192,7 +192,7 @@ if(BUILD_TESTING) ${PROJECT_NAME}_test_lights_manager_node behaviortree_cpp behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs @@ -210,7 +210,7 @@ if(BUILD_TESTING) ${PROJECT_NAME}_test_lights_behavior_tree behaviortree_cpp behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs @@ -227,7 +227,7 @@ if(BUILD_TESTING) ${PROJECT_NAME}_test_safety_manager_node behaviortree_cpp behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs @@ -245,7 +245,7 @@ if(BUILD_TESTING) ${PROJECT_NAME}_test_safety_behavior_tree behaviortree_cpp behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils rclcpp sensor_msgs diff --git a/husarion_ugv_manager/CONFIGURATION.md b/husarion_ugv_manager/CONFIGURATION.md index cfe40bd8..e2832891 100644 --- a/husarion_ugv_manager/CONFIGURATION.md +++ b/husarion_ugv_manager/CONFIGURATION.md @@ -67,7 +67,7 @@ For a BehaviorTree project to work correctly, it must contain a tree with correc - `CallSetBoolService` - allows calling the standard **std_srvs/SetBool** ROS service. Provided ports are: - `data` [*input*, *bool*, default: **None**]: service data - **true** or **false** value. - `service_name` [*input*, *string*, default: **None**]: ROS service name. -- `CallSetLedAnimationService` - allows calling custom type **husarion_ugv_msg/SetLEDAnimation** ROS service. The provided ports are: +- `CallSetLedAnimationService` - allows calling custom type **husarion_ugv_msgs/SetLEDAnimation** ROS service. The provided ports are: - `id` [*input*, *unsigned*, default: **None**]: animation ID. - `param` [*input*, *string*, default: **None**]: optional parameter passed to animation. - `repeating` [*input*, *bool*, default: **false**]: indicates if the animation should repeat. @@ -118,16 +118,16 @@ Default constant blackboard entries: - `CRITICAL_BATTERY_THRESHOLD_PERCENT` [*float*, default: **0.1**]: refers to `critical_battery_threshold_percent` ROS parameter. - `LOW_BATTERY_ANIM_PERIOD` [*float*, default: **30.0**]: refers to `low_battery_anim_period` ROS parameter. - `LOW_BATTERY_THRESHOLD_PERCENT` [*float*, default: **0.4**]: refers to `low_battery_threshold_percent` ROS parameter. -- `E_STOP_ANIM_ID` [*unsigned*, value: **0**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::E_STOP`. -- `READY_ANIM_ID` [*unsigned*, value: **1**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::READY`. -- `ERROR_ANIM_ID` [*unsigned*, value: **2**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::ERROR`. -- `MANUAL_ACTION_ANIM_ID` [*unsigned*, value: **3**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::MANUAL_ACTION`. -- `AUTONOMOUS_ACTION_ANIM_ID` [*unsigned*, value: **4**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::AUTONOMOUS_ACTION`. -- `GOAL_ACHIEVED_ANIM_ID` [*unsigned*, value: **5**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::GOAL_ACHIEVED`. -- `LOW_BATTERY_ANIM_ID` [*unsigned*, value: **6**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::LOW_BATTERY`. -- `CRITICAL_BATTERY_ANIM_ID` [*unsigned*, value: **7**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::CRITICAL_BATTERY`. -- `BATTERY_STATE_ANIM_ID` [*unsigned*, value: **8**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::BATTERY_STATE`. -- `CHARGING_BATTERY_ANIM_ID` [*unsigned*, value: **9**]: animation ID constant obtained from `husarion_ugv_msg::LEDAnimation::CHARGING_BATTERY`. +- `E_STOP_ANIM_ID` [*unsigned*, value: **0**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::E_STOP`. +- `READY_ANIM_ID` [*unsigned*, value: **1**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::READY`. +- `ERROR_ANIM_ID` [*unsigned*, value: **2**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::ERROR`. +- `MANUAL_ACTION_ANIM_ID` [*unsigned*, value: **3**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::MANUAL_ACTION`. +- `AUTONOMOUS_ACTION_ANIM_ID` [*unsigned*, value: **4**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::AUTONOMOUS_ACTION`. +- `GOAL_ACHIEVED_ANIM_ID` [*unsigned*, value: **5**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::GOAL_ACHIEVED`. +- `LOW_BATTERY_ANIM_ID` [*unsigned*, value: **6**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::LOW_BATTERY`. +- `CRITICAL_BATTERY_ANIM_ID` [*unsigned*, value: **7**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::CRITICAL_BATTERY`. +- `BATTERY_STATE_ANIM_ID` [*unsigned*, value: **8**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::BATTERY_STATE`. +- `CHARGING_BATTERY_ANIM_ID` [*unsigned*, value: **9**]: animation ID constant obtained from `husarion_ugv_msgs::LEDAnimation::CHARGING_BATTERY`. - `POWER_SUPPLY_STATUS_UNKNOWN` [*unsigned*, value: **0**]: power supply status constant obtained from `sensor_msgs::BatteryState::POWER_SUPPLY_STATUS_UNKNOWN`. - `POWER_SUPPLY_STATUS_CHARGING` [*unsigned*, value: **1**]: power supply status constant obtained from `sensor_msgs::BatteryState::POWER_SUPPLY_STATUS_CHARGING`. - `POWER_SUPPLY_STATUS_DISCHARGING` [*unsigned*, value: **2**]: power supply status constant obtained from `sensor_msgs::BatteryState::POWER_SUPPLY_STATUS_DISCHARGING`. diff --git a/husarion_ugv_manager/README.md b/husarion_ugv_manager/README.md index b58cc32e..8c03979d 100644 --- a/husarion_ugv_manager/README.md +++ b/husarion_ugv_manager/README.md @@ -32,7 +32,7 @@ Node responsible for managing Bumper Lights animation scheduling. #### Service Clients (for Default Trees) -- `~/lights/set_animation` [*husarion_ugv_msg/SetLEDAnimation*]: Allows setting animation on Bumper Lights based on animation ID. +- `~/lights/set_animation` [*husarion_ugv_msgs/SetLEDAnimation*]: Allows setting animation on Bumper Lights based on animation ID. #### Parameters @@ -57,9 +57,9 @@ Node responsible for managing safety features, and software shutdown of componen - `battery/battery_status` [*sensor_msgs/BatteryState*]: State of the internal Battery. - `hardware/e_stop` [*std_msgs/Bool*]: State of emergency stop. -- `hardware/io_state` [*husarion_ugv_msg/IOState*]: State of IO pins. -- `hardware/robot_driver_state` [*husarion_ugv_msg/RobotDriverState*]: State of motor controllers. -- `system_status` [*husarion_ugv_msg/SystemStatus*]: Built-in computer system status, includes the most important computation-related parameters. +- `hardware/io_state` [*husarion_ugv_msgs/IOState*]: State of IO pins. +- `hardware/robot_driver_state` [*husarion_ugv_msgs/RobotDriverState*]: State of motor controllers. +- `system_status` [*husarion_ugv_msgs/SystemStatus*]: Built-in computer system status, includes the most important computation-related parameters. #### Service Clients (for Default Trees) diff --git a/husarion_ugv_manager/include/husarion_ugv_manager/lights_manager_node.hpp b/husarion_ugv_manager/include/husarion_ugv_manager/lights_manager_node.hpp index c2d34593..71ed9aed 100644 --- a/husarion_ugv_manager/include/husarion_ugv_manager/lights_manager_node.hpp +++ b/husarion_ugv_manager/include/husarion_ugv_manager/lights_manager_node.hpp @@ -24,7 +24,7 @@ #include "sensor_msgs/msg/battery_state.hpp" #include "std_msgs/msg/bool.hpp" -#include "husarion_ugv_msg/msg/led_animation.hpp" +#include "husarion_ugv_msgs/msg/led_animation.hpp" #include "husarion_ugv_utils/moving_average.hpp" @@ -35,7 +35,7 @@ namespace husarion_ugv_manager using BatteryStateMsg = sensor_msgs::msg::BatteryState; using BoolMsg = std_msgs::msg::Bool; -using LEDAnimationMsg = husarion_ugv_msg::msg::LEDAnimation; +using LEDAnimationMsg = husarion_ugv_msgs::msg::LEDAnimation; /** * @brief This class is responsible for creating a BehaviorTree responsible for lights management, diff --git a/husarion_ugv_manager/include/husarion_ugv_manager/plugins/action/call_set_led_animation_service_node.hpp b/husarion_ugv_manager/include/husarion_ugv_manager/plugins/action/call_set_led_animation_service_node.hpp index 9ce9ccea..5bf4d25c 100644 --- a/husarion_ugv_manager/include/husarion_ugv_manager/plugins/action/call_set_led_animation_service_node.hpp +++ b/husarion_ugv_manager/include/husarion_ugv_manager/plugins/action/call_set_led_animation_service_node.hpp @@ -20,17 +20,18 @@ #include "behaviortree_ros2/bt_service_node.hpp" #include "rclcpp/rclcpp.hpp" -#include "husarion_ugv_msg/srv/set_led_animation.hpp" +#include "husarion_ugv_msgs/srv/set_led_animation.hpp" namespace husarion_ugv_manager { -class CallSetLedAnimationService : public BT::RosServiceNode +class CallSetLedAnimationService +: public BT::RosServiceNode { public: CallSetLedAnimationService( const std::string & name, const BT::NodeConfig & conf, const BT::RosNodeParams & params) - : BT::RosServiceNode(name, conf, params) + : BT::RosServiceNode(name, conf, params) { } diff --git a/husarion_ugv_manager/include/husarion_ugv_manager/safety_manager_node.hpp b/husarion_ugv_manager/include/husarion_ugv_manager/safety_manager_node.hpp index dcd28a6d..ca1ccc15 100644 --- a/husarion_ugv_manager/include/husarion_ugv_manager/safety_manager_node.hpp +++ b/husarion_ugv_manager/include/husarion_ugv_manager/safety_manager_node.hpp @@ -25,9 +25,9 @@ #include "sensor_msgs/msg/battery_state.hpp" #include "std_msgs/msg/bool.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" -#include "husarion_ugv_msg/msg/robot_driver_state.hpp" -#include "husarion_ugv_msg/msg/system_status.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/robot_driver_state.hpp" +#include "husarion_ugv_msgs/msg/system_status.hpp" #include "husarion_ugv_utils/moving_average.hpp" @@ -38,9 +38,9 @@ namespace husarion_ugv_manager using BatteryStateMsg = sensor_msgs::msg::BatteryState; using BoolMsg = std_msgs::msg::Bool; -using RobotDriverStateMsg = husarion_ugv_msg::msg::RobotDriverState; -using IOStateMsg = husarion_ugv_msg::msg::IOState; -using SystemStatusMsg = husarion_ugv_msg::msg::SystemStatus; +using RobotDriverStateMsg = husarion_ugv_msgs::msg::RobotDriverState; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; +using SystemStatusMsg = husarion_ugv_msgs::msg::SystemStatus; /** * @brief This class is responsible for creating a BehaviorTrees responsible for safety and shutdown diff --git a/husarion_ugv_manager/package.xml b/husarion_ugv_manager/package.xml index 5c110f73..2c65f67f 100644 --- a/husarion_ugv_manager/package.xml +++ b/husarion_ugv_manager/package.xml @@ -19,7 +19,7 @@ behaviortree_cpp behaviortree_ros2 - husarion_ugv_msg + husarion_ugv_msgs husarion_ugv_utils iputils-ping libboost-dev diff --git a/husarion_ugv_manager/test/plugins/action/test_call_set_led_animation_service_node.cpp b/husarion_ugv_manager/test/plugins/action/test_call_set_led_animation_service_node.cpp index a6717981..2c3969c8 100644 --- a/husarion_ugv_manager/test/plugins/action/test_call_set_led_animation_service_node.cpp +++ b/husarion_ugv_manager/test/plugins/action/test_call_set_led_animation_service_node.cpp @@ -28,14 +28,14 @@ class TestCallSetLedAnimationService { public: void ServiceCallback( - const husarion_ugv_msg::srv::SetLEDAnimation::Request::SharedPtr request, - husarion_ugv_msg::srv::SetLEDAnimation::Response::SharedPtr response, const bool success, + const husarion_ugv_msgs::srv::SetLEDAnimation::Request::SharedPtr request, + husarion_ugv_msgs::srv::SetLEDAnimation::Response::SharedPtr response, const bool success, const std::size_t id, const bool repeating); }; void TestCallSetLedAnimationService::ServiceCallback( - const husarion_ugv_msg::srv::SetLEDAnimation::Request::SharedPtr request, - husarion_ugv_msg::srv::SetLEDAnimation::Response::SharedPtr response, const bool success, + const husarion_ugv_msgs::srv::SetLEDAnimation::Request::SharedPtr request, + husarion_ugv_msgs::srv::SetLEDAnimation::Response::SharedPtr response, const bool success, const std::size_t id, const bool repeating) { response->message = success ? "Successfully callback pass!" : "Failed callback pass!"; @@ -98,7 +98,7 @@ TEST_F(TestCallSetLedAnimationService, GoodSetLedAnimationCallServiceSuccessWith CreateTree("CallSetLedAnimationService", service); auto & tree = GetTree(); - using husarion_ugv_msg::srv::SetLEDAnimation; + using husarion_ugv_msgs::srv::SetLEDAnimation; CreateService( "set_led_animation", [&]( @@ -121,7 +121,7 @@ TEST_F(TestCallSetLedAnimationService, GoodSetLedAnimationCallServiceSuccessWith CreateTree("CallSetLedAnimationService", service); auto & tree = GetTree(); - using husarion_ugv_msg::srv::SetLEDAnimation; + using husarion_ugv_msgs::srv::SetLEDAnimation; CreateService( "set_led_animation", [&]( @@ -144,7 +144,7 @@ TEST_F(TestCallSetLedAnimationService, GoodSetLedAnimationCallServiceSuccessWith CreateTree("CallSetLedAnimationService", service); auto & tree = GetTree(); - using husarion_ugv_msg::srv::SetLEDAnimation; + using husarion_ugv_msgs::srv::SetLEDAnimation; CreateService( "set_led_animation", [&]( @@ -167,7 +167,7 @@ TEST_F(TestCallSetLedAnimationService, WrongSetLedAnimationCallServiceFailure) CreateTree("CallSetLedAnimationService", service); auto & tree = GetTree(); - using husarion_ugv_msg::srv::SetLEDAnimation; + using husarion_ugv_msgs::srv::SetLEDAnimation; CreateService( "set_led_animation", [&]( diff --git a/husarion_ugv_manager/test/test_lights_behavior_tree.cpp b/husarion_ugv_manager/test/test_lights_behavior_tree.cpp index de0d1c4d..c5b49643 100644 --- a/husarion_ugv_manager/test/test_lights_behavior_tree.cpp +++ b/husarion_ugv_manager/test/test_lights_behavior_tree.cpp @@ -28,16 +28,16 @@ #include "sensor_msgs/msg/battery_state.hpp" #include "std_msgs/msg/bool.hpp" -#include "husarion_ugv_msg/msg/led_animation.hpp" -#include "husarion_ugv_msg/srv/set_led_animation.hpp" +#include "husarion_ugv_msgs/msg/led_animation.hpp" +#include "husarion_ugv_msgs/srv/set_led_animation.hpp" #include #include using BoolMsg = std_msgs::msg::Bool; using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using SetLEDAnimationSrv = husarion_ugv_msg::srv::SetLEDAnimation; -using LEDAnimationMsg = husarion_ugv_msg::msg::LEDAnimation; +using SetLEDAnimationSrv = husarion_ugv_msgs::srv::SetLEDAnimation; +using LEDAnimationMsg = husarion_ugv_msgs::msg::LEDAnimation; class LightsManagerNodeWrapper : public husarion_ugv_manager::LightsManagerNode { diff --git a/husarion_ugv_manager/test/test_safety_behavior_tree.cpp b/husarion_ugv_manager/test/test_safety_behavior_tree.cpp index 9ddb0166..bfae5ac1 100644 --- a/husarion_ugv_manager/test/test_safety_behavior_tree.cpp +++ b/husarion_ugv_manager/test/test_safety_behavior_tree.cpp @@ -30,16 +30,16 @@ #include "std_srvs/srv/set_bool.hpp" #include "std_srvs/srv/trigger.hpp" -#include "husarion_ugv_msg/msg/io_state.hpp" -#include "husarion_ugv_msg/msg/system_status.hpp" +#include "husarion_ugv_msgs/msg/io_state.hpp" +#include "husarion_ugv_msgs/msg/system_status.hpp" #include #include using BoolMsg = std_msgs::msg::Bool; using BatteryStateMsg = sensor_msgs::msg::BatteryState; -using IOStateMsg = husarion_ugv_msg::msg::IOState; -using SystemStatusMsg = husarion_ugv_msg::msg::SystemStatus; +using IOStateMsg = husarion_ugv_msgs::msg::IOState; +using SystemStatusMsg = husarion_ugv_msgs::msg::SystemStatus; using SetBoolSrv = std_srvs::srv::SetBool; using TriggerSrv = std_srvs::srv::Trigger; diff --git a/husarion_ugv_manager/test/test_safety_manager_node.cpp b/husarion_ugv_manager/test/test_safety_manager_node.cpp index 62c144df..54033bff 100644 --- a/husarion_ugv_manager/test/test_safety_manager_node.cpp +++ b/husarion_ugv_manager/test/test_safety_manager_node.cpp @@ -194,10 +194,10 @@ TEST_F(TestSafetyManagerNode, DriverStateCBBlackboardUpdate) { const float expected_temp = 21.0; - husarion_ugv_msg::msg::DriverStateNamed driver_state; + husarion_ugv_msgs::msg::DriverStateNamed driver_state; driver_state.state.temperature = expected_temp; - auto driver_state_msg = husarion_ugv_msg::msg::RobotDriverState(); + auto driver_state_msg = husarion_ugv_msgs::msg::RobotDriverState(); driver_state_msg.driver_states.push_back(driver_state); husarion_ugv_utils::test_utils::PublishAndSpin( @@ -212,7 +212,7 @@ TEST_F(TestSafetyManagerNode, IOStateCBBlackboardUpdate) const bool expected_aux_state = true; const bool expected_fan_state = true; - auto io_state_msg = husarion_ugv_msg::msg::IOState(); + auto io_state_msg = husarion_ugv_msgs::msg::IOState(); io_state_msg.aux_power = expected_aux_state; io_state_msg.fan = expected_fan_state; @@ -228,7 +228,7 @@ TEST_F(TestSafetyManagerNode, SystemStatusCBBlackboardUpdate) { const float expected_temp = 21.0; - auto system_status_msg = husarion_ugv_msg::msg::SystemStatus(); + auto system_status_msg = husarion_ugv_msgs::msg::SystemStatus(); system_status_msg.cpu_temp = expected_temp; husarion_ugv_utils::test_utils::PublishAndSpin( diff --git a/husarion_ugv_manager/test/utils/plugin_test_utils.hpp b/husarion_ugv_manager/test/utils/plugin_test_utils.hpp index d323b9a0..9b95e0a5 100644 --- a/husarion_ugv_manager/test/utils/plugin_test_utils.hpp +++ b/husarion_ugv_manager/test/utils/plugin_test_utils.hpp @@ -30,7 +30,7 @@ #include "std_srvs/srv/set_bool.hpp" #include "std_srvs/srv/trigger.hpp" -#include "husarion_ugv_msg/srv/set_led_animation.hpp" +#include "husarion_ugv_msgs/srv/set_led_animation.hpp" #include "husarion_ugv_manager/plugins/action/call_set_bool_service_node.hpp" #include "husarion_ugv_manager/plugins/action/call_set_led_animation_service_node.hpp" diff --git a/husarion_ugv_msg/msg/DriverState.msg b/husarion_ugv_msg/msg/DriverState.msg deleted file mode 100644 index 535a33ca..00000000 --- a/husarion_ugv_msg/msg/DriverState.msg +++ /dev/null @@ -1,14 +0,0 @@ -float32 voltage -float32 current -float32 temperature -float32 heatsink_temperature - -husarion_ugv_msg/FaultFlag fault_flag -husarion_ugv_msg/ScriptFlag script_flag -husarion_ugv_msg/RuntimeError channel_1_motor_runtime_error -husarion_ugv_msg/RuntimeError channel_2_motor_runtime_error - -bool motor_states_data_timed_out -bool driver_state_data_timed_out -bool can_error -bool heartbeat_timeout diff --git a/husarion_ugv_msg/srv/SetLEDImageAnimation.srv b/husarion_ugv_msg/srv/SetLEDImageAnimation.srv deleted file mode 100644 index 98474a61..00000000 --- a/husarion_ugv_msg/srv/SetLEDImageAnimation.srv +++ /dev/null @@ -1,7 +0,0 @@ -husarion_ugv_msg/LEDImageAnimation front -husarion_ugv_msg/LEDImageAnimation rear -bool interrupting -bool repeating ---- -bool success -string message diff --git a/husarion_ugv_msg/CHANGELOG.rst b/husarion_ugv_msgs/CHANGELOG.rst similarity index 100% rename from husarion_ugv_msg/CHANGELOG.rst rename to husarion_ugv_msgs/CHANGELOG.rst diff --git a/husarion_ugv_msg/CMakeLists.txt b/husarion_ugv_msgs/CMakeLists.txt similarity index 96% rename from husarion_ugv_msg/CMakeLists.txt rename to husarion_ugv_msgs/CMakeLists.txt index ab71cbde..a6261d0a 100644 --- a/husarion_ugv_msg/CMakeLists.txt +++ b/husarion_ugv_msgs/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2) -project(husarion_ugv_msg) +project(husarion_ugv_msgs) if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-Wall -Wextra -Wpedantic) diff --git a/husarion_ugv_msg/README.md b/husarion_ugv_msgs/README.md similarity index 72% rename from husarion_ugv_msg/README.md rename to husarion_ugv_msgs/README.md index a0ac941e..5c72d2a5 100644 --- a/husarion_ugv_msg/README.md +++ b/husarion_ugv_msgs/README.md @@ -1,3 +1,3 @@ -# husarion_ugv_msg +# husarion_ugv_msgs Custom ROS messages and services for Panther robot. diff --git a/husarion_ugv_msg/msg/ChargingStatus.msg b/husarion_ugv_msgs/msg/ChargingStatus.msg similarity index 100% rename from husarion_ugv_msg/msg/ChargingStatus.msg rename to husarion_ugv_msgs/msg/ChargingStatus.msg diff --git a/husarion_ugv_msgs/msg/DriverState.msg b/husarion_ugv_msgs/msg/DriverState.msg new file mode 100644 index 00000000..178e2639 --- /dev/null +++ b/husarion_ugv_msgs/msg/DriverState.msg @@ -0,0 +1,14 @@ +float32 voltage +float32 current +float32 temperature +float32 heatsink_temperature + +husarion_ugv_interfaces/FaultFlag fault_flag +husarion_ugv_interfaceserfaces/ScriptFlag script_flag +husarion_ugv_interfaceserfaces/RuntimeError channel_1_motor_runtime_error +husarion_ugv_interfaceserfaces/RuntimeError channel_2_motor_runtime_error + +bool motor_states_data_timed_out +bool driver_state_data_timed_out +bool can_error +bool heartbeat_timeout diff --git a/husarion_ugv_msg/msg/DriverStateNamed.msg b/husarion_ugv_msgs/msg/DriverStateNamed.msg similarity index 73% rename from husarion_ugv_msg/msg/DriverStateNamed.msg rename to husarion_ugv_msgs/msg/DriverStateNamed.msg index 6a3528b9..be91b417 100644 --- a/husarion_ugv_msg/msg/DriverStateNamed.msg +++ b/husarion_ugv_msgs/msg/DriverStateNamed.msg @@ -3,4 +3,4 @@ string NAME_FRONT = "front" string NAME_REAR = "rear" string name -husarion_ugv_msg/DriverState state +husarion_ugv_msgs/DriverState state diff --git a/husarion_ugv_msg/msg/FaultFlag.msg b/husarion_ugv_msgs/msg/FaultFlag.msg similarity index 100% rename from husarion_ugv_msg/msg/FaultFlag.msg rename to husarion_ugv_msgs/msg/FaultFlag.msg diff --git a/husarion_ugv_msg/msg/IOState.msg b/husarion_ugv_msgs/msg/IOState.msg similarity index 100% rename from husarion_ugv_msg/msg/IOState.msg rename to husarion_ugv_msgs/msg/IOState.msg diff --git a/husarion_ugv_msg/msg/LEDAnimation.msg b/husarion_ugv_msgs/msg/LEDAnimation.msg similarity index 100% rename from husarion_ugv_msg/msg/LEDAnimation.msg rename to husarion_ugv_msgs/msg/LEDAnimation.msg diff --git a/husarion_ugv_msg/msg/LEDAnimationQueue.msg b/husarion_ugv_msgs/msg/LEDAnimationQueue.msg similarity index 100% rename from husarion_ugv_msg/msg/LEDAnimationQueue.msg rename to husarion_ugv_msgs/msg/LEDAnimationQueue.msg diff --git a/husarion_ugv_msg/msg/LEDImageAnimation.msg b/husarion_ugv_msgs/msg/LEDImageAnimation.msg similarity index 100% rename from husarion_ugv_msg/msg/LEDImageAnimation.msg rename to husarion_ugv_msgs/msg/LEDImageAnimation.msg diff --git a/husarion_ugv_msg/msg/RobotDriverState.msg b/husarion_ugv_msgs/msg/RobotDriverState.msg similarity index 71% rename from husarion_ugv_msg/msg/RobotDriverState.msg rename to husarion_ugv_msgs/msg/RobotDriverState.msg index 3be5deae..1b9cc2b0 100644 --- a/husarion_ugv_msg/msg/RobotDriverState.msg +++ b/husarion_ugv_msgs/msg/RobotDriverState.msg @@ -1,6 +1,6 @@ std_msgs/Header header -husarion_ugv_msg/DriverStateNamed[] driver_states +husarion_ugv_msgs/DriverStateNamed[] driver_states bool error bool write_pdo_cmds_error diff --git a/husarion_ugv_msg/msg/RuntimeError.msg b/husarion_ugv_msgs/msg/RuntimeError.msg similarity index 100% rename from husarion_ugv_msg/msg/RuntimeError.msg rename to husarion_ugv_msgs/msg/RuntimeError.msg diff --git a/husarion_ugv_msg/msg/ScriptFlag.msg b/husarion_ugv_msgs/msg/ScriptFlag.msg similarity index 100% rename from husarion_ugv_msg/msg/ScriptFlag.msg rename to husarion_ugv_msgs/msg/ScriptFlag.msg diff --git a/husarion_ugv_msg/msg/SystemStatus.msg b/husarion_ugv_msgs/msg/SystemStatus.msg similarity index 100% rename from husarion_ugv_msg/msg/SystemStatus.msg rename to husarion_ugv_msgs/msg/SystemStatus.msg diff --git a/husarion_ugv_msg/package.xml b/husarion_ugv_msgs/package.xml similarity index 97% rename from husarion_ugv_msg/package.xml rename to husarion_ugv_msgs/package.xml index ae503181..44d44a1c 100644 --- a/husarion_ugv_msg/package.xml +++ b/husarion_ugv_msgs/package.xml @@ -1,7 +1,7 @@ - husarion_ugv_msg + husarion_ugv_msgs 2.1.2 Custom messages for Husarion UGV Husarion diff --git a/husarion_ugv_msg/srv/SetLEDAnimation.srv b/husarion_ugv_msgs/srv/SetLEDAnimation.srv similarity index 53% rename from husarion_ugv_msg/srv/SetLEDAnimation.srv rename to husarion_ugv_msgs/srv/SetLEDAnimation.srv index 7234925d..d3bea505 100644 --- a/husarion_ugv_msg/srv/SetLEDAnimation.srv +++ b/husarion_ugv_msgs/srv/SetLEDAnimation.srv @@ -1,4 +1,4 @@ -husarion_ugv_msg/LEDAnimation animation +husarion_ugv_msgs/LEDAnimation animation bool repeating --- bool success diff --git a/husarion_ugv_msg/srv/SetLEDBrightness.srv b/husarion_ugv_msgs/srv/SetLEDBrightness.srv similarity index 100% rename from husarion_ugv_msg/srv/SetLEDBrightness.srv rename to husarion_ugv_msgs/srv/SetLEDBrightness.srv diff --git a/husarion_ugv_msgs/srv/SetLEDImageAnimation.srv b/husarion_ugv_msgs/srv/SetLEDImageAnimation.srv new file mode 100644 index 00000000..f429607b --- /dev/null +++ b/husarion_ugv_msgs/srv/SetLEDImageAnimation.srv @@ -0,0 +1,7 @@ +husarion_ugv_msgs/LEDImageAnimation front +husarion_ugv_msgs/LEDImageAnimation rear +bool interrupting +bool repeating +--- +bool success +string message