fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-20 10:33:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

boards new split VENDOR_MODEL naming convention

Browse Source
This commit is contained in:
Daniel Agar
2018-11-26 14:40:14 -08:00
committed by David Sidrane
parent f692ad04d0
commit abb3817d31
149 changed files with 401 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platforms/nuttx/CMakeLists.txt
+3 -2
View File
@@ -35,7 +35,7 @@ include(cygwin_cygpath)
add_subdirectory(src)
set(FW_NAME ${PX4_BOARD_VENDOR}${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf)
set(FW_NAME ${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf)
add_executable(${FW_NAME} ${PX4_SOURCE_DIR}/src/platforms/empty.c)
add_dependencies(${FW_NAME} git_nuttx nuttx_build)
@@ -281,7 +281,8 @@ if (BLOATY_PROGRAM)
# bloaty compare with last master build
add_custom_target(bloaty_compare_master
COMMAND wget --no-verbose https://s3.amazonaws.com/px4-travis/Firmware/master/nuttx_${FW_NAME} -O master_${FW_NAME}
#COMMAND wget --no-verbose https://s3.amazonaws.com/px4-travis/Firmware/master/${FW_NAME} -O master_${FW_NAME}
COMMAND wget --no-verbose https://s3.amazonaws.com/px4-travis/Firmware/master/nuttx_${PX4_BOARD_VENDOR}${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}.elf -O master_${FW_NAME}
COMMAND ${BLOATY_PROGRAM} -d symbols -n 50 -C full -s vm $<TARGET_FILE:${FW_NAME}> -- master_${FW_NAME}
DEPENDS ${FW_NAME}
WORKING_DIRECTORY ${PX4_BINARY_DIR}
platforms/nuttx/Debug/poor-mans-profiler.sh
+1 -1
View File
@@ -77,7 +77,7 @@ do
shift
done
[[ -z "$elf" ]] && die "Please specify the ELF file location, e.g.: build/px4fmu-v4_default/px4fmu-v4_default.elf"
[[ -z "$elf" ]] && die "Please specify the ELF file location, e.g.: build/px4_fmu-v4_default/px4_fmu-v4_default.elf"
#
# Temporary files
platforms/nuttx/NuttX/CMakeLists.txt
+1 -1
View File
@@ -4,7 +4,7 @@ px4_add_git_submodule(TARGET git_nuttx PATH "nuttx")
px4_add_git_submodule(TARGET git_nuttx_apps PATH "apps")
if(NOT PX4_BOARD)
message(FATAL_ERROR "PX4_BOARD must be set (eg px4fmu-v2)")
message(FATAL_ERROR "PX4_BOARD must be set (eg px4_fmu-v2)")
endif()
project(NuttX_${PX4_BOARD} LANGUAGES ASM C CXX)
platforms/nuttx/cmake/px4_add_board_os.cmake
+1 -1
View File
@@ -62,7 +62,7 @@ include(px4_base)
#
# Example:
# px4_add_board_os(
# BOARD px4fmu-v2_default
# BOARD px4_fmu-v2_default
# OS nuttx
# )
#
platforms/nuttx/cmake/px4_impl_os.cmake
+1 -1
View File
@@ -159,7 +159,7 @@ endfunction()
# OUT : the target list
#
# Example:
# px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2)
# px4_os_prebuild_targets(OUT target_list BOARD px4_fmu-v2)
#
function(px4_os_prebuild_targets)
px4_parse_function_args(
platforms/nuttx/src/px4_layer/CMakeLists.txt
+1 -1
View File
@@ -32,7 +32,7 @@
############################################################################
# skip for px4_layer support on an IO board
if (NOT ${PX4_BOARD} MATCHES "px4io")
if (NOT ${PX4_BOARD} MATCHES "px4_io")
add_library(px4_layer
px4_nuttx_tasks.c
platforms/posix/CMakeLists.txt
+4 -4
View File
@@ -21,7 +21,7 @@ px4_posix_generate_alias(
PREFIX ${PX4_SHELL_COMMAND_PREFIX}
)
if (("${PX4_BOARD}" STREQUAL "atlflighteagle") OR ("${PX4_BOARD}" STREQUAL "atlflightexcelsior"))
if (("${PX4_BOARD}" STREQUAL "atlflight_eagle") OR ("${PX4_BOARD}" STREQUAL "atlflight_excelsior"))
include(fastrpc)
include(linux_app)
@@ -109,7 +109,7 @@ if (("${PX4_BOARD}" MATCHES "raspberrypi") OR ("${PX4_BOARD}" MATCHES "navio2"))
USES_TERMINAL
)
elseif ("${PX4_BOARD}" MATCHES "bbblue")
elseif ("${PX4_BOARD}" MATCHES "beaglebone_blue")
target_link_libraries(px4 PRIVATE robotcontrol)
add_custom_target(upload
@@ -178,9 +178,9 @@ elseif ("${PX4_BOARD}" MATCHES "sitl")
# sitl_gazebo built plugins
install(
DIRECTORY
${PROJECT_SOURCE_DIR}/build/px4sitl_default/build_gazebo
${PROJECT_SOURCE_DIR}/build/px4_sitl_default/build_gazebo
DESTINATION
${PROJECT_NAME}/build/px4sitl_default
${PROJECT_NAME}/build/px4_sitl_default
FILES_MATCHING
PATTERN "CMakeFiles" EXCLUDE
PATTERN "*.so"
platforms/posix/cmake/px4_add_board_os.cmake
+1 -1
View File
@@ -62,7 +62,7 @@ include(px4_base)
#
# Example:
# px4_add_board_os(
# BOARD px4fmu-v2_default
# BOARD px4_fmu-v2_default
# OS nuttx
# )
#
platforms/posix/cmake/px4_impl_os.cmake
+3 -3
View File
@@ -403,7 +403,7 @@ function(px4_os_add_flags)
# TODO: Wmissing-field-initializers ignored on older toolchain, can be removed eventually
list(APPEND added_cxx_flags -Wno-missing-field-initializers)
elseif ("${PX4_BOARD}" MATCHES "ocpoc")
elseif ("${PX4_BOARD}" MATCHES "aerotenna_ocpoc")
add_definitions(
-D__PX4_POSIX_OCPOC
@@ -412,7 +412,7 @@ function(px4_os_add_flags)
-D__PX4_POSIX
)
elseif ("${PX4_BOARD}" STREQUAL "bbblue")
elseif ("${PX4_BOARD}" STREQUAL "beaglebone_blue")
add_definitions(
-D__PX4_POSIX_BBBLUE
@@ -473,7 +473,7 @@ endfunction()
# OUT : the target list
#
# Example:
# px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2)
# px4_os_prebuild_targets(OUT target_list BOARD px4_fmu-v2)
#
function(px4_os_prebuild_targets)
px4_parse_function_args(
platforms/qurt/cmake/px4_add_board_os.cmake
+1 -1
View File
@@ -62,7 +62,7 @@ include(px4_base)
#
# Example:
# px4_add_board_os(
# BOARD px4fmu-v2_default
# BOARD px4_fmu-v2_default
# OS nuttx
# )
#
platforms/qurt/cmake/px4_impl_os.cmake
+1 -1
View File
@@ -227,7 +227,7 @@ endfunction()
# OUT : the target list
#
# Example:
# px4_os_prebuild_targets(OUT target_list BOARD px4fmu-v2)
# px4_os_prebuild_targets(OUT target_list BOARD px4_fmu-v2)
#
function(px4_os_prebuild_targets)
px4_parse_function_args(