Skip to content

Commit 6c671e4

Browse files
committed
Identation, alphabetizing, usage description comment, empty destructor removal.
1 parent e40142c commit 6c671e4

File tree

3 files changed

+13
-15
lines changed

3 files changed

+13
-15
lines changed

ign_ros2_control/CMakeLists.txt

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ find_package(ament_cmake REQUIRED)
2020
find_package(ament_index_cpp REQUIRED)
2121
find_package(controller_manager REQUIRED)
2222
find_package(hardware_interface REQUIRED)
23+
find_package(generate_parameter_library REQUIRED)
2324
find_package(pluginlib REQUIRED)
2425
find_package(rclcpp REQUIRED)
2526
find_package(yaml_cpp_vendor REQUIRED)
26-
find_package(generate_parameter_library REQUIRED)
2727

2828
generate_parameter_library(ign_ros2_control_parameters
2929
src/ign_ros2_control_parameters.yaml
@@ -48,9 +48,9 @@ elseif("$ENV{IGNITION_VERSION}" STREQUAL "fortress")
4848
find_package(ignition-plugin1 REQUIRED COMPONENTS register)
4949
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
5050
add_library(mimic-joint-system SHARED src/MimicJointSystem.cc)
51-
target_link_libraries(mimic-joint-system
52-
PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
53-
PRIVATE ignition-gazebo6::ignition-gazebo6)
51+
target_link_libraries(mimic-joint-system
52+
PRIVATE ignition-plugin${IGN_PLUGIN_VER}::ignition-plugin${IGN_PLUGIN_VER}
53+
PRIVATE ignition-gazebo6::ignition-gazebo6)
5454
install(TARGETS mimic-joint-system
5555
DESTINATION lib)
5656

@@ -64,9 +64,8 @@ else()
6464
set(IGN_PLUGIN_VER ${ignition-plugin1_VERSION_MAJOR})
6565
add_library(mimic-joint-system SHARED src/MimicJointSystem.cc)
6666
target_link_libraries(mimic-joint-system
67-
ignition-gazebo${IGN_GAZEBO_VER}::core
68-
ignition-plugin${IGN_PLUGIN_VER}::register
69-
)
67+
ignition-gazebo${IGN_GAZEBO_VER}::core
68+
ignition-plugin${IGN_PLUGIN_VER}::register)
7069
install(TARGETS mimic-joint-system
7170
DESTINATION lib)
7271
endif()

ign_ros2_control/include/ign_ros2_control/MimicJointSystem.hh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
#include <ignition/gazebo/System.hh>
3434

35+
// This is an example to go in your urdf (is that correct?)
3536
//! <plugin filename="mimic-joint-system" name="ign_ros2_control::MimicJointSystem">
3637
//! <joint_name>joint_name</joint_name>
3738
//! <mimic_joint_name>mimic_joint_name</mimic_joint_name>
@@ -59,18 +60,16 @@ namespace ign_ros2_control
5960
// This class is a system.
6061
public ignition::gazebo::System,
6162
public ignition::gazebo::ISystemConfigure,
62-
// This class also implements the ISystemPreUpdate, ISystemUpdate,
63+
// This class also implements the ISystemPreUpdate, ISystemUpdate,
6364
// and ISystemPostUpdate interfaces.
6465
public ignition::gazebo::ISystemPreUpdate,
6566
public ignition::gazebo::ISystemUpdate,
6667
public ignition::gazebo::ISystemPostUpdate
6768
{
6869
public: MimicJointSystem();
6970

70-
public: ~MimicJointSystem() override=default;
71-
72-
// Documentation inherited
73-
public: void Configure(const ignition::gazebo::Entity &_entity,
71+
// Documentation inherited
72+
public: void Configure(const ignition::gazebo::Entity &_entity,
7473
const std::shared_ptr<const sdf::Element> &_sdf,
7574
ignition::gazebo::EntityComponentManager &_ecm,
7675
ignition::gazebo::EventManager &_eventMgr) override;

ign_ros2_control/include/ign_ros2_control/ign_system.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
#include <vector>
2323

2424
#include "ign_ros2_control/ign_system_interface.hpp"
25-
#include "rclcpp_lifecycle/state.hpp"
26-
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
27-
2825
#include "ign_ros2_control_parameters.hpp"
2926

3027
#include "rclcpp/executors/single_threaded_executor.hpp"
28+
#include "rclcpp_lifecycle/state.hpp"
29+
#include "rclcpp_lifecycle/node_interfaces/lifecycle_node_interface.hpp"
30+
3131

3232
namespace ign_ros2_control
3333
{

0 commit comments

Comments
 (0)