Skip to content

Commit 2e60326

Browse files
Feature/Add FT03 wrist sensor support (#47)
1 parent ca3281b commit 2e60326

Some content is hidden

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

42 files changed

+37042
-64
lines changed

flexiv_bringup/launch/rizon.launch.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ def generate_launch_description():
2424
start_rviz_param_name = "start_rviz"
2525
load_gripper_param_name = "load_gripper"
2626
gripper_name_param_name = "gripper_name"
27+
load_mounted_ft_sensor_param_name = "load_mounted_ft_sensor"
2728
use_fake_hardware_param_name = "use_fake_hardware"
2829
fake_sensor_commands_param_name = "fake_sensor_commands"
2930
robot_controller_param_name = "robot_controller"
@@ -71,6 +72,14 @@ def generate_launch_description():
7172
)
7273
)
7374

75+
declared_arguments.append(
76+
DeclareLaunchArgument(
77+
load_mounted_ft_sensor_param_name,
78+
default_value="false",
79+
description="Flag to load the mounted force torque sensor. Only available for Rizon4, Rizon4R and Rizon10.",
80+
)
81+
)
82+
7483
declared_arguments.append(
7584
DeclareLaunchArgument(
7685
use_fake_hardware_param_name,
@@ -102,6 +111,7 @@ def generate_launch_description():
102111
start_rviz = LaunchConfiguration(start_rviz_param_name)
103112
load_gripper = LaunchConfiguration(load_gripper_param_name)
104113
gripper_name = LaunchConfiguration(gripper_name_param_name)
114+
load_mounted_ft_sensor = LaunchConfiguration(load_mounted_ft_sensor_param_name)
105115
use_fake_hardware = LaunchConfiguration(use_fake_hardware_param_name)
106116
fake_sensor_commands = LaunchConfiguration(fake_sensor_commands_param_name)
107117
robot_controller = LaunchConfiguration(robot_controller_param_name)
@@ -131,6 +141,9 @@ def generate_launch_description():
131141
"gripper_name:=",
132142
gripper_name,
133143
" ",
144+
"load_mounted_ft_sensor:=",
145+
load_mounted_ft_sensor,
146+
" ",
134147
"use_fake_hardware:=",
135148
use_fake_hardware,
136149
" ",

flexiv_bringup/launch/rizon_moveit.launch.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def launch_setup(context):
5050
start_rviz = LaunchConfiguration("start_rviz")
5151
load_gripper = LaunchConfiguration("load_gripper")
5252
gripper_name = LaunchConfiguration("gripper_name")
53+
load_mounted_ft_sensor = LaunchConfiguration("load_mounted_ft_sensor")
5354
use_fake_hardware = LaunchConfiguration("use_fake_hardware")
5455
fake_sensor_commands = LaunchConfiguration("fake_sensor_commands")
5556
warehouse_sqlite_path = LaunchConfiguration("warehouse_sqlite_path")
@@ -80,6 +81,9 @@ def launch_setup(context):
8081
"gripper_name:=",
8182
gripper_name,
8283
" ",
84+
"load_mounted_ft_sensor:=",
85+
load_mounted_ft_sensor,
86+
" ",
8387
"use_fake_hardware:=",
8488
use_fake_hardware,
8589
" ",
@@ -108,6 +112,9 @@ def launch_setup(context):
108112
" ",
109113
"load_gripper:=",
110114
load_gripper,
115+
" ",
116+
"load_mounted_ft_sensor:=",
117+
load_mounted_ft_sensor,
111118
]
112119
),
113120
value_type=str,
@@ -421,6 +428,14 @@ def generate_launch_description():
421428
)
422429
)
423430

431+
declared_arguments.append(
432+
DeclareLaunchArgument(
433+
"load_mounted_ft_sensor",
434+
default_value="false",
435+
description="Flag to load the mounted force torque sensor. Only available for Rizon4, Rizon4R and Rizon10.",
436+
)
437+
)
438+
424439
declared_arguments.append(
425440
DeclareLaunchArgument(
426441
"use_fake_hardware",

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>1.6.0</version>
5+
<version>1.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/flexiv_robot_states_broadcaster/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_robot_states_broadcaster</name>
5-
<version>1.6.0</version>
5+
<version>1.7.0</version>
66
<description>The robot states broadcaster publishes the Flexiv robot states.</description>
77
<maintainer email="[email protected]">Mun Seng Phoon</maintainer>
88
<license>Apache License 2.0</license>

flexiv_controllers/gpio_controller/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>gpio_controller</name>
5-
<version>1.6.0</version>
5+
<version>1.7.0</version>
66
<description>Flexiv custom gpio controller to control the GPIOs of the robot.</description>
77
<maintainer email="[email protected]">Mun Seng Phoon</maintainer>
88
<license>Apache License 2.0</license>

flexiv_controllers/joint_impedance_controller/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>joint_impedance_controller</name>
5-
<version>1.6.0</version>
5+
<version>1.7.0</version>
66
<description> The joint impedance controller commands a group of joints in effort interface.</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: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def generate_launch_description():
1818
rizon_type = LaunchConfiguration("rizon_type")
1919
load_gripper = LaunchConfiguration("load_gripper")
2020
gripper_name = LaunchConfiguration("gripper_name")
21+
load_mounted_ft_sensor = LaunchConfiguration("load_mounted_ft_sensor")
2122
default_rviz_config_path = PathJoinSubstitution(
2223
[pkg_share, "rviz", "view_rizon.rviz"]
2324
)
@@ -41,6 +42,9 @@ def generate_launch_description():
4142
" ",
4243
"gripper_name:=",
4344
gripper_name,
45+
" ",
46+
"load_mounted_ft_sensor:=",
47+
load_mounted_ft_sensor,
4448
]
4549
),
4650
value_type=str,
@@ -107,6 +111,11 @@ def generate_launch_description():
107111
default_value="Flexiv-GN01",
108112
description="Full name of the gripper to be controlled",
109113
),
114+
DeclareLaunchArgument(
115+
name="load_mounted_ft_sensor",
116+
default_value="False",
117+
description="Flag to load the mounted force torque sensor. Only available for Rizon4, Rizon4R and Rizon10",
118+
),
110119
DeclareLaunchArgument(
111120
name="gui",
112121
default_value="False",
4.28 KB
Binary file not shown.
3.3 KB
Binary file not shown.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
newmtl robot
2+
3+
Ns 15.686281
4+
Ka 0.150000 0.150000 0.150000
5+
Kd 0.487364 0.487364 0.527718
6+
Ks 0.600013 0.600013 0.600013
7+
Ke 0.0 0.0 0.0
8+
Ni 1.000000
9+
d 1.000000
10+
illum 2

0 commit comments

Comments
 (0)