Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Windows Compilation Issues in joint_trajectory_controller and pid_controller (master branch) (backport #1330) #1333

Merged
merged 1 commit into from
Oct 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2024

Description:

This pull request addresses compilation issues encountered in the joint_trajectory_controller and pid_controller when building on Windows. The changes ensure compatibility with the Windows environment and improve overall stability.

Changes Made:

  • joint_trajectory_controller:

    • Modifies the lambda capture in is_erase_value from [ ] to [=], which captures all outer scope variables by value.
  • pid_controller:

    • Added compile definitions for Windows to minimize namespace collisions and define math constants:
      if(WIN32)
        add_compile_definitions(
          # For math constants
          _USE_MATH_DEFINES
          # Minimize Windows namespace collision
          NOMINMAX
          WIN32_LEAN_AND_MEAN
        )
      endif()

Testing:

  • Local tests have been run successfully, confirming that all modifications do not break existing functionality.

Please let me know if you have any questions or need further modifications. I appreciate your feedback!


This is an automatic backport of pull request #1330 done by Mergify.

Co-authored-by: SENAI-GilmarCorreia <[email protected]>
(cherry picked from commit fa42b5e)
Copy link

codecov bot commented Oct 31, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.05%. Comparing base (b78380c) to head (95895df).
Report is 2 commits behind head on iron.

Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #1333      +/-   ##
==========================================
- Coverage   65.09%   65.05%   -0.04%     
==========================================
  Files         103      103              
  Lines       11336    11899     +563     
  Branches     7159     7306     +147     
==========================================
+ Hits         7379     7741     +362     
- Misses       1469     1529      +60     
- Partials     2488     2629     +141     
Flag Coverage Δ
unittests 65.05% <100.00%> (-0.04%) ⬇️

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

Files with missing lines Coverage Δ
...include/joint_trajectory_controller/tolerances.hpp 80.86% <100.00%> (+0.68%) ⬆️

... and 84 files with indirect coverage changes

@christophfroehlich christophfroehlich merged commit 54e72a2 into iron Oct 31, 2024
11 of 12 checks passed
@christophfroehlich christophfroehlich deleted the mergify/bp/iron/pr-1330 branch October 31, 2024 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants