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
b4b385cc
Commit
b4b385cc
authored
9 years ago
by
Lorenz Meier
Browse files
Options
Downloads
Patches
Plain Diff
Add Iris optical flow SITL config
parent
c7640723
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
Makefile
+1
-2
1 addition, 2 deletions
Makefile
src/firmware/posix/CMakeLists.txt
+1
-1
1 addition, 1 deletion
src/firmware/posix/CMakeLists.txt
with
2 additions
and
3 deletions
Makefile
+
1
−
2
View file @
b4b385cc
...
...
@@ -155,7 +155,6 @@ posix_sitl_ekf2:
ros_sitl_default
:
@
echo
"This target is deprecated. Use make 'posix_sitl_default gazebo' instead."
# $(call cmake-build,$@)
qurt_eagle_travis
:
$(
call cmake-build,
$@
)
...
...
@@ -202,7 +201,7 @@ clean:
# targets handled by cmake
cmake_targets
=
test
upload package package_source debug debug_tui debug_ddd debug_io debug_io_tui debug_io_ddd check_weak
\
run_cmake_config config gazebo gazebo_gdb gazebo_lldb jmavsim
\
jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_tailsitter gazebo_iris gazebo_tailsitter
\
jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_tailsitter gazebo_iris
gazebo_iris_opt_flow
gazebo_tailsitter
\
gazebo_gdb_standard_vtol gazebo_lldb_standard_vtol gazebo_standard_vtol
$(
foreach
targ,
$(
cmake_targets
)
,
$(
eval
$(
call cmake-targ,
$(
targ
))))
...
...
This diff is collapsed.
Click to expand it.
src/firmware/posix/CMakeLists.txt
+
1
−
1
View file @
b4b385cc
...
...
@@ -36,7 +36,7 @@ add_dependencies(run_config mainapp)
foreach
(
viewer none jmavsim gazebo
)
foreach
(
debugger none gdb lldb ddd valgrind
)
foreach
(
model none iris tailsitter standard_vtol
)
foreach
(
model none iris
iris_opt_flow
tailsitter standard_vtol
)
if
(
debugger STREQUAL
"none"
)
if
(
model STREQUAL
"none"
)
set
(
_targ_name
"
${
viewer
}
"
)
...
...
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