mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-10-29 06:23:34 +08:00
PX4 System changes Supporting STM32H7
stm32:ToneAlarmInterfacePWM TIM15-TIM17 have a BDTR Register common:board_crashdump Add H7 support stm32/board_mcu_version:Support H7 PX4 ADC:Use 32 interface and resoution abstraction Added PX4 stm32h7 ADC driver stm32h7:adc fix ADC ready check fmu: handle BOARD_HAS_PWM==5 cmake: improve error handling for NuttX olddefconfig failures WorkQueueManager:Quiet loadmon stack warning camera_trigger:GPIO support < 6 GPIO Adjust stack sizes (under hw stack check) PX4 System changes Supporting STM32H7 PX4IO Driver aerotenna_ocpoc:ADC add px4_arch_adc_dn_fullcount init.cmake:Track Upstream change needing Make.def at config time PX4 System changes Supporting STM32H7 NuttX CMakeLists.txt Track upstream changes Common board_crashdump add header and px4 config NuttX simplify callinb make libapps Use UINT32_MAX for error return drivers:uavcannode NuttX chip is now hardware drivers:uavcanesc NuttX chip is now hardware px4io:Avoid Race on AP to PX4 IO upgrade
This commit is contained in:
committed by
Lorenz Meier
parent
58799dc7d1
commit
e847698c9f
@@ -92,6 +92,11 @@ execute_process(COMMAND ${cp_cmd} ${cp_opts} ${CP_SRC} ${CP_DST} WORKING_DIRECTO
|
||||
|
||||
set(NUTTX_DEFCONFIG ${NUTTX_CONFIG_DIR}/${NUTTX_CONFIG}/defconfig CACHE FILEPATH "path to defconfig" FORCE)
|
||||
|
||||
###############################################################################
|
||||
# Create a temporary Toplevel Make.defs for the oldconfig step
|
||||
###############################################################################
|
||||
configure_file(${NUTTX_SRC_DIR}/Make.defs.in ${NUTTX_DIR}/Make.defs)
|
||||
|
||||
# If the board provides a Kconfig Use it or create an empty one
|
||||
if(EXISTS ${NUTTX_CONFIG_DIR}/Kconfig)
|
||||
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different ${NUTTX_CONFIG_DIR}/Kconfig ${NUTTX_DIR}/boards/dummy/Kconfig)
|
||||
@@ -120,7 +125,17 @@ if (NOT config_expanded)
|
||||
WORKING_DIRECTORY ${NUTTX_DIR}
|
||||
OUTPUT_FILE nuttx_olddefconfig.log
|
||||
ERROR_FILE nuttx_olddefconfig.log
|
||||
RESULT_VARIABLE ret
|
||||
)
|
||||
if(NOT ret EQUAL "0")
|
||||
# Show the log here as it will be deleted due to the incomplete configure step
|
||||
file(READ ${NUTTX_DIR}/nuttx_olddefconfig.log DEFCONFIG_LOG)
|
||||
message( STATUS "${DEFCONFIG_LOG}")
|
||||
message( FATAL_ERROR "NuttX olddefconfig target failed. \
|
||||
Possible cause: the board (${NUTTX_CONFIG_DIR}/${NUTTX_CONFIG}) has the wrong directory structure (i.e. missing files).")
|
||||
endif()
|
||||
# remove Toplevel Make.defs
|
||||
file(REMOVE ${NUTTX_DIR}/Make.defs)
|
||||
endif()
|
||||
|
||||
###############################################################################
|
||||
|
||||
@@ -107,6 +107,9 @@ function(px4_os_determine_build_chip)
|
||||
elseif(CONFIG_ARCH_CHIP_STM32F7)
|
||||
set(CHIP_MANUFACTURER "stm")
|
||||
set(CHIP "stm32f7")
|
||||
elseif(CONFIG_ARCH_CHIP_STM32H7)
|
||||
set(CHIP_MANUFACTURER "stm")
|
||||
set(CHIP "stm32h7")
|
||||
elseif(CONFIG_ARCH_CHIP_MK66FN2M0VMD18)
|
||||
set(CHIP_MANUFACTURER "nxp")
|
||||
set(CHIP "k66")
|
||||
|
||||
Reference in New Issue
Block a user