dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

cmake: replace vtol model with tailsitter model

This commit is contained in:
tumbili 2015-11-18 13:28:47 +01:00
parent 6200cf6d86
commit 2f0b24feab
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -184,7 +184,7 @@ clean:
# targets handled by cmake # 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 \ 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 \ run_cmake_config config gazebo gazebo_gdb gazebo_lldb jmavsim \
jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_vtol gazebo_iris gazebo_vtol jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_tailsitter gazebo_iris gazebo_tailsitter
$(foreach targ,$(cmake_targets),$(eval $(call cmake-targ,$(targ)))) $(foreach targ,$(cmake_targets),$(eval $(call cmake-targ,$(targ))))
.PHONY: clean .PHONY: clean

4
Tools/sitl_run.sh
View File

@ -88,9 +88,9 @@ then
ddd --debugger gdb --args mainapp ../../../../${rc_script}_${program} ddd --debugger gdb --args mainapp ../../../../${rc_script}_${program}
elif [ "$debugger" == "valgrind" ] elif [ "$debugger" == "valgrind" ]
then then
valgrind ./mainapp ../../../../${rc_script}_${program} valgrind ./mainapp ../../../../${rc_script}_${program}_${model}
else else
./mainapp ../../../../${rc_script}_${program} ./mainapp ../../../../${rc_script}_${program}_${model}
fi fi
if [ "$program" == "jmavsim" ] if [ "$program" == "jmavsim" ]

2
src/firmware/posix/CMakeLists.txt
View File

@ -34,7 +34,7 @@ add_dependencies(run_config mainapp)
foreach(viewer none jmavsim gazebo) foreach(viewer none jmavsim gazebo)
foreach(debugger none gdb lldb ddd valgrind) foreach(debugger none gdb lldb ddd valgrind)
foreach(model none iris vtol) foreach(model none iris tailsitter)
if (debugger STREQUAL "none") if (debugger STREQUAL "none")
if (model STREQUAL "none") if (model STREQUAL "none")
set(_targ_name "${viewer}") set(_targ_name "${viewer}")