Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-01 19:07:45 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

cmake: embed param metadata if not CONSTRAINED_FLASH and not "test" LABEL

Browse Source
This commit is contained in:
Beat Küng
2021-04-13 11:04:10 +02:00
parent 592dc65bae
commit 2219e096d7
9 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/holybro/kakutef7/default.cmake
+1
View File
@@ -6,6 +6,7 @@ px4_add_board(
LABEL default LABEL default
TOOLCHAIN arm-none-eabi TOOLCHAIN arm-none-eabi
ARCHITECTURE cortex-m7 ARCHITECTURE cortex-m7
EXTERNAL_METADATA
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
SERIAL_PORTS SERIAL_PORTS
TEL1:/dev/ttyS0 # UART1 TEL1:/dev/ttyS0 # UART1
boards/px4/fmu-v5/optimized.cmake
+1
View File
@@ -12,6 +12,7 @@ px4_add_board(
ARCHITECTURE cortex-m7 ARCHITECTURE cortex-m7
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
IO px4_io-v2_default IO px4_io-v2_default
EXTERNAL_METADATA
TESTING TESTING
#UAVCAN_INTERFACES 2 #UAVCAN_INTERFACES 2
SERIAL_PORTS SERIAL_PORTS
boards/px4/sitl/ctrlalloc.cmake
-1
View File
@@ -5,7 +5,6 @@ px4_add_board(
MODEL sitl MODEL sitl
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
LABEL ctrlalloc LABEL ctrlalloc
EMBEDDED_METADATA parameters
TESTING TESTING
DRIVERS DRIVERS
#barometer # all available barometer drivers #barometer # all available barometer drivers
boards/px4/sitl/default.cmake
-1
View File
@@ -5,7 +5,6 @@ px4_add_board(
MODEL sitl MODEL sitl
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
LABEL default LABEL default
EMBEDDED_METADATA parameters
TESTING TESTING
ETHERNET ETHERNET
DRIVERS DRIVERS
boards/px4/sitl/nolockstep.cmake
-1
View File
@@ -5,7 +5,6 @@ px4_add_board(
MODEL sitl MODEL sitl
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
LABEL nolockstep LABEL nolockstep
EMBEDDED_METADATA parameters
TESTING TESTING
DRIVERS DRIVERS
#barometer # all available barometer drivers #barometer # all available barometer drivers
boards/px4/sitl/rtps.cmake
-1
View File
@@ -5,7 +5,6 @@ px4_add_board(
MODEL sitl MODEL sitl
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
LABEL rtps LABEL rtps
EMBEDDED_METADATA parameters
TESTING TESTING
DRIVERS DRIVERS
#barometer # all available barometer drivers #barometer # all available barometer drivers
boards/px4/sitl/test.cmake
-1
View File
@@ -5,7 +5,6 @@ px4_add_board(
MODEL sitl MODEL sitl
ROMFSROOT px4fmu_common ROMFSROOT px4fmu_common
LABEL test LABEL test
EMBEDDED_METADATA parameters
TESTING TESTING
DRIVERS DRIVERS
#barometer # all available barometer drivers #barometer # all available barometer drivers
cmake/px4_add_board.cmake
+8 -11
View File
@@ -57,9 +57,9 @@
# [ SERIAL_PORTS <list> ] # [ SERIAL_PORTS <list> ]
# [ CONSTRAINED_FLASH ] # [ CONSTRAINED_FLASH ]
# [ CONSTRAINED_MEMORY ] # [ CONSTRAINED_MEMORY ]
# [ EXTERNAL_METADATA ]
# [ TESTING ] # [ TESTING ]
# [ LINKER_PREFIX <string> ] # [ LINKER_PREFIX <string> ]
# [ EMBEDDED_METADATA <string> ]
# [ ETHERNET ] # [ ETHERNET ]
# ) # )
# #
@@ -80,9 +80,9 @@
# SYSTEMCMDS : list of system commands to build for this board (relative to src/systemcmds) # SYSTEMCMDS : list of system commands to build for this board (relative to src/systemcmds)
# EXAMPLES : list of example modules to build for this board (relative to src/examples) # EXAMPLES : list of example modules to build for this board (relative to src/examples)
# SERIAL_PORTS : mapping of user configurable serial ports and param facing name # SERIAL_PORTS : mapping of user configurable serial ports and param facing name
# EMBEDDED_METADATA : list of metadata to embed to ROMFS
# CONSTRAINED_FLASH : flag to enable constrained flash options (eg limit init script status text) # CONSTRAINED_FLASH : flag to enable constrained flash options (eg limit init script status text)
# CONSTRAINED_MEMORY : flag to enable constrained memory options (eg limit maximum number of uORB publications) # CONSTRAINED_MEMORY : flag to enable constrained memory options (eg limit maximum number of uORB publications)
# EXTERNAL_METADATA : flag to exclude metadata to reduce flash
# TESTING : flag to enable automatic inclusion of PX4 testing modules # TESTING : flag to enable automatic inclusion of PX4 testing modules
# LINKER_PREFIX : optional to prefix on the Linker script. # LINKER_PREFIX : optional to prefix on the Linker script.
# ETHERNET : flag to indicate that ethernet is enabled # ETHERNET : flag to indicate that ethernet is enabled
@@ -156,11 +156,11 @@ function(px4_add_board)
EXAMPLES EXAMPLES
SERIAL_PORTS SERIAL_PORTS
UAVCAN_PERIPHERALS UAVCAN_PERIPHERALS
EMBEDDED_METADATA
OPTIONS OPTIONS
BUILD_BOOTLOADER BUILD_BOOTLOADER
CONSTRAINED_FLASH CONSTRAINED_FLASH
CONSTRAINED_MEMORY CONSTRAINED_MEMORY
EXTERNAL_METADATA
TESTING TESTING
ETHERNET ETHERNET
REQUIRED REQUIRED
@@ -207,14 +207,11 @@ function(px4_add_board)
set(romfs_extra_files) set(romfs_extra_files)
set(config_romfs_extra_dependencies) set(config_romfs_extra_dependencies)
foreach(metadata ${EMBEDDED_METADATA}) # additional embedded metadata
if(${metadata} STREQUAL "parameters") if (NOT CONSTRAINED_FLASH AND NOT EXTERNAL_METADATA AND NOT ${PX4_BOARD_LABEL} STREQUAL "test")
list(APPEND romfs_extra_files ${PX4_BINARY_DIR}/parameters.json.xz) list(APPEND romfs_extra_files ${PX4_BINARY_DIR}/parameters.json.xz)
list(APPEND romfs_extra_dependencies parameters_xml) list(APPEND romfs_extra_dependencies parameters_xml)
else() endif()
message(FATAL_ERROR "invalid value for EMBEDDED_METADATA: ${metadata}")
endif()
endforeach()
list(APPEND romfs_extra_files ${PX4_BINARY_DIR}/component_general.json.xz) list(APPEND romfs_extra_files ${PX4_BINARY_DIR}/component_general.json.xz)
list(APPEND romfs_extra_dependencies component_general_json) list(APPEND romfs_extra_dependencies component_general_json)
set(config_romfs_extra_files ${romfs_extra_files} CACHE INTERNAL "extra ROMFS files" FORCE) set(config_romfs_extra_files ${romfs_extra_files} CACHE INTERNAL "extra ROMFS files" FORCE)
src/lib/component_information/CMakeLists.txt
+1 -3
View File
@@ -37,12 +37,10 @@
# 2: COMP_METADATA_TYPE_COMMANDS # 2: COMP_METADATA_TYPE_COMMANDS
# 3: COMP_METADATA_TYPE_PERIPHERALS # 3: COMP_METADATA_TYPE_PERIPHERALS
set(comp_metadata_types) set(comp_metadata_types)
# We disable parameter support if the metadata is not in the ROMFS. This can be
# removed once it is stored on a server
list(FIND config_romfs_extra_dependencies "parameters_xml" index)
set(comp_metadata_board "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}") set(comp_metadata_board "${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}")
set(s3_url "https://px4-travis.s3.amazonaws.com") set(s3_url "https://px4-travis.s3.amazonaws.com")
set(comp_metadata_param_uri_board "${s3_url}/Firmware/{version}/${comp_metadata_board}/parameters.json.xz") set(comp_metadata_param_uri_board "${s3_url}/Firmware/{version}/${comp_metadata_board}/parameters.json.xz")
list(FIND config_romfs_extra_dependencies "parameters_xml" index)
if (${index} EQUAL -1) if (${index} EQUAL -1)
set(comp_metadata_param_uri ${comp_metadata_param_uri_board}) set(comp_metadata_param_uri ${comp_metadata_param_uri_board})
# use generic URL as fallback # use generic URL as fallback