Merge branch 'master' into fix_multiple_cleanup_on_unconfigured_compo…

…nents
ros-controls · Dec 14, 2023 · 5184402 · 5184402
2 parents 653f2d0 + 9055b5b
commit 5184402
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/hardware_interface/doc/mock_components_userdoc.rst b/hardware_interface/doc/mock_components_userdoc.rst
@@ -14,7 +14,7 @@ The main intention is to reduce debugging time on the physical hardware and boos
 
 Generic System
 ^^^^^^^^^^^^^^
-The component implements ``hardware_interface::SystemInterface>`` supporting command and state interfaces.
+The component implements ``hardware_interface::SystemInterface`` supporting command and state interfaces.
 For more information about hardware components check :ref:`detailed documentation <overview_hardware_components>`.
 
 Features:

diff --git a/hardware_interface/src/sensor.cpp b/hardware_interface/src/sensor.cpp
@@ -201,7 +201,7 @@ return_type Sensor::read(const rclcpp::Time & time, const rclcpp::Duration & per
   {
     return return_type::OK;
   }
-  
+
   if (
     impl_->get_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE ||
     impl_->get_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE)
-Original file line number
+Diff line change
@@ Expand Up @@
       {
         return return_type::OK;
       }
       if (
         impl_->get_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_INACTIVE ||
         impl_->get_state().id() == lifecycle_msgs::msg::State::PRIMARY_STATE_ACTIVE)
@@ Expand Down @@