-
Notifications
You must be signed in to change notification settings - Fork 188
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into 133_pr_rebase_again
- Loading branch information
Showing
39 changed files
with
1,959 additions
and
179 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 0 additions & 106 deletions
106
.github/workflows/reusable-industrial-ci-with-cache.yml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| name: Reviewer lottery | ||
| # pull_request_target takes the same events as pull_request, | ||
| # but it runs on the base branch instead of the head branch. | ||
| on: | ||
| pull_request_target: | ||
| types: [opened, ready_for_review, reopened] | ||
|
|
||
| jobs: | ||
| reviewer-lottery: | ||
| runs-on: ubuntu-latest | ||
| if: ${{ ! contains(fromJSON('["dependabot[bot]", "mergify[bot]"]'), github.actor) }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - uses: uesteibar/reviewer-lottery@v3 | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
| assign_reviewers: | ||
| uses: ros-controls/ros2_control_ci/.github/workflows/reusable-reviewer-lottery.yml@master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| cmake_minimum_required(VERSION 3.16) | ||
| project(ros2_control_demo_example_11 LANGUAGES CXX) | ||
|
|
||
| if(CMAKE_CXX_COMPILER_ID MATCHES "(GNU|Clang)") | ||
| add_compile_options(-Wall -Wextra) | ||
| endif() | ||
|
|
||
| # find dependencies | ||
| set(THIS_PACKAGE_INCLUDE_DEPENDS | ||
| hardware_interface | ||
| pluginlib | ||
| rclcpp | ||
| rclcpp_lifecycle | ||
| ) | ||
|
|
||
| # find dependencies | ||
| find_package(ament_cmake REQUIRED) | ||
| foreach(Dependency IN ITEMS ${THIS_PACKAGE_INCLUDE_DEPENDS}) | ||
| find_package(${Dependency} REQUIRED) | ||
| endforeach() | ||
|
|
||
|
|
||
| ## COMPILE | ||
| add_library( | ||
| ros2_control_demo_example_11 | ||
| SHARED | ||
| hardware/carlikebot_system.cpp | ||
| ) | ||
| target_compile_features(ros2_control_demo_example_11 PUBLIC cxx_std_17) | ||
| target_include_directories(ros2_control_demo_example_11 PUBLIC | ||
| $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/hardware/include> | ||
| $<INSTALL_INTERFACE:include/ros2_control_demo_example_11> | ||
| ) | ||
| ament_target_dependencies( | ||
| ros2_control_demo_example_11 PUBLIC | ||
| ${THIS_PACKAGE_INCLUDE_DEPENDS} | ||
| ) | ||
|
|
||
| # Causes the visibility macros to use dllexport rather than dllimport, | ||
| # which is appropriate when building the dll but not consuming it. | ||
| target_compile_definitions(${PROJECT_NAME} PRIVATE "ROS2_CONTROL_DEMO_EXAMPLE_11_BUILDING_DLL") | ||
|
|
||
| # Export hardware plugins | ||
| pluginlib_export_plugin_description_file(hardware_interface ros2_control_demo_example_11.xml) | ||
|
|
||
| # INSTALL | ||
| install( | ||
| DIRECTORY hardware/include/ | ||
| DESTINATION include/ros2_control_demo_example_11 | ||
| ) | ||
| install( | ||
| DIRECTORY description/launch description/ros2_control description/urdf | ||
| DESTINATION share/ros2_control_demo_example_11 | ||
| ) | ||
| install( | ||
| DIRECTORY bringup/launch bringup/config | ||
| DESTINATION share/ros2_control_demo_example_11 | ||
| ) | ||
| install(TARGETS ros2_control_demo_example_11 | ||
| EXPORT export_ros2_control_demo_example_11 | ||
| ARCHIVE DESTINATION lib | ||
| LIBRARY DESTINATION lib | ||
| RUNTIME DESTINATION bin | ||
| ) | ||
|
|
||
| if(BUILD_TESTING) | ||
| find_package(ament_cmake_pytest REQUIRED) | ||
|
|
||
| ament_add_pytest_test(example_11_urdf_xacro test/test_urdf_xacro.py) | ||
| ament_add_pytest_test(view_example_11_launch test/test_view_robot_launch.py) | ||
| endif() | ||
|
|
||
| ## EXPORTS | ||
| ament_export_targets(export_ros2_control_demo_example_11 HAS_LIBRARY_TARGET) | ||
| ament_export_dependencies(${THIS_PACKAGE_INCLUDE_DEPENDS}) | ||
| ament_package() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # ros2_control_demo_example_11 | ||
|
|
||
| *CarlikeBot*, or ''Carlike Mobile Robot'', is a simple mobile base with bicycle drive. | ||
| The robot has two wheels in the front that steer the robot and two wheels in the back that power the robot forward and backwards. However, since each pair of wheels (steering and traction) are controlled by one interface, a bicycle steering model is used. | ||
|
|
||
| Find the documentation in [doc/userdoc.rst](doc/userdoc.rst) or on [control.ros.org](https://control.ros.org/master/doc/ros2_control_demos/example_11/doc/userdoc.html). |
Oops, something went wrong.