Skip to content

Commit

Permalink
Merge branch 'master' into pr147_rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
christophfroehlich authored Sep 6, 2023
2 parents 6be583b + 34cf93c commit 0f482b8
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-coverage-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- uses: ros-tooling/[email protected]
with:
required-ros-distributions: ${{ env.ROS_DISTRO }}
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected]
with:
target-ros2-distro: ${{ env.ROS_DISTRO }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: Format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/[email protected]
with:
python-version: '3.10'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-ros-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
env:
AMENT_CPPCHECK_ALLOW_SLOW_VERSIONS: true
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected]
- uses: ros-tooling/[email protected]
with:
Expand All @@ -40,7 +40,7 @@ jobs:
matrix:
linter: [cpplint]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ros-tooling/[email protected]
- uses: ros-tooling/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/humble-docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build . --file Dockerfile/Dockerfile --tag ros2_control_demos_humble
2 changes: 1 addition & 1 deletion .github/workflows/prerelease-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
pre_release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
- name: industrial_ci
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-industrial-ci-with-cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ jobs:
steps:
- name: Checkout ${{ inputs.ref }} when build is not scheduled
if: ${{ (inputs.ros_repo == 'all' || inputs.ros_repo == matrix.ROS_REPO) && github.event_name != 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Checkout ${{ inputs.ref }} on scheduled build
if: ${{ (inputs.ros_repo == 'all' || inputs.ros_repo == matrix.ROS_REPO) && github.event_name == 'schedule' }}
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ inputs.ref_for_scheduled_build }}
- name: cache target_ws
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reviewer_lottery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: uesteibar/reviewer-lottery@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/rolling-docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build the Docker image
run: docker build . --file Dockerfile/Dockerfile --tag ros2_control_demos_rolling
2 changes: 1 addition & 1 deletion doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ Local installation

If you have ROS 2 installed already, choose the right version of this documentation and branch of the ``ros2_control_demos`` repository matching you ROS 2 distribution, see `this table <https://github.com/ros-controls/ros2_control_demos#build-status>`__.

Otherwise, install `ROS 2 {DISTRO} on your computer <https://docs.ros.org/en/rolling/Installation.html>`__.
Otherwise, install `ROS 2 {DISTRO} on your computer <https://docs.ros.org/en/{DISTRO}/Installation.html>`__.

.. note::

Expand Down
2 changes: 1 addition & 1 deletion example_2/hardware/diffbot_system.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ hardware_interface::return_type DiffBotSystemHardware::read(
// Simulate DiffBot wheels's movement as a first-order system
// Update the joint status: this is a revolute joint without any limit.
// Simply integrates
hw_positions_[i] = hw_positions_[1] + period.seconds() * hw_velocities_[i];
hw_positions_[i] = hw_positions_[i] + period.seconds() * hw_velocities_[i];

RCLCPP_INFO(
rclcpp::get_logger("DiffBotSystemHardware"),
Expand Down

0 comments on commit 0f482b8

Please sign in to comment.