Skip to content

Commit 549fabe

Browse files
evan-palmerevan-palmer
committed
Revert "updated gersemi and addressed linter errors"
This reverts commit 2e18ab9.
1 parent 2e18ab9 commit 549fabe

File tree

10 files changed

+40
-41
lines changed

10 files changed

+40
-41
lines changed

‎controller_common/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ target_sources(
1818
PRIVATE src/common.cpp
1919
PUBLIC
2020
FILE_SET HEADERS
21-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
22-
FILES
23-
${CMAKE_CURRENT_SOURCE_DIR}/include/controller_common/common.hpp
21+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
22+
FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/controller_common/common.hpp
2423
)
2524
target_compile_features(controller_common PUBLIC cxx_std_23)
2625
target_link_libraries(

‎controller_coordinator/CMakeLists.txt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,11 @@ target_link_libraries(
2929
)
3030

3131
install(
32-
TARGETS controller_coordinator controller_coordinator_parameters
33-
DESTINATION lib/controller_coordinator
32+
TARGETS
33+
controller_coordinator
34+
controller_coordinator_parameters
35+
DESTINATION
36+
lib/controller_coordinator
3437
)
3538

3639
ament_package()

‎controller_coordinator/src/coordinator.cpp‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,16 @@ ControllerCoordinator::ControllerCoordinator()
8484
[this](
8585
const std::shared_ptr<rmw_request_id_t> /*request_header*/,
8686
const std::shared_ptr<std_srvs::srv::SetBool::Request> request,
87-
const std::shared_ptr<std_srvs::srv::SetBool::Response> response) { // NOLINT
87+
const std::shared_ptr<std_srvs::srv::SetBool::Response> response) {
8888
response->success = true;
8989
if (request->data) {
9090
RCLCPP_INFO(this->get_logger(), "Activating thruster hardware interface and controllers"); // NOLINT
9191

9292
// activate the hardware interface
9393
hardware_client_->async_send_request(
9494
activate_hardware_request_,
95-
[this, &response](rclcpp::Client<controller_manager_msgs::srv::SetHardwareComponentState>::SharedFuture
96-
result_response) { // NOLINT
95+
[this, &response](
96+
rclcpp::Client<controller_manager_msgs::srv::SetHardwareComponentState>::SharedFuture result_response) {
9797
const auto & result = result_response.get();
9898
if (result->ok) {
9999
RCLCPP_INFO(this->get_logger(), "Successfully activated thruster hardware interface"); // NOLINT
@@ -108,8 +108,7 @@ ControllerCoordinator::ControllerCoordinator()
108108
switch_controller_client_->async_send_request(
109109
activate_controllers_request_,
110110
[this,
111-
&response](
112-
rclcpp::Client<controller_manager_msgs::srv::SwitchController>::SharedFuture result_response) { // NOLINT
111+
&response](rclcpp::Client<controller_manager_msgs::srv::SwitchController>::SharedFuture result_response) {
113112
const auto & result = result_response.get();
114113
if (result->ok) {
115114
RCLCPP_INFO(this->get_logger(), "Successfully activated controllers"); // NOLINT
@@ -125,8 +124,8 @@ ControllerCoordinator::ControllerCoordinator()
125124
// deactivate the hardware interface
126125
hardware_client_->async_send_request(
127126
deactivate_hardware_request_,
128-
[this, &response](rclcpp::Client<controller_manager_msgs::srv::SetHardwareComponentState>::SharedFuture
129-
result_response) { // NOLINT
127+
[this, &response](
128+
rclcpp::Client<controller_manager_msgs::srv::SetHardwareComponentState>::SharedFuture result_response) {
130129
const auto & result = result_response.get();
131130
if (result->ok) {
132131
RCLCPP_INFO(this->get_logger(), "Successfully deactivated thruster hardware interface"); // NOLINT
@@ -141,8 +140,7 @@ ControllerCoordinator::ControllerCoordinator()
141140
switch_controller_client_->async_send_request(
142141
deactivate_controllers_request_,
143142
[this,
144-
&response](
145-
rclcpp::Client<controller_manager_msgs::srv::SwitchController>::SharedFuture result_response) { // NOLINT
143+
&response](rclcpp::Client<controller_manager_msgs::srv::SwitchController>::SharedFuture result_response) {
146144
const auto & result = result_response.get();
147145
if (result->ok) {
148146
RCLCPP_INFO(this->get_logger(), "Successfully deactivated controllers"); // NOLINT

‎end_effector_trajectory_controller/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ target_sources(
3636
PRIVATE src/end_effector_trajectory_controller.cpp src/trajectory.cpp
3737
PUBLIC
3838
FILE_SET HEADERS
39-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
40-
FILES
41-
${CMAKE_CURRENT_SOURCE_DIR}/include/end_effector_trajectory_controller/end_effector_trajectory_controller.hpp
42-
${CMAKE_CURRENT_SOURCE_DIR}/include/end_effector_trajectory_controller/trajectory.hpp
39+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
40+
FILES
41+
${CMAKE_CURRENT_SOURCE_DIR}/include/end_effector_trajectory_controller/end_effector_trajectory_controller.hpp
42+
${CMAKE_CURRENT_SOURCE_DIR}/include/end_effector_trajectory_controller/trajectory.hpp
4343
)
4444
target_compile_features(end_effector_trajectory_controller PUBLIC cxx_std_23)
4545
target_link_libraries(

‎ik_solvers/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ target_sources(
3030
PRIVATE src/solver.cpp
3131
PUBLIC
3232
FILE_SET HEADERS
33-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
34-
FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/solver.hpp
33+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
34+
FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/solver.hpp
3535
)
3636
target_link_libraries(
3737
solver_base
@@ -52,9 +52,9 @@ target_sources(
5252
PRIVATE src/task_priority_solver.cpp src/pseudoinverse.cpp
5353
PUBLIC
5454
FILE_SET HEADERS
55-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
56-
FILES
57-
${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/task_priority_solver.hpp
55+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
56+
FILES
57+
${CMAKE_CURRENT_SOURCE_DIR}/include/ik_solvers/task_priority_solver.hpp
5858
)
5959
target_compile_features(ik_solvers PUBLIC cxx_std_23)
6060
target_link_libraries(

‎thruster_allocation_matrix_controller/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ target_sources(
3333
PRIVATE src/thruster_allocation_matrix_controller.cpp
3434
PUBLIC
3535
FILE_SET HEADERS
36-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
37-
FILES
38-
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
36+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
37+
FILES
38+
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_allocation_matrix_controller/thruster_allocation_matrix_controller.hpp
3939
)
4040
target_compile_features(thruster_allocation_matrix_controller PUBLIC cxx_std_23)
4141
target_link_libraries(

‎thruster_controllers/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ target_sources(
3737
src/gz_passthrough_controller.cpp
3838
PUBLIC
3939
FILE_SET HEADERS
40-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
41-
FILES
42-
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/polynomial_thrust_curve_controller.hpp
43-
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/rotation_rate_controller.hpp
44-
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/gz_passthrough_controller.hpp
40+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
41+
FILES
42+
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/polynomial_thrust_curve_controller.hpp
43+
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/rotation_rate_controller.hpp
44+
${CMAKE_CURRENT_SOURCE_DIR}/include/thruster_controllers/gz_passthrough_controller.hpp
4545
)
4646
target_compile_features(thruster_controllers PUBLIC cxx_std_23)
4747
target_link_libraries(

‎topic_sensors/CMakeLists.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ target_sources(
2323
PRIVATE src/odom_sensor.cpp
2424
PUBLIC
2525
FILE_SET HEADERS
26-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
27-
FILES
28-
${CMAKE_CURRENT_SOURCE_DIR}/include/topic_sensors/odom_sensor.hpp
26+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
27+
FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/topic_sensors/odom_sensor.hpp
2928
)
3029
target_compile_features(topic_sensors PUBLIC cxx_std_23)
3130
target_link_libraries(

‎velocity_controllers/CMakeLists.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ target_sources(
4242
src/adaptive_integral_terminal_sliding_mode_controller.cpp
4343
PUBLIC
4444
FILE_SET HEADERS
45-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
46-
FILES
47-
${CMAKE_CURRENT_SOURCE_DIR}/include/velocity_controllers/integral_sliding_mode_controller.hpp
48-
${CMAKE_CURRENT_SOURCE_DIR}/include/velocity_controllers/adaptive_integral_terminal_sliding_mode_controller.hpp
45+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
46+
FILES
47+
${CMAKE_CURRENT_SOURCE_DIR}/include/velocity_controllers/integral_sliding_mode_controller.hpp
48+
${CMAKE_CURRENT_SOURCE_DIR}/include/velocity_controllers/adaptive_integral_terminal_sliding_mode_controller.hpp
4949
)
5050
target_compile_features(velocity_controllers PUBLIC cxx_std_23)
5151
target_link_libraries(

‎whole_body_controllers/CMakeLists.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ target_sources(
3737
PRIVATE src/ik_controller.cpp
3838
PUBLIC
3939
FILE_SET HEADERS
40-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
41-
FILES
42-
${CMAKE_CURRENT_SOURCE_DIR}/include/whole_body_controllers/ik_controller.hpp
40+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include
41+
FILES
42+
${CMAKE_CURRENT_SOURCE_DIR}/include/whole_body_controllers/ik_controller.hpp
4343
)
4444
target_compile_features(whole_body_controllers PUBLIC cxx_std_23)
4545
target_link_libraries(

0 commit comments

Comments
 (0)