Skip to content

Commit

Permalink
Merge branch 'master' into async_controllers
Browse files Browse the repository at this point in the history
  • Loading branch information
saikishor authored Jun 3, 2024
2 parents 1984168 + e122f71 commit 980bf8a
Show file tree
Hide file tree
Showing 53 changed files with 615 additions and 31 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
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
3 changes: 2 additions & 1 deletion controller_manager/test/test_spawner_unspawner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ TEST_F(TestLoadController, unload_on_kill)
// Launch spawner with unload on kill
// timeout command will kill it after the specified time with signal SIGINT
std::stringstream ss;
ss << "timeout --signal=INT 5 " << "ros2 run controller_manager spawner "
ss << "timeout --signal=INT 5 "
<< "ros2 run controller_manager spawner "
<< "ctrl_3 -c test_controller_manager -t "
<< std::string(test_controller::TEST_CONTROLLER_CLASS_NAME) << " --unload-on-kill";

Expand Down
7 changes: 1 addition & 6 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ API Documentation

API documentation is parsed by doxygen and can be found `here <../../api/index.html>`_

=========
Features
=========

* :ref:`Command Line Interface (CLI) <ros2controlcli_userdoc>`

========
Concepts
========
Expand All @@ -31,5 +25,6 @@ Concepts

Controller Manager <../controller_manager/doc/userdoc.rst>
Controller Chaining / Cascade Control <../controller_manager/doc/controller_chaining.rst>
Joint Kinematics <../hardware_interface/doc/joints_userdoc.rst>
Hardware Components <../hardware_interface/doc/hardware_components_userdoc.rst>
Mock Components <../hardware_interface/doc/mock_components_userdoc.rst>
Loading

0 comments on commit 980bf8a

Please sign in to comment.