Skip to content

Commit 66b0d1f

Browse files
Tomas BacaTomas Baca
authored andcommitted
added traj gen
1 parent f7a1b49 commit 66b0d1f

File tree

4 files changed

+29
-1
lines changed

4 files changed

+29
-1
lines changed

ros_packages/.gitman.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,16 @@ sources:
120120
target: mrs_uav_testing
121121
scripts:
122122
- git submodule update --init --recursive
123+
- repo: https://github.com/ctu-mrs/mrs_uav_trajectory_generation.git
124+
name: mrs_uav_trajectory_generation
125+
rev: ros2
126+
type: git
127+
params:
128+
sparse_paths:
129+
-
130+
links:
131+
- source: ''
132+
target: mrs_uav_trajectory_generation
133+
scripts:
134+
- git submodule update --init --recursive
135+

ros_packages/mrs_uav_core/launch/core.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,18 @@ def generate_launch_description():
252252
)
253253
)
254254

255+
ld.add_action(
256+
IncludeLaunchDescription(
257+
PythonLaunchDescriptionSource([
258+
FindPackageShare('mrs_uav_trajectory_generation'), '/launch/trajectory_generation.py'
259+
]),
260+
launch_arguments={
261+
'custom_config': custom_config,
262+
'platform_config': platform_config,
263+
'standalone': standalone,
264+
'container_name': container_name,
265+
}.items()
266+
)
267+
)
268+
255269
return ld

ros_packages/mrs_uav_core/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<depend>mrs_uav_state_estimators</depend>
3131
<depend>mrs_multirotor_simulator</depend>
3232
<depend>mrs_uav_autostart</depend>
33+
<depend>mrs_uav_trajectory_generation</depend>
3334
<!-- <depend>mrs_rviz_plugins</depend> -->
34-
<!-- <depend>mrs_uav_trajectory_generation</depend> -->
3535
<!-- <depend>mrs_uav_status</depend> -->
3636
<!-- <depend>mrs_uav_testing</depend> -->
3737

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.gitman/mrs_uav_trajectory_generation/.

0 commit comments

Comments
 (0)