Skip to content

Commit 7170385

Browse files
Release/0.7 (#3)
1 parent d678f5f commit 7170385

File tree

165 files changed

+126053
-109185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+126053
-109185
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ jobs:
1616
ROS_DISTRO: foxy
1717
steps:
1818
- name: Setup ROS
19-
uses: ros-tooling/setup-ros@0.3.4
19+
uses: ros-tooling/setup-ros@v0.3
2020
with:
2121
required-ros-distributions: ${{ env.ROS_DISTRO }}
2222
- name: Checkout
2323
uses: actions/checkout@v3
2424
- name: Build and run tests
2525
id: action-ros-ci
26-
uses: ros-tooling/action-ros-ci@0.2.6
26+
uses: ros-tooling/action-ros-ci@v0.2
2727
with:
2828
target-ros2-distro: ${{ env.ROS_DISTRO }}
2929
package-name: |

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ source ~/flexiv_ros2_ws/install/setup.bash
8080

8181
**NOTE**: the instruction below is only a quick reference, see the [Flexiv ROS2 Documentation](https://rdk.flexiv.com/manual/ros2_packages.html) for more information.
8282

83-
The prerequisites of using ROS2 with Flexiv Rizon robot are [enable RDK on the robot server](https://rdk.flexiv.com/manual/getting_started.html#enable-rdk-on-robot-server) and [establish connection](https://rdk.flexiv.com/manual/getting_started.html#establish-connection) between the workstation PC and the robot.
83+
The prerequisites of using ROS2 with Flexiv Rizon robot are [enable RDK on the robot server](https://rdk.flexiv.com/manual/getting_started.html#activate-rdk-server) and [establish connection](https://rdk.flexiv.com/manual/getting_started.html#establish-connection) between the workstation PC and the robot.
8484

8585
The main launch file to start the robot driver is the `rizon.launch.py` - it loads and starts the robot hardware, joint state broadcaster, controllers and opens RViZ. The arguments for the launch file are as follows:
8686

8787
- `robot_ip` (*required*) - IP address of the robot server (remote).
8888
- `local_ip` (*required*) - IP address of the workstation PC (local).
89-
- `rizon_type` (default: *rizon4*) - type of the Flexiv Rizon robot.
89+
- `rizon_type` (default: *rizon4*) - type of the Flexiv Rizon robot. (rizon4, rizon4s or rizon10)
9090
- `use_fake_hardware` (default: *false*) - starts `FakeSystem` instead of real hardware. This is a simple simulation that mimics joint command to their states.
9191
- `start_rviz` (deafult: *true*) - starts RViz automatically with the launch file.
9292
- `fake_sensor_commands` (default: *false*) - enables fake command interfaces for sensors used for simulations. Used only if `use_fake_hardware` parameter is true.
@@ -101,10 +101,10 @@ The main launch file to start the robot driver is the `rizon.launch.py` - it loa
101101
- Test with real robot:
102102

103103
```bash
104-
ros2 launch flexiv_bringup rizon.launch.py robot_ip:=[robot_ip] local_ip:=[local_ip]
104+
ros2 launch flexiv_bringup rizon.launch.py robot_ip:=[robot_ip] local_ip:=[local_ip] rizon_type:=rizon4
105105
```
106106

107-
**NOTE**: Getting the following output in terminal is OK: `Warning: Invalid frame ID "link1" passed to canTransform argument source_frame - frame does not exist`. This happens because `joint_state_broadcaster` node need some time to start.
107+
**NOTE**: To test whether the connection between ROS and the robot is established, you could disable the starting of RViz first by setting the `start_rviz` launch argument to false.
108108

109109
- Test with fake hardware (`ros2_control` capability):
110110

flexiv_bringup/launch/rizon.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def generate_launch_description():
2020
"rizon_type",
2121
description="Type of the Flexiv Rizon robot.",
2222
default_value="rizon4",
23-
choices=["rizon4", "rizon4s"],
23+
choices=["rizon4", "rizon4s", "rizon10"],
2424
)
2525
)
2626

@@ -104,6 +104,9 @@ def generate_launch_description():
104104
"local_ip:=",
105105
local_ip,
106106
" ",
107+
"name:=",
108+
"rizon",
109+
" ",
107110
"rizon_type:=",
108111
rizon_type,
109112
" ",

flexiv_bringup/launch/rizon_moveit.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def generate_launch_description():
3232
"rizon_type",
3333
description="Type of the Flexiv Rizon robot.",
3434
default_value="rizon4",
35-
choices=["rizon4", "rizon4s"],
35+
choices=["rizon4", "rizon4s", "rizon10"],
3636
)
3737
)
3838

@@ -99,6 +99,9 @@ def generate_launch_description():
9999
"local_ip:=",
100100
local_ip,
101101
" ",
102+
"name:=",
103+
"rizon",
104+
" ",
102105
"rizon_type:=",
103106
rizon_type,
104107
" ",

flexiv_bringup/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>flexiv_bringup</name>
5-
<version>0.6.1</version>
5+
<version>0.7.0</version>
66
<description>Package with launch files and run-time configurations for Flexiv robots with `ros2_control`</description>
77
<maintainer email="[email protected]">Mun Seng Phoon</maintainer>
88
<license>Apache License 2.0</license>

flexiv_controllers/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>flexiv_controllers</name>
5-
<version>0.6.1</version>
5+
<version>0.7.0</version>
66
<description>Flexiv custom ros2 controllers</description>
77
<maintainer email="[email protected]">Mun Seng Phoon</maintainer>
88
<license>Apache License 2.0</license>

flexiv_description/launch/view_rizon.launch.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ def generate_launch_description():
2525
[FindPackageShare("flexiv_description"), "urdf", "rizon.urdf.xacro"]
2626
),
2727
" ",
28+
"name:=",
29+
"rizon",
30+
" ",
2831
"rizon_type:=",
2932
rizon_type,
3033
]
@@ -68,7 +71,7 @@ def generate_launch_description():
6871
name="rizon_type",
6972
default_value="rizon4",
7073
description="Type of the Flexiv Rizon robot.",
71-
choices=["rizon4", "rizon4s"],
74+
choices=["rizon4", "rizon4s", "rizon10"],
7275
),
7376
DeclareLaunchArgument(
7477
name="gui",
2.62 KB
Binary file not shown.
3.01 KB
Binary file not shown.
3.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)