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

Merge upstream/humble into feature branch #2

Merged

Commits on Mar 14, 2024

  1. Configuration menu
    Copy the full SHA
    2c3c46f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. Fix ros-controls#247 (ros-controls#248) (ros-controls#250)

    (cherry picked from commit 94745e6)
    
    Co-authored-by: Graziato Davide <85335579+Fixit-Davide@users.noreply.github.com>
    mergify[bot] and Fixit-Davide authored Mar 15, 2024
    Configuration menu
    Copy the full SHA
    501be7f View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. Fix typo (ros-controls#253) (ros-controls#254)

    (cherry picked from commit a98cb2a)
    
    Co-authored-by: Stephanie Eng <stephanie-eng@users.noreply.github.com>
    mergify[bot] and stephanie-eng authored Mar 19, 2024
    Configuration menu
    Copy the full SHA
    689c436 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2024

  1. Configuration menu
    Copy the full SHA
    012590f View commit details
    Browse the repository at this point in the history
  2. Update resource manager usage

    sjahr committed Mar 20, 2024
    Configuration menu
    Copy the full SHA
    238ca71 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2024

  1. Add ros_gz_bridge as dependency to demos (backport ros-controls#256) (

    ros-controls#257)
    
    * Add dep (ros-controls#256)
    
    (cherry picked from commit b35100d)
    
    # Conflicts:
    #	ign_ros2_control_demos/package.xml
    
    * fixed merge
    
    Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
    
    ---------
    
    Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
    Co-authored-by: Christoph Fröhlich <christophfroehlich@users.noreply.github.com>
    Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
    3 people authored Mar 21, 2024
    Configuration menu
    Copy the full SHA
    8439124 View commit details
    Browse the repository at this point in the history
  2. Changelog

    Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
    ahcorde committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    a4b3289 View commit details
    Browse the repository at this point in the history
  3. 0.7.6

    ahcorde committed Mar 21, 2024
    Configuration menu
    Copy the full SHA
    cec39b6 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Fix ros-controls#259 - ParameterAlreadyDeclaredException for parame…

    …ter `position_proportional_gain` (backport ros-controls#261) (ros-controls#262)
    
    Signed-off-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
    Co-authored-by: Patrick Roncagliolo <ronca.pat@gmail.com>
    Co-authored-by: Alejandro Hernandez Cordero <ahcorde@gmail.com>
    3 people authored Mar 28, 2024
    Configuration menu
    Copy the full SHA
    f724da5 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Configuration menu
    Copy the full SHA
    e806736 View commit details
    Browse the repository at this point in the history