Skip to content

Commit

Permalink
Merge branch 'master' into add/sw_joint_limiter
Browse files Browse the repository at this point in the history
  • Loading branch information
saikishor authored Jun 5, 2024
2 parents 2abb02f + 1ed61ef commit 61a0949
Show file tree
Hide file tree
Showing 81 changed files with 705 additions and 58 deletions.
1 change: 1 addition & 0 deletions .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/humble-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/humble-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -20,6 +21,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/humble-rhel-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-rhel-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/humble-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/humble-source-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/iron-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/iron-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/iron-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -20,6 +21,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/iron-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/iron-rhel-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-rhel-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/iron-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/iron-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/iron-source-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/jazzy-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-rhel-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-rhel-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/jazzy-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/jazzy-source-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rolling-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rolling-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/rolling-check-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ on:
- '**.rst'
- '**.md'
- '**.yaml'
- '.github/workflows/rolling-check-docs.yml'

jobs:
check-docs:
name: Check Docs
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@master
uses: ros-controls/control.ros.org/.github/workflows/reusable-sphinx-check-single-version.yml@rolling
with:
ROS2_CONTROL_PR: ${{ github.ref }}
2 changes: 2 additions & 0 deletions .github/workflows/rolling-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -20,6 +21,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-coverage-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rolling-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rolling-rhel-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-rhel-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/rolling-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -22,6 +23,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rolling-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '.github/workflows/rolling-source-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ repos:

# CPP hooks
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v18.1.4
rev: v18.1.5
hooks:
- id: clang-format
args: ['-fallback-style=none', '-i']
Expand Down Expand Up @@ -125,14 +125,14 @@ repos:
# Spellcheck in comments and docs
# skipping of *.svg files is not working...
- repo: https://github.com/codespell-project/codespell
rev: v2.2.6
rev: v2.3.0
hooks:
- id: codespell
args: ['--write-changes', '--uri-ignore-words-list=ist', '-L manuel']
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.28.2
rev: 0.28.4
hooks:
- id: check-github-workflows
args: ["--verbose"]
Expand Down
6 changes: 6 additions & 0 deletions controller_interface/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Changelog for package controller_interface
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

4.11.0 (2024-05-14)
-------------------
* Fix dependencies for source build (`#1533 <https://github.com/ros-controls/ros2_control/issues/1533>`_)
* Add find_package for ament_cmake_gen_version_h (`#1534 <https://github.com/ros-controls/ros2_control/issues/1534>`_)
* Contributors: Christoph Fröhlich

4.10.0 (2024-05-08)
-------------------
* Working async controllers and components [not synchronized] (`#1041 <https://github.com/ros-controls/ros2_control/issues/1041>`_)
Expand Down
2 changes: 1 addition & 1 deletion controller_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>controller_interface</name>
<version>4.10.0</version>
<version>4.11.0</version>
<description>Description of controller_interface</description>
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
<maintainer email="denis@stoglrobotics.de">Denis Štogl</maintainer>
Expand Down
5 changes: 5 additions & 0 deletions controller_manager/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
Changelog for package controller_manager
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

4.11.0 (2024-05-14)
-------------------
* Add find_package for ament_cmake_gen_version_h (`#1534 <https://github.com/ros-controls/ros2_control/issues/1534>`_)
* Contributors: Christoph Fröhlich

4.10.0 (2024-05-08)
-------------------
* allow extra spawner arguments to not declare every argument in launch utils (`#1505 <https://github.com/ros-controls/ros2_control/issues/1505>`_)
Expand Down
2 changes: 1 addition & 1 deletion controller_manager/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>controller_manager</name>
<version>4.10.0</version>
<version>4.11.0</version>
<description>Description of controller_manager</description>
<maintainer email="bence.magyar.robotics@gmail.com">Bence Magyar</maintainer>
<maintainer email="denis@stoglrobotics.de">Denis Štogl</maintainer>
Expand Down
Loading

0 comments on commit 61a0949

Please sign in to comment.