Skip to content

Commit 713155a

Browse files
Merge branch 'main' into foxy
2 parents ed6c374 + e677356 commit 713155a

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.github/workflows/foxy-binary-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ name: Foxy Binary Build
33
on:
44
push:
55
branches:
6+
- main
67
- foxy
78
pull_request:
89
branches:
10+
- main
911
- foxy
1012

1113
jobs:

.github/workflows/foxy-source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Foxy Source Build
33
on:
44
push:
55
branches:
6+
- main
67
- foxy
78

89
jobs:

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Flexiv ROS 2
22

3-
[![Foxy Binary Build](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/build.yml/badge.svg)](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/build.yml)
3+
[![Foxy Source Build](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/foxy-source-build.yml/badge.svg)](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/foxy-source-build.yml)
4+
[![Foxy Binary Build](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/foxy-binary-build.yml/badge.svg?branch=foxy)](https://github.com/flexivrobotics/flexiv_ros2/actions/workflows/foxy-binary-build.yml)
45
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
56

67
For ROS 2 users to easily work with [RDK](https://github.com/flexivrobotics/flexiv_rdk), the APIs of RDK are wrapped into ROS packages in `flexiv_ros2`. Key functionalities like real-time joint torque and position control are supported, and the integration with `ros2_control` framework and MoveIt 2 is also implemented.

0 commit comments

Comments
 (0)