Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_adc_launch
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
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mobile_robotics
ADC
ADC_2021
iri_adc_launch
Commits
fc6cd438
Commit
fc6cd438
authored
4 years ago
by
Sergi Hernandez
Browse files
Options
Downloads
Patches
Plain Diff
Added a new argument to choose to show the bodywork or not.
parent
3036cb67
No related branches found
No related tags found
1 merge request
!2
Development
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
launch/adc_sim.launch
+6
-0
6 additions, 0 deletions
launch/adc_sim.launch
launch/adc_sim_env.launch
+5
-0
5 additions, 0 deletions
launch/adc_sim_env.launch
with
11 additions
and
0 deletions
launch/adc_sim.launch
+
6
−
0
View file @
fc6cd438
...
@@ -11,6 +11,11 @@
...
@@ -11,6 +11,11 @@
<arg
name=
"car_y"
default=
"0.0"
/>
<arg
name=
"car_y"
default=
"0.0"
/>
<arg
name=
"car_yaw"
default=
"0.0"
/>
<arg
name=
"car_yaw"
default=
"0.0"
/>
<arg
name=
"bodywork"
default=
"Fasle"
/>
<arg
name=
"model"
default=
"$(find iri_model_car_description)/urdf/car.xacro"
unless=
"$(arg bodywork)"
/>
<arg
name=
"model"
default=
"$(find iri_adc_description)/urdf/adc_car.xacro"
if=
"$(arg bodywork)"
/>
<include
file=
"$(find iri_model_car_gazebo)/launch/sim.launch"
>
<include
file=
"$(find iri_model_car_gazebo)/launch/sim.launch"
>
<arg
name=
"name"
value=
"adc_car"
/>
<arg
name=
"name"
value=
"adc_car"
/>
<arg
name=
"output"
value=
"$(arg output)"
/>
<arg
name=
"output"
value=
"$(arg output)"
/>
...
@@ -21,6 +26,7 @@
...
@@ -21,6 +26,7 @@
<arg
name=
"car_y"
value=
"$(arg car_y)"
/>
<arg
name=
"car_y"
value=
"$(arg car_y)"
/>
<arg
name=
"car_yaw"
value=
"$(arg car_yaw)"
/>
<arg
name=
"car_yaw"
value=
"$(arg car_yaw)"
/>
<arg
name=
"sim_config_path"
value=
"$(find iri_adc_launch)/config/adc_sim"
/>
<arg
name=
"sim_config_path"
value=
"$(find iri_adc_launch)/config/adc_sim"
/>
<arg
name=
"model"
value=
"$(arg model)"
/>
<arg
name=
"car_controller_config_file"
value=
"$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"
/>
<arg
name=
"car_controller_config_file"
value=
"$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"
/>
<arg
name=
"control_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"
/>
<arg
name=
"control_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"
/>
<arg
name=
"odometry_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"
/>
<arg
name=
"odometry_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"
/>
...
...
This diff is collapsed.
Click to expand it.
launch/adc_sim_env.launch
+
5
−
0
View file @
fc6cd438
...
@@ -17,6 +17,10 @@
...
@@ -17,6 +17,10 @@
<arg
name=
"road_y"
default=
"0.0"
/>
<arg
name=
"road_y"
default=
"0.0"
/>
<arg
name=
"road_yaw"
default=
"0.0"
/>
<arg
name=
"road_yaw"
default=
"0.0"
/>
<arg
name=
"bodywork"
default=
"Fasle"
/>
<arg
name=
"model"
default=
"$(find iri_model_car_description)/urdf/car.xacro"
unless=
"$(arg bodywork)"
/>
<arg
name=
"model"
default=
"$(find iri_adc_description)/urdf/adc_car.xacro"
if=
"$(arg bodywork)"
/>
<include
file=
"$(find iri_model_car_gazebo)/launch/sim.launch"
>
<include
file=
"$(find iri_model_car_gazebo)/launch/sim.launch"
>
<arg
name=
"name"
value=
"adc_car"
/>
<arg
name=
"name"
value=
"adc_car"
/>
<arg
name=
"output"
value=
"$(arg output)"
/>
<arg
name=
"output"
value=
"$(arg output)"
/>
...
@@ -27,6 +31,7 @@
...
@@ -27,6 +31,7 @@
<arg
name=
"car_y"
value=
"$(arg car_y)"
/>
<arg
name=
"car_y"
value=
"$(arg car_y)"
/>
<arg
name=
"car_yaw"
value=
"$(arg car_yaw)"
/>
<arg
name=
"car_yaw"
value=
"$(arg car_yaw)"
/>
<arg
name=
"sim_config_path"
value=
"$(find iri_adc_launch)/config/adc_sim"
/>
<arg
name=
"sim_config_path"
value=
"$(find iri_adc_launch)/config/adc_sim"
/>
<arg
name=
"model"
value=
"$(arg model)"
/>
<arg
name=
"car_controller_config_file"
value=
"$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"
/>
<arg
name=
"car_controller_config_file"
value=
"$(find iri_adc_launch)/config/adc_sim/adc_controller_config.yaml"
/>
<arg
name=
"control_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"
/>
<arg
name=
"control_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_control_config.yaml"
/>
<arg
name=
"odometry_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"
/>
<arg
name=
"odometry_config_file"
value=
"$(find iri_adc_launch)/config/adc_common/adc_odometry_config.yaml"
/>
...
...
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