zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
20496 Commits
14 Branches
0 Tags
306 MiB
Tree: 8d1f35bff6
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '8d1f35bff6'
${ noResults }
px4_autopilot/cmake/configs/posix_sitl_replay.cmake

56 lines
1.0 KiB
Raw Normal View History Unescape

CMake: Add replay config
9 years ago
include(posix/px4_impl_posix)
Path cleanup, low impact changes (#5340) * Low impact changes from path_cleanup branch. This is a step towards minimizing the diff with path_cleanup branch. * Update ecl. * Revert matrix update. * Revert ecl and matrix. * Update sitl gazebo. * Revert sitl_gazebo and matrix changes.
9 years ago
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-native.cmake)
CMake: Add replay config
9 years ago
set(config_module_list
drivers/device
drivers/boards/sitl
platforms/common
platforms/posix/px4_layer
platforms/posix/work_queue
systemcmds/param
systemcmds/ver
systemcmds/perf
modules/uORB
modules/param
modules/systemlib
modules/ekf2
modules/ekf2_replay
modules/sdlog2
new logger
9 years ago
modules/logger
Moved control library.
9 years ago
lib/controllib
CMake: Add replay config
9 years ago
lib/mathlib
lib/mathlib/math/filter
lib/conversion
lib/ecl
lib/external_lgpl
lib/geo
lib/geo_lookup
version cleanup: move all version information into version.c and use a common API The provided versioning information is the same, except for some additions, like OS version (which still need to be implemented on NuttX).
8 years ago
lib/version
Use DriverFramework as a PX4 module (#4415) * Use DriverFramework as a PX4 module Targets wanting to use DriverFramework must add lib/DriverFramework/framework to their config file. Signed-off-by: Mark Charlebois <charlebm@gmail.com> * Removed spurious code No need to add if check before for loop Signed-off-by: Mark Charlebois <charlebm@gmail.com> * Added DriverFramework to NuttX configs Added lib/DriverFramework/firmware to nuttx configs Signed-off-by: Mark Charlebois <charlebm@gmail.com> * Updated src/lib/DriverFramework * Removed DF_TARGET and __DF_${OS} defines These are now handled inside DriverFramework Signed-off-by: Mark Charlebois <charlebm@gmail.com> * Updated DriverFramework Signed-off-by: Mark Charlebois <charlebm@gmail.com> * Restored __DF_${OS} The include files in DriverFramwork need to know the target OS. Signed-off-by: Mark Charlebois <charlebm@gmail.com>
9 years ago
lib/DriverFramework/framework
CMake: Add replay config
9 years ago
)
set(config_extra_builtin_cmds
serdis
sercon
)
Bug fixes, typos, indentation. Over time I made a few changes unrelated to what I'm really working on. These changes are hereby committed first. The bug fixes are related to what I'm doing in that I need them to be fixed for future commits. Tools/sitl_run.sh: rename label to rcS_dir and fix usage help. cmake/common/px4_base.cmake: Remove the check on OUT_UNPARSED_ARGUMENTS, and a few typos and indentation issues. cmake/configs/posix_sitl_replay.cmake: Set the correct variable (config_sitl_rcS_dir) to the correct directory. cmake/nuttx/px4_impl_nuttx.cmake: typos and indentation issues, and removal of a redundant FORCE (INTERNAL implies FORCE). cmake/posix/px4_impl_posix.cmake: typos and indentation issues. cmake/qurt/px4_impl_qurt.cmake: typos and indentation issues. src/modules/mavlink/mavlink_ftp.cpp : possible strict-aliasing breakage. NOTES The second argument passed to sitl_run.sh is the value of config_sitl_rcS_dir. This fact is missing from the usage help. I renamed 'label' to 'rcS_dir' to better reflect this. Also, for the 'replay' config the wrong variable was set causing the call to sitl_run.sh to skip an argument and fail (ie the debugger was passed as rcS_dir and so on). The check on OUT_UNPARSED_ARGUMENTS in px4_parse_function_args basically causes every passed IN variable to be REQUIRED and is therefore a bug. The test for the presence of the REQUIRED arguments follows directly after and is sufficient for this job. This bug went unnoticed because currently every argument to OPTIONS, ONE_VALUE, and MULTI_VALUE is actually passed to the function(s) calling px4_parse_function_args (them being REQUIRED or not). The changes in mavlink_ftp.cpp are to avoid a possible aliasing bug and (mostly) to avoid the compiler warning/error: dereferencing type- punned pointer will break strict-aliasing rules [-Werror=strict-aliasing].
9 years ago
set(config_sitl_rcS_dir
posix-configs/SITL/init/replay
Partly cleanup and simplify cmake/configs/posix_sitl_* config files. While the config_sitl_rcS_dir is used more extensively (and actually only depending on the base cmake target), the variables config_sitl_viewer and config_sitl_debugger are just used to be passed on for the run_config target; config_sitl_debugger is even *always* 'disable'. Hence, they don't really need to be cached (INTERNAL or not). Before this patch FILEPATH was used instead of INTERNAL, but I doubt very much that that was intended. That only makes sense when cmake-gui would be used and then would pop-up a file browser to let the user pick a file (while really they need to pick a directory, so it's wrong either way). The ONLY reason caching would be used is when a developer edits the build_posix_sitl_*/CMakeCache.txt files, changes these values and then runs cmake in the build directory again, now overriding the values intended here. Nevertheless, I left in the caching. The main change in this commit (that theoretically has no real effect) is that I removed the duplicated maintenance of posix_sitl_broadcast.cmake. When that file was added, it was an exact copy of posix_sitl_default.cmake and is since not always maintained to remain the same. I don't think that difference is in anyway relevant for the broadcasting part though. Note that I think that something like that also holds for the posix_sitl_replay.cmake; it would be a lot better - maintenance-wise - when it was just derived from (or the same as) posix_sitl_default, I think.
9 years ago
CACHE INTERNAL "init script dir for sitl"
CMake: Add replay config
9 years ago
)
set(config_sitl_viewer
replay
CACHE STRING "viewer for sitl"
)
set_property(CACHE config_sitl_viewer
PROPERTY STRINGS "replay;none")
set(config_sitl_debugger
disable
CACHE STRING "debugger for sitl"
)
set_property(CACHE config_sitl_debugger
PROPERTY STRINGS "disable;gdb;lldb")