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

Admittance robot description param #22

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
8348bc9
Use the urdf_ to set the robot_description in admittance controller
SyllogismRXS Apr 5, 2024
3021b08
Pass robot_description to kinematics_interface using input arg
SyllogismRXS Apr 9, 2024
9f87347
admittance_controller: skip large dt periods
SyllogismRXS Apr 15, 2024
e1b47c1
get robot_description correctly
Nibanovic Aug 1, 2024
95dbc20
correct for kinematics_interface initialize() API change
Nibanovic Aug 1, 2024
8fb7edf
enable pose-only goal in AdmittanceRule
Nibanovic Jul 31, 2024
b55cd2b
add a goal pose subscriber in admittance controller
Nibanovic Aug 1, 2024
fce1e28
move from Pose to PoseStamped
Nibanovic Aug 1, 2024
165de4c
overload admittance->update() to account for both joint_state and pos…
Nibanovic Aug 2, 2024
fa301f4
Fix wrong method name in write new controller doc (#1240)
mateusmenezes95 Aug 5, 2024
0401dd4
Update changelogs
bmagyar Aug 14, 2024
298df4b
4.12.1
bmagyar Aug 14, 2024
4a6456f
[Joint State Broadcaster] Publish the joint_states of joints present …
saikishor Aug 15, 2024
4ab22a5
Fixes tests to work with use_global_arguments NodeOptions parameter …
saikishor Aug 22, 2024
31f7fbe
Fix segfault at reconfigure of AdmittanceController (#1248)
firesurfer Aug 22, 2024
cdfc0af
Also test if python files were changed (#1264)
christophfroehlich Aug 22, 2024
f57eedd
Update changelogs
bmagyar Aug 22, 2024
20f6f0b
4.13.0
bmagyar Aug 22, 2024
1c4d58e
[JSB] Move the initialize of urdf::Model from on_activate to on_confi…
TakashiSato Aug 24, 2024
ce12694
rename get/set_state to get/set_lifecylce_state (#1250)
mamueluth Aug 26, 2024
3be3fe9
Fix bug for displaying all controllers (#1259)
fmrico Aug 26, 2024
a7b2af5
[PID Controller] Export state interfaces for easier chaining with oth…
saikishor Aug 29, 2024
c08bdab
Bump version of pre-commit hooks (#1279)
github-actions[bot] Sep 1, 2024
48a7f8b
Fix deprecation warning in paramater declaration (#1280)
kumar-sanjeeev Sep 11, 2024
1dc3d2a
fix(steering-odometry): handle infinite turning radius properly (#1285)
reinzor Sep 11, 2024
75ae6c9
Update changelogs
bmagyar Sep 11, 2024
57c50e5
4.14.0
bmagyar Sep 11, 2024
a2ec061
Use the urdf_ to set the robot_description in admittance controller
SyllogismRXS Apr 5, 2024
2757d44
Pass robot_description to kinematics_interface using input arg
SyllogismRXS Apr 9, 2024
8a58707
admittance_controller: skip large dt periods
SyllogismRXS Apr 15, 2024
8f5ae5f
get robot_description correctly
Nibanovic Aug 1, 2024
2631ae0
correct for kinematics_interface initialize() API change
Nibanovic Aug 1, 2024
99236f4
enable pose-only goal in AdmittanceRule
Nibanovic Jul 31, 2024
85f3bcf
add a goal pose subscriber in admittance controller
Nibanovic Aug 1, 2024
f8e580c
move from Pose to PoseStamped
Nibanovic Aug 1, 2024
0d88c35
overload admittance->update() to account for both joint_state and pos…
Nibanovic Aug 2, 2024
ad672aa
Merge branch 'admittance-robot-description-param' of github.com:Stogl…
YaraShahin Sep 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/humble-abi-compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-abi-compatibility.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-abi-compatibility.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.humble.repos'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/humble-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.humble.repos'
Expand All @@ -23,8 +24,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.humble.repos'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/humble-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-coverage-build.yml'
- 'codecov.yml'
- '**.yaml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand All @@ -21,9 +22,10 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-coverage-build.yml'
- 'codecov.yml'
- '**.yaml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/humble-debian-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-debian-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-debian-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/humble-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-rhel-semi-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-rhel-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/humble-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-semi-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand All @@ -22,8 +23,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/humble-semi-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-semi-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers.humble.repos'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/humble-source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/humble-source-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/iron-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/iron-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.iron.repos'
Expand All @@ -25,8 +26,9 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '.github/workflows/iron-binary-build.yml'
- '**.py'
- '**.yaml'
- '.github/workflows/iron-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
- 'ros2_controllers-not-released.iron.repos'
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'
- '**.yaml'
- '.github/workflows/iron-coverage-build.yml'
- 'codecov.yml'
Expand All @@ -21,6 +22,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/iron-coverage-build.yml'
- 'codecov.yml'
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'
- '**.yaml'
- '.github/workflows/iron-debian-build.yml'
- '**/package.xml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/iron-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/iron-semi-binary-build.yml'
- '**/package.xml'
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'
- '**.yaml'
- '.github/workflows/iron-source-build.yml'
- '**/package.xml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/jazzy-binary-build.yml'
- '**/package.xml'
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'
- '**.yaml'
- '.github/workflows/jazzy-debian-build.yml'
- '**/package.xml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/jazzy-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/jazzy-rhel-semi-binary-build.yml'
- '**/package.xml'
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 @@ -12,6 +12,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/jazzy-semi-binary-build.yml'
- '**/package.xml'
Expand All @@ -24,6 +25,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/jazzy-semi-binary-build.yml'
- '**/package.xml'
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'
- '**.yaml'
- '.github/workflows/jazzy-source-build.yml'
- '**/package.xml'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/rolling-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
- '**/CMakeLists.txt'
Expand All @@ -24,6 +26,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-binary-build.yml'
- '**/package.xml'
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'
- '**.yaml'
- '.github/workflows/rolling-coverage-build.yml'
- 'codecov.yml'
Expand All @@ -21,6 +22,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-coverage-build.yml'
- 'codecov.yml'
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'
- '**.yaml'
- '.github/workflows/rolling-debian-build.yml'
- '**/package.xml'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/rolling-rhel-semi-binary-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-rhel-semi-binary-build.yml'
- '**/package.xml'
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 @@ -12,6 +12,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
Expand All @@ -24,6 +25,7 @@ on:
- '**.hpp'
- '**.h'
- '**.cpp'
- '**.py'
- '**.yaml'
- '.github/workflows/rolling-semi-binary-build.yml'
- '**/package.xml'
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'
- '**.yaml'
- '.github/workflows/rolling-source-build.yml'
- '**/package.xml'
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ repos:
args: ["--ignore=D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404"]

- repo: https://github.com/psf/black
rev: 24.4.2
rev: 24.8.0
hooks:
- id: black
args: ["--line-length=99"]

- repo: https://github.com/pycqa/flake8
rev: 7.1.0
rev: 7.1.1
hooks:
- id: flake8
args: ["--extend-ignore=E501"]
Expand Down Expand Up @@ -133,7 +133,7 @@ repos:
exclude: CHANGELOG\.rst|\.(svg|pyc|drawio)$

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

4.14.0 (2024-09-11)
-------------------

4.13.0 (2024-08-22)
-------------------
* Fixes tests to work with use_global_arguments NodeOptions parameter (`#1256 <https://github.com/ros-controls/ros2_controllers/issues/1256>`_)
* Contributors: Sai Kishor Kothakota

4.12.1 (2024-08-14)
-------------------

4.12.0 (2024-07-23)
-------------------
* Add missing includes (`#1226 <https://github.com/ros-controls/ros2_controllers/issues/1226>`_)
Expand Down
6 changes: 2 additions & 4 deletions ackermann_steering_controller/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,8 @@ if(BUILD_TESTING)
find_package(ros2_control_test_assets REQUIRED)


add_rostest_with_parameters_gmock(test_load_ackermann_steering_controller
test/test_load_ackermann_steering_controller.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test/ackermann_steering_controller_params.yaml
)
add_definitions(-DTEST_FILES_DIRECTORY="${CMAKE_CURRENT_SOURCE_DIR}/test")
ament_add_gmock(test_load_ackermann_steering_controller test/test_load_ackermann_steering_controller.cpp)
ament_target_dependencies(test_load_ackermann_steering_controller
controller_manager
hardware_interface
Expand Down
2 changes: 1 addition & 1 deletion ackermann_steering_controller/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_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>ackermann_steering_controller</name>
<version>4.12.0</version>
<version>4.14.0</version>
<description>Steering controller for Ackermann kinematics. Rear fixed wheels are powering the vehicle and front wheels are steering it.</description>
<license>Apache License 2.0</license>
<maintainer email="[email protected]">Bence Magyar</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,15 @@ TEST(TestLoadAckermannSteeringController, load_controller)

controller_manager::ControllerManager cm(
executor, ros2_control_test_assets::minimal_robot_urdf, true, "test_controller_manager");
const std::string test_file_path =
std::string(TEST_FILES_DIRECTORY) + "/ackermann_steering_controller_params.yaml";

ASSERT_NE(
cm.load_controller(
"test_ackermann_steering_controller",
"ackermann_steering_controller/AckermannSteeringController"),
nullptr);
cm.set_parameter({"test_ackermann_steering_controller.params_file", test_file_path});
cm.set_parameter(
{"test_ackermann_steering_controller.type",
"ackermann_steering_controller/AckermannSteeringController"});

ASSERT_NE(cm.load_controller("test_ackermann_steering_controller"), nullptr);
}

int main(int argc, char ** argv)
Expand Down
14 changes: 14 additions & 0 deletions admittance_controller/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
Changelog for package admittance_controller
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

4.14.0 (2024-09-11)
-------------------

4.13.0 (2024-08-22)
-------------------
* Fix segfault at reconfigure of AdmittanceController (`#1248 <https://github.com/ros-controls/ros2_controllers/issues/1248>`_)
* Fixes tests to work with use_global_arguments NodeOptions parameter (`#1256 <https://github.com/ros-controls/ros2_controllers/issues/1256>`_)
* Contributors: Lennart Nachtigall, Sai Kishor Kothakota

4.12.1 (2024-08-14)
-------------------
* Fix admittance controller interface read/write logic (`#1232 <https://github.com/ros-controls/ros2_controllers/issues/1232>`_)
* Contributors: Nikola Banović

4.12.0 (2024-07-23)
-------------------
* Change the subscription timeout in the tests to 5ms (`#1219 <https://github.com/ros-controls/ros2_controllers/issues/1219>`_)
Expand Down
Loading
Loading