Skip to content

Fix file name for include guard#681

Merged
bmagyar merged 1 commit intoros-controls:masterfrom
christophfroehlich:fix_format
Jun 22, 2023
Merged

Fix file name for include guard#681
bmagyar merged 1 commit intoros-controls:masterfrom
christophfroehlich:fix_format

Conversation

@christophfroehlich
Copy link
Copy Markdown
Member

Otherwise cpplint complains

Using '--root=/workspaces/ros2_rolling_ws/src/ros2_controllers/admittance_controller/test' argument

/workspaces/ros2_rolling_ws/src/ros2_controllers/admittance_controller/test/6d_robot_description.hpp:15: #ifndef header guard has wrong style, please use: 6D_ROBOT_DESCRIPTION_HPP_ [build/header_guard] [5]
/workspaces/ros2_rolling_ws/src/ros2_controllers/admittance_controller/test/6d_robot_description.hpp:313: #endif line should be "#endif // 6D_ROBOT_DESCRIPTION_HPP_" [build/header_guard] [5]

and the preprocessor macro cannot start with a number.

@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Merging #681 (4bac6a8) into master (e7f9962) will increase coverage by 0.75%.
The diff coverage is 34.91%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@            Coverage Diff             @@
##           master     #681      +/-   ##
==========================================
+ Coverage   35.78%   36.53%   +0.75%     
==========================================
  Files         189        7     -182     
  Lines       17570      676   -16894     
  Branches    11592      357   -11235     
==========================================
- Hits         6287      247    -6040     
+ Misses        994      134     -860     
+ Partials    10289      295    -9994     
Flag Coverage Δ
unittests 36.53% <34.91%> (+0.75%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ontroller/test/test_load_diff_drive_controller.cpp 11.11% <0.00%> (ø)
diff_drive_controller/src/odometry.cpp 42.16% <11.11%> (ø)
diff_drive_controller/src/speed_limiter.cpp 46.55% <11.11%> (ø)
...ive_controller/test/test_diff_drive_controller.cpp 17.62% <12.08%> (ø)
...iff_drive_controller/src/diff_drive_controller.cpp 47.09% <46.88%> (ø)
...de/diff_drive_controller/diff_drive_controller.hpp 100.00% <100.00%> (ø)
...troller/include/diff_drive_controller/odometry.hpp 100.00% <100.00%> (ø)

... and 189 files with indirect coverage changes

@christophfroehlich
Copy link
Copy Markdown
Member Author

@bmagyar do you see more info why the ament_lint_cmake job failed? I can't access any docs.

After pre-commit autoupdate I get

 $ pre-commit run ament_lint_cmake --all
ament_lint_cmake.........................................................Passed

@bmagyar
Copy link
Copy Markdown
Member

bmagyar commented Jun 22, 2023

It was just flaky, happened a few times recently

@bmagyar bmagyar merged commit c619aac into ros-controls:master Jun 22, 2023
@christophfroehlich christophfroehlich deleted the fix_format branch June 22, 2023 13:23
@christophfroehlich christophfroehlich added the backport-humble Triggers PR backport to ROS 2 humble. label Aug 3, 2023
mergify bot pushed a commit that referenced this pull request Aug 3, 2023
(cherry picked from commit c619aac)
bmagyar pushed a commit that referenced this pull request Aug 3, 2023
(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
bmagyar pushed a commit that referenced this pull request Aug 5, 2023
* Fix file name for include guard (backport #681)

(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

* Activate AdmittanceControllerTestParameterizedInvalidParameters (#711) (#733)

* [JTC] Re-enabling test, bugfixing and hardening. Adding a parameter to define when trajectories with non-zero velocity at the end are used. (backport #705) (#706)

* Enable effort rejection test

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
bmagyar pushed a commit that referenced this pull request Aug 5, 2023
* Small improvement in remapping (#393) (#724)

* Fix file name for include guard (backport #681)

(cherry picked from commit c619aac)

Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>

* Activate AdmittanceControllerTestParameterizedInvalidParameters (#711) (#733)

* [JTC] Re-enabling test, bugfixing and hardening. Adding a parameter to define when trajectories with non-zero velocity at the end are used. (backport #705) (#706)

* Add state_publish_rate parameter

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-humble Triggers PR backport to ROS 2 humble.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants