Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
460c16cd
Commit
460c16cd
authored
6 years ago
by
stmoon
Committed by
Beat Küng
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
add mavlink_tcp_port for multiple uav simultation
parent
4dc15031
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
launch/multi_uav_mavros_sitl.launch
+3
-0
3 additions, 0 deletions
launch/multi_uav_mavros_sitl.launch
launch/single_vehicle_spawn.launch
+2
-1
2 additions, 1 deletion
launch/single_vehicle_spawn.launch
with
5 additions
and
1 deletion
launch/multi_uav_mavros_sitl.launch
+
3
−
0
View file @
460c16cd
...
...
@@ -34,6 +34,7 @@
<arg
name=
"Y"
value=
"0"
/>
<arg
name=
"vehicle"
value=
"$(arg vehicle)"
/>
<arg
name=
"mavlink_udp_port"
value=
"14561"
/>
<arg
name=
"mavlink_tcp_port"
value=
"4561"
/>
<arg
name=
"ID"
value=
"$(arg ID)"
/>
</include>
<!-- MAVROS -->
...
...
@@ -59,6 +60,7 @@
<arg
name=
"Y"
value=
"0"
/>
<arg
name=
"vehicle"
value=
"$(arg vehicle)"
/>
<arg
name=
"mavlink_udp_port"
value=
"14562"
/>
<arg
name=
"mavlink_tcp_port"
value=
"4562"
/>
<arg
name=
"ID"
value=
"$(arg ID)"
/>
</include>
<!-- MAVROS -->
...
...
@@ -85,6 +87,7 @@
<arg
name=
"Y"
value=
"0"
/>
<arg
name=
"vehicle"
value=
"$(arg vehicle)"
/>
<arg
name=
"mavlink_udp_port"
value=
"14563"
/>
<arg
name=
"mavlink_tcp_port"
value=
"4563"
/>
<arg
name=
"ID"
value=
"$(arg ID)"
/>
</include>
<!-- MAVROS -->
...
...
This diff is collapsed.
Click to expand it.
launch/single_vehicle_spawn.launch
+
2
−
1
View file @
460c16cd
...
...
@@ -16,10 +16,11 @@
<env
name=
"PX4_SIM_MODEL"
value=
"$(arg vehicle)"
/>
<env
name=
"PX4_ESTIMATOR"
value=
"$(arg est)"
/>
<arg
name=
"mavlink_udp_port"
default=
"14560"
/>
<arg
name=
"mavlink_tcp_port"
default=
"4560"
/>
<!-- PX4 configs -->
<arg
name=
"interactive"
default=
"true"
/>
<!-- generate urdf vehicle model -->
<arg
name=
"cmd"
default=
"$(find xacro)/xacro $(find px4)/Tools/sitl_gazebo/models/rotors_description/urdf/$(arg vehicle)_base.xacro rotors_description_dir:=$(find px4)/Tools/sitl_gazebo/models/rotors_description mavlink_udp_port:=$(arg mavlink_udp_port) --inorder"
/>
<arg
name=
"cmd"
default=
"$(find xacro)/xacro $(find px4)/Tools/sitl_gazebo/models/rotors_description/urdf/$(arg vehicle)_base.xacro rotors_description_dir:=$(find px4)/Tools/sitl_gazebo/models/rotors_description mavlink_udp_port:=$(arg mavlink_udp_port)
mavlink_tcp_port:=$(arg mavlink_tcp_port)
--inorder"
/>
<param
command=
"$(arg cmd)"
name=
"rotors_description"
/>
<!-- PX4 SITL -->
<arg
unless=
"$(arg interactive)"
name=
"px4_command_arg1"
value=
""
/>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment