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.

Sign up for GitHub

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

Jump to bottom

[ros2_control_node] Handle simulation environment clocks (backport #1810) #1862

Merged
merged 5 commits into from
Nov 8, 2024
Merged

[ros2_control_node] Handle simulation environment clocks (backport #1810) #1862

merged 5 commits into from
Nov 8, 2024

Commits on Nov 7, 2024

  1. [ros2_control_node] Handle simulation environment clocks (#1810) 

    (cherry picked from commit d714e8b)

# Conflicts:
#	controller_manager/src/ros2_control_node.cpp
#	doc/release_notes.rst
    @saikishor @mergify
    saikishor authored and mergify[bot] committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    2904b24 View commit details
    Browse the repository at this point in the history

  2. Fix release notes

    @christophfroehlich
    christophfroehlich committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    67b9e5a View commit details
    Browse the repository at this point in the history

  3. Fix merge conflict

    @christophfroehlich
    christophfroehlich committed Nov 7, 2024
    Configuration menu
    Copy the full SHA
    dffba96 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2024

  1. Use Clock instead of Rate for backward compatibility of rolling (#1864)

    @saikishor
    saikishor committed Nov 8, 2024
    Configuration menu
    Copy the full SHA
    302baee View commit details
    Browse the repository at this point in the history

  2. Merge branch 'humble' into mergify/bp/humble/pr-1810

    @christophfroehlich
    christophfroehlich authored Nov 8, 2024
    Configuration menu
    Copy the full SHA
    3cf9d72 View commit details
    Browse the repository at this point in the history