Skip to content

Commit d0c72cd

Browse files
committed
Resolve conflicts
1 parent 3ef8057 commit d0c72cd

File tree

7 files changed

+107
-916
lines changed

7 files changed

+107
-916
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
controller_manager:
2+
ros__parameters:
3+
update_rate: 500 # Hz

ur_bringup/launch/ur18.launch.py

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
# Copyright (c) 2021 PickNik, Inc.
2+
#
3+
# Redistribution and use in source and binary forms, with or without
4+
# modification, are permitted provided that the following conditions are met:
5+
#
6+
# * Redistributions of source code must retain the above copyright
7+
# notice, this list of conditions and the following disclaimer.
8+
#
9+
# * Redistributions in binary form must reproduce the above copyright
10+
# notice, this list of conditions and the following disclaimer in the
11+
# documentation and/or other materials provided with the distribution.
12+
#
13+
# * Neither the name of the {copyright_holder} nor the names of its
14+
# contributors may be used to endorse or promote products derived from
15+
# this software without specific prior written permission.
16+
#
17+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
18+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
19+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
20+
# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
21+
# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
22+
# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
23+
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
24+
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
25+
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
26+
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
27+
# POSSIBILITY OF SUCH DAMAGE.
28+
29+
#
30+
# Author: Denis Stogl
31+
32+
from launch import LaunchDescription
33+
from launch.actions import DeclareLaunchArgument, IncludeLaunchDescription
34+
from launch.launch_description_sources import PythonLaunchDescriptionSource
35+
from launch.substitutions import LaunchConfiguration, ThisLaunchFileDir
36+
37+
38+
def generate_launch_description():
39+
# Declare arguments
40+
declared_arguments = []
41+
declared_arguments.append(
42+
DeclareLaunchArgument(
43+
"robot_ip",
44+
description="IP address by which the robot can be reached.",
45+
)
46+
)
47+
declared_arguments.append(
48+
DeclareLaunchArgument(
49+
"use_fake_hardware",
50+
default_value="false",
51+
description="Start robot with fake hardware mirroring command to its states.",
52+
)
53+
)
54+
declared_arguments.append(
55+
DeclareLaunchArgument(
56+
"fake_sensor_commands",
57+
default_value="false",
58+
description="Enable fake command interfaces for sensors used for simple simulations. \
59+
Used only if 'use_fake_hardware' parameter is true.",
60+
)
61+
)
62+
declared_arguments.append(
63+
DeclareLaunchArgument(
64+
"initial_joint_controller",
65+
default_value="scaled_joint_trajectory_controller",
66+
description="Initially loaded robot controller.",
67+
choices=[
68+
"scaled_joint_trajectory_controller",
69+
"joint_trajectory_controller",
70+
"forward_velocity_controller",
71+
"forward_position_controller",
72+
],
73+
)
74+
)
75+
declared_arguments.append(
76+
DeclareLaunchArgument(
77+
"activate_joint_controller",
78+
default_value="true",
79+
description="Activate loaded joint controller.",
80+
)
81+
)
82+
83+
# Initialize Arguments
84+
robot_ip = LaunchConfiguration("robot_ip")
85+
use_fake_hardware = LaunchConfiguration("use_fake_hardware")
86+
fake_sensor_commands = LaunchConfiguration("fake_sensor_commands")
87+
initial_joint_controller = LaunchConfiguration("initial_joint_controller")
88+
activate_joint_controller = LaunchConfiguration("activate_joint_controller")
89+
90+
base_launch = IncludeLaunchDescription(
91+
PythonLaunchDescriptionSource([ThisLaunchFileDir(), "/ur_control.launch.py"]),
92+
launch_arguments={
93+
"ur_type": "ur18",
94+
"robot_ip": robot_ip,
95+
"use_fake_hardware": use_fake_hardware,
96+
"fake_sensor_commands": fake_sensor_commands,
97+
"initial_joint_controller": initial_joint_controller,
98+
"activate_joint_controller": activate_joint_controller,
99+
}.items(),
100+
)
101+
102+
return LaunchDescription(declared_arguments + [base_launch])

ur_bringup/launch/ur_control.launch.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ def generate_launch_description():
6262
"ur16e",
6363
"ur8long",
6464
"ur15",
65+
"ur18",
6566
"ur20",
6667
"ur30",
6768
],

ur_moveit_config/launch/ur_moveit.launch.py

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ def launch_setup(context, *args, **kwargs):
8282

8383
robot_description_content = Command(
8484
[
85-
<<<<<<< HEAD
8685
PathJoinSubstitution([FindExecutable(name="xacro")]),
8786
" ",
8887
PathJoinSubstitution([FindPackageShare(description_package), "urdf", description_file]),
@@ -125,47 +124,6 @@ def launch_setup(context, *args, **kwargs):
125124
"prefix:=",
126125
prefix,
127126
" ",
128-
=======
129-
DeclareLaunchArgument("launch_rviz", default_value="true", description="Launch RViz?"),
130-
DeclareLaunchArgument(
131-
"ur_type",
132-
description="Typo/series of used UR robot.",
133-
choices=[
134-
"ur3",
135-
"ur5",
136-
"ur10",
137-
"ur3e",
138-
"ur5e",
139-
"ur7e",
140-
"ur10e",
141-
"ur12e",
142-
"ur16e",
143-
"ur8long",
144-
"ur15",
145-
"ur18",
146-
"ur20",
147-
"ur30",
148-
],
149-
),
150-
DeclareLaunchArgument(
151-
"warehouse_sqlite_path",
152-
default_value=os.path.expanduser("~/.ros/warehouse_ros.sqlite"),
153-
description="Path where the warehouse database should be stored",
154-
),
155-
DeclareLaunchArgument(
156-
"launch_servo", default_value="false", description="Launch Servo?"
157-
),
158-
DeclareLaunchArgument(
159-
"use_sim_time",
160-
default_value="false",
161-
description="Using or not time from simulation",
162-
),
163-
DeclareLaunchArgument(
164-
"publish_robot_description_semantic",
165-
default_value="true",
166-
description="MoveGroup publishes robot description semantic",
167-
),
168-
>>>>>>> 233d524 (Add support for UR18 (#1524))
169127
]
170128
)
171129
robot_description = {
@@ -337,6 +295,7 @@ def generate_launch_description():
337295
"ur16e",
338296
"ur8long",
339297
"ur15",
298+
"ur18",
340299
"ur20",
341300
"ur30",
342301
],

0 commit comments

Comments
 (0)