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

boards new split VENDOR_MODEL naming convention

This commit is contained in:
Daniel Agar 2018-11-21 23:27:21 -05:00 committed by David Sidrane
parent f692ad04d0
commit abb3817d31
149 changed files with 401 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.ci/Jenkinsfile-SITL_tests
View File

@ -30,7 +30,7 @@ pipeline {
sh('make distclean')
sh "ccache -z"
sh "git fetch --tags"
sh('make px4sitl_default')
sh('make px4_sitl_default')
sh "ccache -s"
}
}
@ -47,8 +47,8 @@ pipeline {
stage('unit tests') {
steps {
sh 'export'
sh 'make px4sitl_default test_results_junit'
junit 'build/px4sitl_default/JUnitTestResults.xml'
sh 'make px4_sitl_default test_results_junit'
junit 'build/px4_sitl_default/JUnitTestResults.xml'
}
}
@ -56,7 +56,7 @@ pipeline {
steps {
sh 'export'
sh "ccache -z"
sh('make px4sitl_default sitl_gazebo')
sh('make px4_sitl_default sitl_gazebo')
sh "ccache -s"
}
}
@ -64,8 +64,8 @@ pipeline {
stage('package') {
steps {
sh 'export'
sh('make px4sitl_default package')
stash(name: "px4_sitl_package", includes: "build/px4sitl_default/*.bz2")
sh('make px4_sitl_default package')
stash(name: "px4_sitl_package", includes: "build/px4_sitl_default/*.bz2")
}
}
@ -176,7 +176,7 @@ pipeline {
steps {
sh 'export'
sh 'make distclean'
sh 'make px4sitl_default test_results_junit'
sh 'make px4_sitl_default test_results_junit'
withCredentials([string(credentialsId: 'FIRMWARE_CODECOV_TOKEN', variable: 'CODECOV_TOKEN')]) {
sh 'curl -s https://codecov.io/bash | bash -s - -F unittest'
}
@ -221,11 +221,11 @@ def createTestNode(Map test_def) {
}
unstash('px4_sitl_package')
sh('tar -xjpvf build/px4sitl_default/px4-px4sitl_default*.bz2')
sh('tar -xjpvf build/px4_sitl_default/px4-px4_sitl_default*.bz2')
// run test
try {
sh('px4-px4sitl_default*/px4/test/rostest_px4_run.sh ' + test_def.test + ' mission:=' + test_def.mission + ' vehicle:=' + test_def.vehicle)
sh('px4-px4_sitl_default*/px4/test/rostest_px4_run.sh ' + test_def.test + ' mission:=' + test_def.mission + ' vehicle:=' + test_def.vehicle)
} catch (exc) {
// save all test artifacts for debugging
@ -240,7 +240,7 @@ def createTestNode(Map test_def) {
// process log data (with python code coverage)
try {
sh('coverage run -p px4-px4sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py .ros/log/*/*.ulg')
sh('coverage run -p px4-px4_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py .ros/log/*/*.ulg')
} catch (exc) {
// save log analysis artifacts for debugging
archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.pdf, .ros/**/*.csv')
@ -249,7 +249,7 @@ def createTestNode(Map test_def) {
}
// upload log to flight review (https://logs.px4.io/) with python code coverage
sh('coverage run -p px4-px4sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/log/*/*.ulg')
sh('coverage run -p px4-px4_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/log/*/*.ulg')
// upload python code coverage to codecov.io
sh 'curl -s https://codecov.io/bash | bash -s - -X gcov -F sitl_python_${STAGE_NAME}'
@ -257,7 +257,7 @@ def createTestNode(Map test_def) {
} else { // non code coverage
// process ekf log data
try {
sh('px4-px4sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py .ros/log/*/*.ulg')
sh('px4-px4_sitl_default*/px4/Tools/ecl_ekf/process_logdata_ekf.py .ros/log/*/*.ulg')
} catch (exc) {
// save log analysis artifacts for debugging
archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.pdf, .ros/**/*.csv')
@ -266,7 +266,7 @@ def createTestNode(Map test_def) {
}
// upload log to flight review (https://logs.px4.io/)
sh('px4-px4sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/log/*/*.ulg')
sh('px4-px4_sitl_default*/px4/Tools/upload_log.py -q --description "${JOB_NAME}: ${STAGE_NAME}" --feedback "${JOB_NAME} ${CHANGE_TITLE} ${CHANGE_URL}" --source CI .ros/log/*/*.ulg')
}
if (!test_ok) {

34
.ci/Jenkinsfile-compile
View File

@ -18,8 +18,8 @@ pipeline {
snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
]
// MAC OSX px4sitl_default
build_nodes["px4sitl_default (OSX)"] = {
// MAC OSX px4_sitl_default
build_nodes["px4_sitl_default (OSX)"] = {
node("mac") {
withEnv(["CCACHE_BASEDIR=${pwd()}"]) {
stage("sitl (OSX)") {
@ -28,7 +28,7 @@ pipeline {
sh('export')
sh('make distclean')
sh('ccache -z')
sh('make px4sitl_default')
sh('make px4_sitl_default')
sh('ccache -s')
sh('make tests')
}
@ -43,17 +43,17 @@ pipeline {
}
}
// MAC OSX px4fmu-v4pro_default
build_nodes["px4fmu-v4pro_default (OSX)"] = {
// MAC OSX px4_fmu-v4pro_default
build_nodes["px4_fmu-v4pro_default (OSX)"] = {
node("mac") {
withEnv(["CCACHE_BASEDIR=${pwd()}"]) {
stage("px4fmu-v4pro (OSX)") {
stage("px4_fmu-v4pro (OSX)") {
try {
checkout(scm)
sh('export')
sh('make distclean')
sh('ccache -z')
sh('make px4fmu-v4pro_default')
sh('make px4_fmu-v4pro_default')
sh('ccache -s')
}
catch (exc) {
@ -69,46 +69,46 @@ pipeline {
// docker builds:
def arch_builds = [
target: ["px4sitl_default"],
target: ["px4_sitl_default"],
image: docker_images.arch,
archive: false
]
def armhf_builds = [
target: ["aerotennaocpoc_ubuntu"],
target: ["aerotenna_ocpoc_ubuntu"],
image: docker_images.armhf,
archive: false
]
def base_builds = [
target: ["px4sitl_rtps"],
target: ["px4_sitl_rtps"],
image: docker_images.base,
archive: false
]
def nuttx_builds_archive = [
target: ["px4fmu-v2_default", "px4fmu-v3_default", "px4fmu-v4_default", "px4fmu-v4pro_default", "px4fmu-v5_default", "px4fmu-v5_rtps", "px4fmu-v5_stackcheck",
"intelaerofc-v1_default", "gumstixaerocore2_default", "auavx21_default", "avx-v1_default", "bitcrazecrazyflie_default", "airmindmindpx-v2_default",
"nxphlite-v3_default", "omnibusf4sd_default"],
target: ["px4_fmu-v2_default", "px4_fmu-v3_default", "px4_fmu-v4_default", "px4_fmu-v4pro_default", "px4_fmu-v5_default", "px4_fmu-v5_rtps", "px4_fmu-v5_stackcheck",
"intel_aerofc-v1_default", "gumstix_aerocore2_default", "auav_x21_default", "av_x-v1_default", "bitcraze_crazyflie_default", "airmind_mindpx-v2_default",
"nxp_hlite-v3_default", "omnibus_f4sd_default"],
image: docker_images.nuttx,
archive: true
]
def nuttx_builds_other = [
target: ["atmelsame70xplained_default", "stm32f4discovery_default", "px4cannode-v1_default",
"px4esc-v1_default", "stmnucleo-F767ZI_default", "thiemars2740vc-v1_default"],
target: ["atmel_same70xplained_default", "stm_32f4discovery_default", "px4_cannode-v1_default",
"px4_esc-v1_default", "stm_nucleo-F767ZI_default", "thiemar_s2740vc-v1_default"],
image: docker_images.nuttx,
archive: false
]
def rpi_builds = [
target: ["emlidnavio2_cross", "parrotbebop_default"],
target: ["emlid_navio2_cross", "parrot_bebop_default"],
image: docker_images.rpi,
archive: false
]
def snapdragon_builds = [
target: ["atlflighteagle_qurt-default", "atlflighteagle_default"],
target: ["atlflight_eagle_qurt-default", "atlflight_eagle_default"],
image: docker_images.snapdragon,
archive: false
]

32
.ci/Jenkinsfile-hardware
View File

@ -6,7 +6,7 @@ pipeline {
parallel {
stage('px4fmu-v2') {
stage('px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-11-22'
@ -18,11 +18,11 @@ pipeline {
sh 'make distclean'
sh 'ccache -z'
sh 'git fetch --tags'
sh 'make px4fmu-v2_test'
sh 'make px4_fmu-v2_test'
sh 'make sizes'
sh 'ccache -s'
stash includes: 'build/px4fmu-v2_test/px4fmu-v2_test.elf', name: 'px4fmu-v2_test'
stash includes: 'Tools/HIL/monitor_firmware_upload.py, Tools/HIL/run_tests.py', name: 'scripts-px4fmu-v2'
stash includes: 'build/px4_fmu-v2_test/px4_fmu-v2_test.elf', name: 'px4_fmu-v2_test'
stash includes: 'Tools/HIL/monitor_firmware_upload.py, Tools/HIL/run_tests.py', name: 'scripts-px4_fmu-v2'
}
post {
always {
@ -31,7 +31,7 @@ pipeline {
}
}
stage('px4fmu-v4 (stackcheck)') {
stage('px4_fmu-v4 (stackcheck)') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-11-22'
@ -43,11 +43,11 @@ pipeline {
sh 'make distclean'
sh 'ccache -z'
sh 'git fetch --tags'
sh 'make px4fmu-v4_stackcheck'
sh 'make px4_fmu-v4_stackcheck'
sh 'make sizes'
sh 'ccache -s'
stash includes: 'build/px4fmu-v4_stackcheck/px4fmu-v4_stackcheck.elf', name: 'px4fmu-v4_stackcheck'
stash includes: 'Tools/HIL/monitor_firmware_upload.py, Tools/HIL/run_tests.py', name: 'scripts-px4fmu-v4'
stash includes: 'build/px4_fmu-v4_stackcheck/px4_fmu-v4_stackcheck.elf', name: 'px4_fmu-v4_stackcheck'
stash includes: 'Tools/HIL/monitor_firmware_upload.py, Tools/HIL/run_tests.py', name: 'scripts-px4_fmu-v4'
}
post {
always {
@ -63,7 +63,7 @@ pipeline {
parallel {
stage('px4fmu-v2') {
stage('px4_fmu-v2') {
agent {
label 'px4fmu-v2'
}
@ -72,8 +72,8 @@ pipeline {
try {
sh 'export'
sh 'find /dev/serial'
unstash 'scripts-px4fmu-v2'
unstash 'px4fmu-v2_test'
unstash 'scripts-px4_fmu-v2'
unstash 'px4_fmu-v2_test'
sh ''' gdb -nx --batch \
-ex "target extended-remote `find /dev/serial -name *Black_Magic_Probe_*-if00`" \
-ex "monitor version" \
@ -82,7 +82,7 @@ pipeline {
-ex "attach 1" \
-ex "load" \
-ex "kill" \
build/px4fmu-v2_test/px4fmu-v2_test.elf
build/px4_fmu-v2_test/px4_fmu-v2_test.elf
'''
sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *Black_Magic_Probe_*-if02` --baudrate 57600'
sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *Black_Magic_Probe_*-if02`'
@ -97,7 +97,7 @@ pipeline {
}
}
stage('px4fmu-v4') {
stage('px4_fmu-v4') {
agent {
label 'px4fmu-v4'
}
@ -106,8 +106,8 @@ pipeline {
try {
sh 'export'
sh 'find /dev/serial'
unstash 'scripts-px4fmu-v4'
unstash 'px4fmu-v4_stackcheck'
unstash 'scripts-px4_fmu-v4'
unstash 'px4_fmu-v4_stackcheck'
sh ''' gdb -nx --batch \
-ex "target extended-remote `find /dev/serial -name *Black_Magic_Probe_*-if00`" \
-ex "monitor version" \
@ -116,7 +116,7 @@ pipeline {
-ex "attach 1" \
-ex "load" \
-ex "kill" \
build/px4fmu-v4_stackcheck/px4fmu-v4_stackcheck.elf
build/px4_fmu-v4_stackcheck/px4_fmu-v4_stackcheck.elf
'''
sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *Black_Magic_Probe_*-if02` --baudrate 57600'
sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *Black_Magic_Probe_*-if02`'

2
.travis.yml
View File

@ -28,5 +28,5 @@ addons:
description: "Build submitted via Travis CI"
notification_email: ci@px4.io
build_command_prepend: "make distclean"
build_command: "make px4sitl_default"
build_command: "make px4_sitl_default"
branch_pattern: coverity_scan

2
.ycm_extra_conf.py
View File

@ -61,7 +61,7 @@ flags = [
'c++',
'-undef', # get rid of standard definitions to allow us to include arm math header
'-I', os.path.join(os.path.expanduser("~"),'gcc-arm-none-eabi-4_7-2013q3/arm-none-eabi/include'),
'-I', 'Build/px4io-v2_default.build/nuttx-export/include/',
'-I', 'Build/px4_io-v2_default.build/nuttx-export/include/',
'-I', './NuttX/nuttx/arch/arm/include',
'-include', './src/include/visibility.h',
'-I', './src',

10
CMakeLists.txt
View File

@ -132,7 +132,7 @@ define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
# configuration
#
set(CONFIG "px4sitl_default" CACHE STRING "desired configuration")
set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")
set(config_module_list)
set(config_df_driver_list)
@ -173,8 +173,8 @@ if(NOT PX4_CONFIG_FILE)
break()
endif()
# <BOARD>_<LABEL> (eg px4fmu-v2_default)
# <BOARD>_default (eg px4fmu-v2) # allow skipping label if "default"
# <BOARD>_<LABEL> (eg px4_fmu-v2_default)
# <BOARD>_default (eg px4_fmu-v2) # allow skipping label if "default"
if ((${CONFIG} MATCHES "${board}_${label}") OR # match full board, label
((${label} STREQUAL "default") AND (${CONFIG} STREQUAL "${board}")) # default label can be omitted
)
@ -184,7 +184,7 @@ if(NOT PX4_CONFIG_FILE)
# LEGACY form
# <OS>_<BOARD>_<LABEL> (eg nuttx_px4fmu-v2_default)
# <OS>_<BOARD>_<LABEL> (eg nuttx_px4_fmu-v2_default)
string(REGEX REPLACE "^nuttx_|^posix_|^qurt_" "" config_no_os ${CONFIG}) # ignore OS prefix
if ((${config_no_os} MATCHES "${board}_${label}"))
@ -212,7 +212,7 @@ endif()
message(STATUS "PX4 config file: ${PX4_CONFIG_FILE}")
include(px4_add_board)
include(${PX4_CONFIG_FILE})
message(STATUS "PX4 config: ${PX4_BOARD_VENDOR} ${PX4_BOARD_MODEL} ${PX4_BOARD_LABEL}")
message(STATUS "PX4 config: ${PX4_BOARD_VENDOR}_${PX4_BOARD_MODEL}_${PX4_BOARD_LABEL}")
message(STATUS "PX4 platform: ${PX4_PLATFORM}")
# external modules

2
Firmware.sublime-project
View File

@ -62,7 +62,7 @@
"name": "PX4: make and upload",
"working_dir": "${project_path}",
"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
"cmd": ["make upload px4fmu-v2_default -j8"],
"cmd": ["make upload px4_fmu-v2_default -j8"],
"shell": true
},
{

40
Jenkinsfile vendored
View File

@ -50,7 +50,7 @@ pipeline {
}
}
stage('Bloaty px4fmu-v2') {
stage('Bloaty px4_fmu-v2') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-11-22'
@ -62,12 +62,12 @@ pipeline {
sh 'make distclean'
sh 'ccache -z'
sh 'git fetch --tags'
sh 'make px4fmu-v2_default'
sh 'make px4fmu-v2_default bloaty_symbols'
sh 'make px4fmu-v2_default bloaty_compileunits'
sh 'make px4fmu-v2_default bloaty_inlines'
sh 'make px4fmu-v2_default bloaty_templates'
sh 'make px4fmu-v2_default bloaty_compare_master'
sh 'make px4_fmu-v2_default'
sh 'make px4_fmu-v2_default bloaty_symbols'
sh 'make px4_fmu-v2_default bloaty_compileunits'
sh 'make px4_fmu-v2_default bloaty_inlines'
sh 'make px4_fmu-v2_default bloaty_templates'
sh 'make px4_fmu-v2_default bloaty_compare_master'
sh 'make sizes'
sh 'ccache -s'
}
@ -78,7 +78,7 @@ pipeline {
}
}
stage('Bloaty px4fmu-v5') {
stage('Bloaty px4_fmu-v5') {
agent {
docker {
image 'px4io/px4-dev-nuttx:2018-11-22'
@ -90,12 +90,12 @@ pipeline {
sh 'make distclean'
sh 'ccache -z'
sh 'git fetch --tags'
sh 'make px4fmu-v5_default'
sh 'make px4fmu-v5_default bloaty_symbols'
sh 'make px4fmu-v5_default bloaty_compileunits'
sh 'make px4fmu-v5_default bloaty_inlines'
sh 'make px4fmu-v5_default bloaty_templates'
sh 'make px4fmu-v5_default bloaty_compare_master'
sh 'make px4_fmu-v5_default'
sh 'make px4_fmu-v5_default bloaty_symbols'
sh 'make px4_fmu-v5_default bloaty_compileunits'
sh 'make px4_fmu-v5_default bloaty_inlines'
sh 'make px4_fmu-v5_default bloaty_templates'
sh 'make px4_fmu-v5_default bloaty_compare_master'
sh 'make sizes'
sh 'ccache -s'
}
@ -211,7 +211,7 @@ pipeline {
steps {
sh 'export'
sh 'make distclean'
sh 'make px4fmu-v2_default stack_check'
sh 'make px4_fmu-v2_default stack_check'
}
post {
always {
@ -272,7 +272,7 @@ pipeline {
steps {
sh 'make distclean'
sh 'make airframe_metadata'
dir('build/px4sitl_default/docs') {
dir('build/px4_sitl_default/docs') {
archiveArtifacts(artifacts: 'airframes.md, airframes.xml')
stash includes: 'airframes.md, airframes.xml', name: 'metadata_airframes'
}
@ -291,7 +291,7 @@ pipeline {
steps {
sh 'make distclean'
sh 'make parameters_metadata'
dir('build/px4sitl_default/docs') {
dir('build/px4_sitl_default/docs') {
archiveArtifacts(artifacts: 'parameters.md, parameters.xml')
stash includes: 'parameters.md, parameters.xml', name: 'metadata_parameters'
}
@ -310,7 +310,7 @@ pipeline {
steps {
sh 'make distclean'
sh 'make module_documentation'
dir('build/px4sitl_default/docs') {
dir('build/px4_sitl_default/docs') {
archiveArtifacts(artifacts: 'modules/*.md')
stash includes: 'modules/*.md', name: 'metadata_module_documentation'
}
@ -334,8 +334,8 @@ pipeline {
sh 'make distclean'
sh 'make uorb_graphs'
dir('Tools/uorb_graph') {
archiveArtifacts(artifacts: 'graph_px4sitl.json')
stash includes: 'graph_px4sitl.json', name: 'uorb_graph'
archiveArtifacts(artifacts: 'graph_px4_sitl.json')
stash includes: 'graph_px4_sitl.json', name: 'uorb_graph'
}
}
post {

148
Makefile
View File

@ -48,16 +48,16 @@ endif
#
# Example usage:
#
# make px4fmu-v2_default (builds)
# make px4fmu-v2_default upload (builds and uploads)
# make px4fmu-v2_default test (builds and tests)
# make px4_fmu-v2_default (builds)
# make px4_fmu-v2_default upload (builds and uploads)
# make px4_fmu-v2_default test (builds and tests)
#
# This tells cmake to build the nuttx px4fmu-v2 default config in the
# directory build/px4fmu-v2_default and then call make
# This tells cmake to build the nuttx px4_fmu-v2 default config in the
# directory build/px4_fmu-v2_default and then call make
# in that directory with the target upload.
# explicity set default build target
all: px4sitl_default
all: px4_sitl_default
# Parsing
# --------------------------------------------------------------------
@ -157,7 +157,7 @@ define colorecho
endef
# Get a list of all config targets boards/*/*.cmake
ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 ! -name '*common*' ! -name '*sdflight*' -name '*.cmake' -print | sed -e 's/boards\///' | sed -e 's/\.cmake//' | sed -e 's/\///' | sed -e 's/\//_/g' | sort)
ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 ! -name '*common*' ! -name '*sdflight*' -name '*.cmake' -print | sed -e 's/boards\///' | sed -e 's/\.cmake//' | sed -e 's/\//_/g' | sort)
# Strip off default
CONFIG_TARGETS_DEFAULT := $(patsubst %_default,%,$(filter %_default,$(ALL_CONFIG_TARGETS)))
@ -183,18 +183,18 @@ $(CONFIG_TARGETS_DEFAULT):
all_default_targets: $(CONFIG_TARGETS_DEFAULT)
posix: px4sitl_default
posix_sitl_default: px4sitl_default
posix: px4_sitl_default
posix_sitl_default: px4_sitl_default
# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
.PHONY: all posix posix_sitl_default all_nuttx_targets all_default_targets
.PHONY: all posix px4_sitl_default all_nuttx_targets all_default_targets
# Multi- config targets.
eagle_default: atlflighteagle_default atlflighteagle_qurt-default
eagle_rtps: atlflighteagle_rtps atlflighteagle_qurt-rtps
eagle_default: atlflight_eagle_default atlflight_eagle_qurt-default
eagle_rtps: atlflight_eagle_rtps atlflight_eagle_qurt-rtps
excelsior_default: atlflightexcelsior_default atlflightexcelsior_qurt-default
excelsior_rtps: atlflightexcelsior_rtps atlflightexcelsior_qurt-rtps
excelsior_default: atlflight_excelsior_default atlflight_excelsior_qurt-default
excelsior_rtps: atlflight_excelsior_rtps atlflight_excelsior_qurt-rtps
.PHONY: eagle_default eagle_rtps
.PHONY: excelsior_default excelsior_rtps
@ -209,40 +209,40 @@ qgc_firmware: px4fmu_firmware misc_qgc_extra_firmware
# px4fmu NuttX firmware
px4fmu_firmware: \
check_px4io-v2_default \
check_px4fmu-v2_default \
check_px4fmu-v3_default \
check_px4fmu-v4_default \
check_px4fmu-v4pro_default \
check_px4fmu-v5_default \
check_px4_io-v2_default \
check_px4_fmu-v2_default \
check_px4_fmu-v3_default \
check_px4_fmu-v4_default \
check_px4_fmu-v4pro_default \
check_px4_fmu-v5_default \
sizes
misc_qgc_extra_firmware: \
check_gumstixaerocore2_default \
check_intelaerofc-v1_default \
check_auavx21_default \
check_bitcrazecrazyflie_default \
check_airmindmindpx-v2_default \
check_px4fmu-v2_lpe \
check_gumstix_aerocore2_default \
check_intel_aerofc-v1_default \
check_auav_x21_default \
check_bitcraze_crazyflie_default \
check_airmind_mindpx-v2_default \
check_px4_fmu-v2_lpe \
sizes
# Other NuttX firmware
alt_firmware: \
check_nxphlite-v3_default \
check_atmelsame70xplained_default \
check_stm32f4discovery_default \
check_px4cannode-v1_default \
check_px4esc-v1_default \
check_stmnucleo-F767ZI_default \
check_thiemars2740vc-v1_default \
check_nxp_hlite-v3_default \
check_atmel_same70xplained_default \
check_stm_32f4discovery_default \
check_px4_cannode-v1_default \
check_px4_esc-v1_default \
check_stm_nucleo-F767ZI_default \
check_thiemar_s2740vc-v1_default \
sizes
# builds with RTPS
check_rtps: \
check_px4fmu-v3_rtps \
check_px4fmu-v4_rtps \
check_px4fmu-v4pro_rtps \
check_px4sitl_rtps \
check_px4_fmu-v3_rtps \
check_px4_fmu-v4_rtps \
check_px4_fmu-v4pro_rtps \
check_px4_sitl_rtps \
sizes
.PHONY: sizes check quick_check check_rtps uorb_graphs
@ -251,10 +251,10 @@ sizes:
@-find build -name *.elf -type f | xargs size 2> /dev/null || :
# All default targets that don't require a special build environment
check: check_posix_sitl_default px4fmu_firmware misc_qgc_extra_firmware alt_firmware tests check_format
check: check_px4_sitl_default px4fmu_firmware misc_qgc_extra_firmware alt_firmware tests check_format
# quick_check builds a single nuttx and posix target, runs testing, and checks the style
quick_check: check_posix_sitl_default check_px4fmu-v4pro_default tests check_format
quick_check: check_px4_sitl_default check_px4_fmu-v4pro_default tests check_format
check_%:
@echo
@ -265,33 +265,33 @@ check_%:
uorb_graphs:
@./Tools/uorb_graph/create_from_startupscript.sh
@./Tools/uorb_graph/create.py --src-path src --exclude-path src/examples --file Tools/uorb_graph/graph_full
@$(MAKE) --no-print-directory px4fmu-v2_default uorb_graph
@$(MAKE) --no-print-directory px4fmu-v4_default uorb_graph
@$(MAKE) --no-print-directory posix_sitl_default uorb_graph
@$(MAKE) --no-print-directory px4_fmu-v2_default uorb_graph
@$(MAKE) --no-print-directory px4_fmu-v4_default uorb_graph
@$(MAKE) --no-print-directory px4_sitl_default uorb_graph
.PHONY: coverity_scan
coverity_scan: posix_sitl_default
coverity_scan: px4_sitl_default
# Documentation
# --------------------------------------------------------------------
.PHONY: parameters_metadata airframe_metadata module_documentation px4_metadata doxygen
parameters_metadata:
@$(MAKE) --no-print-directory posix_sitl_default metadata_parameters
@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters
airframe_metadata:
@$(MAKE) --no-print-directory posix_sitl_default metadata_airframes
@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes
module_documentation:
@$(MAKE) --no-print-directory posix_sitl_default metadata_module_documentation
@$(MAKE) --no-print-directory px4_sitl_default metadata_module_documentation
px4_metadata: parameters_metadata airframe_metadata module_documentation
doxygen:
@mkdir -p "$(SRC_DIR)"/build/doxygen
@cd "$(SRC_DIR)"/build/doxygen && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=posix_sitl_default -DBUILD_DOXYGEN=ON
@cd "$(SRC_DIR)"/build/doxygen && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DBUILD_DOXYGEN=ON
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/doxygen
@touch "$(SRC_DIR)"/build/doxygen/Documentation/.nojekyll
@ -313,27 +313,27 @@ format:
.PHONY: tests tests_coverage tests_mission tests_mission_coverage tests_offboard rostest python_coverage
tests:
@$(MAKE) --no-print-directory posix_sitl_default test_results \
@$(MAKE) --no-print-directory px4_sitl_default test_results \
ASAN_OPTIONS="color=always:check_initialization_order=1:detect_stack_use_after_return=1" \
UBSAN_OPTIONS="color=always"
tests_coverage:
@$(MAKE) clean
@$(MAKE) --no-print-directory posix_sitl_default test_coverage_genhtml PX4_CMAKE_BUILD_TYPE=Coverage
@echo "Open "$(SRC_DIR)"/build/posix_sitl_default/coverage-html/index.html to see coverage"
@$(MAKE) --no-print-directory px4_sitl_default test_coverage_genhtml PX4_CMAKE_BUILD_TYPE=Coverage
@echo "Open "$(SRC_DIR)"/build/px4_sitl_default/coverage-html/index.html to see coverage"
rostest: posix_sitl_default
@$(MAKE) --no-print-directory posix_sitl_default sitl_gazebo
rostest: px4_sitl_default
@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
tests_mission: rostest
@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_missions.test
tests_mission_coverage:
@$(MAKE) clean
@$(MAKE) --no-print-directory posix_sitl_default PX4_CMAKE_BUILD_TYPE=Coverage
@$(MAKE) --no-print-directory posix_sitl_default sitl_gazebo PX4_CMAKE_BUILD_TYPE=Coverage
@$(MAKE) --no-print-directory px4_sitl_default PX4_CMAKE_BUILD_TYPE=Coverage
@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo PX4_CMAKE_BUILD_TYPE=Coverage
@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=VTOL_mission_1 vehicle:=standard_vtol
@$(MAKE) --no-print-directory posix_sitl_default generate_coverage
@$(MAKE) --no-print-directory px4_sitl_default generate_coverage
tests_offboard: rostest
@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_attctl.test
@ -341,7 +341,7 @@ tests_offboard: rostest
python_coverage:
@mkdir -p "$(SRC_DIR)"/build/python_coverage
@cd "$(SRC_DIR)"/build/python_coverage && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=posix_sitl_default -DPYTHON_COVERAGE=ON
@cd "$(SRC_DIR)"/build/python_coverage && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DPYTHON_COVERAGE=ON
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/python_coverage
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/python_coverage metadata_airframes
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/python_coverage metadata_parameters
@ -351,45 +351,45 @@ python_coverage:
# static analyzers (scan-build, clang-tidy, cppcheck)
# --------------------------------------------------------------------
.PHONY: scan-build posix_sitl_default-clang clang-tidy clang-tidy-fix clang-tidy-quiet
.PHONY: scan-build px4_sitl_default-clang clang-tidy clang-tidy-fix clang-tidy-quiet
.PHONY: cppcheck shellcheck_all validate_module_configs
scan-build:
@export CCC_CC=clang
@export CCC_CXX=clang++
@rm -rf "$(SRC_DIR)"/build/posix_sitl_default-scan-build
@rm -rf "$(SRC_DIR)"/build/px4_sitl_default-scan-build
@rm -rf "$(SRC_DIR)"/build/scan-build/report_latest
@mkdir -p "$(SRC_DIR)"/build/posix_sitl_default-scan-build
@cd "$(SRC_DIR)"/build/posix_sitl_default-scan-build && scan-build cmake "$(SRC_DIR)" -GNinja -DCONFIG=posix_sitl_default
@scan-build -o "$(SRC_DIR)"/build/scan-build cmake --build "$(SRC_DIR)"/build/posix_sitl_default-scan-build
@mkdir -p "$(SRC_DIR)"/build/px4_sitl_default-scan-build
@cd "$(SRC_DIR)"/build/px4_sitl_default-scan-build && scan-build cmake "$(SRC_DIR)" -GNinja -DCONFIG=px4_sitl_default
@scan-build -o "$(SRC_DIR)"/build/scan-build cmake --build "$(SRC_DIR)"/build/px4_sitl_default-scan-build
@find "$(SRC_DIR)"/build/scan-build -maxdepth 1 -mindepth 1 -type d -exec cp -r "{}" "$(SRC_DIR)"/build/scan-build/report_latest \;
posix_sitl_default-clang:
@mkdir -p "$(SRC_DIR)"/build/posix_sitl_default-clang
@cd "$(SRC_DIR)"/build/posix_sitl_default-clang && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=posix_sitl_default -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/posix_sitl_default-clang
px4_sitl_default-clang:
@mkdir -p "$(SRC_DIR)"/build/px4_sitl_default-clang
@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && cmake "$(SRC_DIR)" $(CMAKE_ARGS) -G"$(PX4_CMAKE_GENERATOR)" -DCONFIG=px4_sitl_default -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
@$(PX4_MAKE) -C "$(SRC_DIR)"/build/px4_sitl_default-clang
clang-tidy: posix_sitl_default-clang
@cd "$(SRC_DIR)"/build/posix_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -p .
clang-tidy: px4_sitl_default-clang
@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -p .
# to automatically fix a single check at a time, eg modernize-redundant-void-arg
# % run-clang-tidy-4.0.py -fix -j4 -checks=-\*,modernize-redundant-void-arg -p .
clang-tidy-fix: posix_sitl_default-clang
@cd "$(SRC_DIR)"/build/posix_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -fix -p .
clang-tidy-fix: px4_sitl_default-clang
@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -fix -p .
# modified version of run-clang-tidy.py to return error codes and only output relevant results
clang-tidy-quiet: posix_sitl_default-clang
@cd "$(SRC_DIR)"/build/posix_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -p .
clang-tidy-quiet: px4_sitl_default-clang
@cd "$(SRC_DIR)"/build/px4_sitl_default-clang && "$(SRC_DIR)"/Tools/run-clang-tidy.py -header-filter=".*\.hpp" -j$(j) -p .
# TODO: Fix cppcheck errors then try --enable=warning,performance,portability,style,unusedFunction or --enable=all
cppcheck: posix_sitl_default
cppcheck: px4_sitl_default
@mkdir -p "$(SRC_DIR)"/build/cppcheck
@cppcheck -i"$(SRC_DIR)"/src/examples --enable=performance --std=c++11 --std=c99 --std=posix --project="$(SRC_DIR)"/build/posix_sitl_default/compile_commands.json --xml-version=2 2> "$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml > /dev/null
@cppcheck -i"$(SRC_DIR)"/src/examples --enable=performance --std=c++11 --std=c99 --std=posix --project="$(SRC_DIR)"/build/px4_sitl_default/compile_commands.json --xml-version=2 2> "$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml > /dev/null
@cppcheck-htmlreport --source-encoding=ascii --file="$(SRC_DIR)"/build/cppcheck/cppcheck-result.xml --report-dir="$(SRC_DIR)"/build/cppcheck --source-dir="$(SRC_DIR)"/src/
shellcheck_all:
@"$(SRC_DIR)"/Tools/run-shellcheck.sh "$(SRC_DIR)"/ROMFS/px4fmu_common/
@make px4fmu-v2_default shellcheck
@make px4_fmu-v2_default shellcheck
validate_module_configs:
@find "$(SRC_DIR)"/src/modules "$(SRC_DIR)"/src/drivers "$(SRC_DIR)"/src/lib -name *.yaml -type f -print0 | xargs -0 "$(SRC_DIR)"/Tools/validate_yaml.py --schema-file "$(SRC_DIR)"/validation/module_schema.yaml

2
ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter
View File

@ -16,7 +16,7 @@
#
# @maintainer Roman Bapst <roman@px4.io>
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
sh /etc/init.d/rc.vtol_defaults

2
ROMFS/px4fmu_common/init.d/13010_claire
View File

@ -7,7 +7,7 @@
#
# @maintainer Samay Siga <samay_s@icloud.com>
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
sh /etc/init.d/rc.vtol_defaults

2
ROMFS/px4fmu_common/init.d/4003_qavr5
View File

@ -5,7 +5,7 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
# @maintainer James Goppert <james.goppert@gmail.com>
#

10
ROMFS/px4fmu_common/init.d/4013_bebop
View File

@ -5,11 +5,11 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#
# @maintainer Michael Schaeuble

10
ROMFS/px4fmu_common/init.d/4020_hk_micro_pcb
View File

@ -5,11 +5,11 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#
# @maintainer Thomas Gubler <thomas@px4.io>

8
ROMFS/px4fmu_common/init.d/4030_3dr_solo
View File

@ -5,10 +5,10 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#
# @maintainer Andreas Antener <andreas@uaventure.com>

2
ROMFS/px4fmu_common/init.d/4051_s250aq
View File

@ -3,7 +3,7 @@
# @name Spedix S250AQ
# @url https://docs.px4.io/en/framebuild_multicopter/spedix_s250_pixracer.html
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
# @type Quadrotor asymmetric
# @class Copter

10
ROMFS/px4fmu_common/init.d/4070_aerofc
View File

@ -2,11 +2,11 @@
#
# @name Intel Aero Ready to Fly Drone
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
#
# @type Quadrotor x
# @class Copter

2
ROMFS/px4fmu_common/init.d/4080_zmr250
View File

@ -5,7 +5,7 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
# @maintainer Anton Matosov <anton.matosov@gmail.com>
#

10
ROMFS/px4fmu_common/init.d/4090_nanomind
View File

@ -5,11 +5,11 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#
# @maintainer Henry Zhang <zhanghui629@gmail.com>

8
ROMFS/px4fmu_common/init.d/4250_teal
View File

@ -5,10 +5,10 @@
# @type Quadrotor x
# @class Copter
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
#
# @output MAIN1 motor 1
# @output MAIN2 motor 2

10
ROMFS/px4fmu_common/init.d/4900_crazyflie
View File

@ -2,11 +2,11 @@
#
# @name Crazyflie 2.0
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#
# @type Quadrotor x

2
ROMFS/px4fmu_common/init.d/50000_generic_ground_vehicle
View File

@ -10,7 +10,7 @@
#
# @maintainer
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
sh /etc/init.d/rc.ugv_defaults

2
ROMFS/px4fmu_common/init.d/50001_axialracing_ax10
View File

@ -14,7 +14,7 @@
# @output MAIN7 pass-through of control group 0, channel 6
# @output MAIN8 pass-through of control group 0, channel 7
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
sh /etc/init.d/rc.ugv_defaults

2
ROMFS/px4fmu_common/init.d/50002_traxxas_stampede_2wd
View File

@ -12,7 +12,7 @@
#
# @maintainer Marco Zorzi
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
sh /etc/init.d/rc.ugv_defaults

2
ROMFS/px4fmu_common/init.d/rc.interface
View File

@ -25,7 +25,7 @@ then
fi
fi
if ver hwcmp AEROFC_V1 AV_X_V1 CRAZYFLIE MINDPX_V2 NXPHLITE_V3 PX4FMU_V4 OMNIBUS_F4SD SITL
if ver hwcmp INTEL_AEROFC_V1 AV_X_V1 BITCRAZE_CRAZYFLIE AIRMIND_MINDPX_V2 NXP_HLITE_V3 PX4_FMU_V4 OMNIBUS_F4SD PX4_SITL
then
set MIXER_AUX none
fi

4
ROMFS/px4fmu_common/init.d/rc.logging
View File

@ -17,7 +17,7 @@ fi
# Begin Setup for board specific configurations. #
###############################################################################
if ver hwcmp PX4FMU_V5 AV_X_V1
if ver hwcmp PX4_FMU_V5 AV_X_V1
then
set LOGGER_BUF 64
fi
@ -36,7 +36,7 @@ then
set LOGGER_ARGS "-f"
fi
if ver hwcmp AEROFC_V1
if ver hwcmp INTEL_AEROFC_V1
then
set LOGGER_ARGS "-m mavlink"
fi

4
ROMFS/px4fmu_common/init.d/rc.mavlink
View File

@ -5,13 +5,13 @@
# NOTE: Script variables are declared/initialized/unset in the rcS script.
#
if ! ver hwcmp AEROFC_V1
if ! ver hwcmp INTEL_AEROFC_V1
then
# Start MAVLink on the USB port
mavlink start -r 800000 -d /dev/ttyACM0 -m config -x
fi
if ver hwcmp PX4FMU_V4
if ver hwcmp PX4_FMU_V4
then
# Pixracer: start MAVLink on Wifi (ESP8266 port)
mavlink start -r 20000 -b 921600 -d /dev/ttyS0

2
ROMFS/px4fmu_common/init.d/rc.mc_apps
View File

@ -26,7 +26,7 @@ if param compare SYS_MC_EST_GROUP 1
then
#
# Try to start LPE. If it fails, start EKF2 as a default.
# Unfortunately we do not build it on px4fmu-v2 due to a limited flash.
# Unfortunately we do not build it on px4_fmu-v2 due to a limited flash.
#
if attitude_estimator_q start
then

24
ROMFS/px4fmu_common/init.d/rc.sensors
View File

@ -14,7 +14,7 @@ set BOARD_FMUV3 0
if ! ver hwcmp AEROFC_V1 OMNIBUS_F4SD
then
if ! ver hwcmp CRAZYFLIE
if ! ver hwcmp BITCRAZE_CRAZYFLIE
then
# Configure all I2C buses to 100 KHz as they
# are all external or slow
@ -22,7 +22,7 @@ then
fmu i2c 2 100000
fi
if ver hwcmp PX4FMU_V4
if ver hwcmp PX4_FMU_V4
then
# We know there are sketchy boards out there
# as chinese companies produce Pixracers without
@ -45,7 +45,7 @@ then
adc start
fi
if ver hwcmp AEROFC_V1
if ver hwcmp INTEL_AEROFC_V1
then
ms5611 -T 0 start
mpu9250 -s -R 14 start
@ -58,7 +58,7 @@ then
ll40ls start i2c
fi
if ver hwcmp AEROCORE2
if ver hwcmp GUMSTIX_AEROCORE2
then
l3gd20 -R 12 start
lsm303d start
@ -94,7 +94,7 @@ then
fi
if ver hwcmp CRAZYFLIE
if ver hwcmp BITCRAZE_CRAZYFLIE
then
# Onboard I2C
mpu9250 -R 12 start
@ -108,7 +108,7 @@ then
fi
if ver hwcmp MINDPX_V2
if ver hwcmp AIRMIND_MINDPX_V2
then
# External I2C bus
hmc5883 -C -T -X start
@ -122,7 +122,7 @@ then
l3gd20 -R 14 start
fi
if ver hwcmp NXPHLITE_V3
if ver hwcmp NXP_HLITE_V3
then
# External I2C bus
hmc5883 -C -X start
@ -159,7 +159,7 @@ then
adc start
fi
if ver hwcmp PX4FMU_V2
if ver hwcmp PX4_FMU_V2
then
# External I2C bus
hmc5883 -C -T -X start
@ -255,7 +255,7 @@ then
fi
fi
if ver hwcmp PX4FMU_V4
if ver hwcmp PX4_FMU_V4
then
# External I2C bus
hmc5883 -C -T -X start
@ -303,7 +303,7 @@ then
fi
fi
if ver hwcmp PX4FMU_V4PRO
if ver hwcmp PX4_FMU_V4PRO
then
# Internal SPI bus ICM-20608-G
mpu6000 -R 2 -T 20608 start
@ -324,7 +324,7 @@ then
rm3100 start
fi
if ver hwcmp PX4FMU_V5
if ver hwcmp PX4_FMU_V5
then
# Internal SPI bus ICM-20602
@ -353,7 +353,7 @@ then
pmw3901 start
fi
if ver hwcmp PX4_SAME70XPLAINED_V1
if ver hwcmp ATMEL_SAME70XPLAINED_V1
then
# External I2C bus
hmc5883 -C -T -X start

2
ROMFS/px4fmu_common/init.d/rc.vtol_apps
View File

@ -21,7 +21,7 @@ fi
if param compare SYS_MC_EST_GROUP 1
then
# Try to start LPE. If it fails, start EKF2 as a default
# Unfortunately we do not build it on px4fmu-v2 due to a limited flash.
# Unfortunately we do not build it on px4_fmu-v2 due to a limited flash.
if attitude_estimator_q start
then
local_position_estimator start

22
ROMFS/px4fmu_common/init.d/rcS
View File

@ -71,7 +71,7 @@ set FEXTRAS /fs/microsd/etc/extras.txt
set FRC /fs/microsd/etc/rc.txt
set FMU_ARGS ""
set FMU_MODE pwm
set IOFW "/etc/extras/px4io-v2_default.bin"
set IOFW "/etc/extras/px4_io-v2_default.bin"
set IO_PRESENT no
set LOG_FILE /fs/microsd/bootlog.txt
set MAV_TYPE none
@ -160,7 +160,7 @@ else
fi
# AEROCORE2 shouldn't have an sd card and CF2 may optionally have an sd card.
if ! ver hwcmp CRAZYFLIE AEROCORE2
if ! ver hwcmp BITCRAZE_CRAZYFLIE GUMSTIX_AEROCORE2
then
# Run no SD alarm.
if [ $LOG_FILE = /dev/null ]
@ -214,7 +214,7 @@ else
#
# Bootloader upgrade
#
if ver hwcmp PX4FMU_V2
if ver hwcmp PX4_FMU_V2
then
set BL_FILE /etc/extras/px4fmuv3_bl.bin
if [ -f $BL_FILE ]
@ -275,12 +275,12 @@ else
# Begin setup for board specific configurations. #
###############################################################################
if ver hwcmp AEROCORE2
if ver hwcmp GUMSTIX_AEROCORE2
then
set DATAMAN_OPT "-f /fs/mtd_dataman"
fi
if ver hwcmp AEROFC_V1
if ver hwcmp INTEL_AEROFC_V1
then
if param compare SYS_AUTOSTART 0
then
@ -294,7 +294,7 @@ else
set DATAMAN_OPT -i
fi
if ver hwcmp CRAZYFLIE
if ver hwcmp BITCRAZE_CRAZYFLIE
then
if param compare SYS_AUTOSTART 0
then
@ -303,7 +303,7 @@ else
fi
fi
if ver hwcmp NXPHLITE_V3
if ver hwcmp NXP_HLITE_V3
then
param set SYS_FMU_TASK 1
fi
@ -340,13 +340,13 @@ else
if [ $AUTOCNF = yes ]
then
# Run FMU as task on Pixracer and on boards with enough RAM.
if ver hwcmp PX4FMU_V4 PX4FMU_V4PRO PX4FMU_V5
if ver hwcmp PX4_FMU_V4 PX4_FMU_V4PRO PX4_FMU_V5
then
param set SYS_FMU_TASK 1
fi
# Disable safety switch by default on Pixracer and OmnibusF4SD.
if ver hwcmp PX4FMU_V4 OMNIBUS_F4SD
if ver hwcmp PX4_FMU_V4 OMNIBUS_F4SD
then
param set CBRK_IO_SAFETY 22027
fi
@ -515,7 +515,7 @@ else
#
sh /etc/init.d/rc.serial
if ver hwcmp PX4FMU_V4
if ver hwcmp PX4_FMU_V4
then
# Run FrSky Telemetry on Pixracer on the FrSky port if not enabled already
if param compare TEL_FRSKY_CONFIG 0
@ -565,7 +565,7 @@ else
#
# Launch the flow sensor as a background task.
#
if ver hwcmp PX4FMU_V2 PX4FMU_V4 PX4FMU_V4PRO MINDPX_V2 PX4FMU_V5 OMNIBUS_F4SD
if ver hwcmp PX4_FMU_V2 PX4_FMU_V4 PX4_FMU_V4PRO AIRMIND_MINDPX_V2 PX4_FMU_V5 OMNIBUS_F4SD
then
px4flow start &
fi

10
ROMFS/px4fmu_common/mixers/bebop.main.mix
View File

@ -1,9 +1,9 @@
#
# @board px4fmu-v2 exclude
# @board px4fmu-v3 exclude
# @board px4fmu-v4 exclude
# @board px4fmu-v4pro exclude
# @board px4fmu-v5 exclude
# @board px4_fmu-v2 exclude
# @board px4_fmu-v3 exclude
# @board px4_fmu-v4 exclude
# @board px4_fmu-v4pro exclude
# @board px4_fmu-v5 exclude
# @board aerofc-v1 exclude
#

2
ROMFS/px4fmu_common/mixers/standard_vtol_hitl.main.mix
View File

@ -1,7 +1,7 @@
Mixer for Standard VTOL (QuadPlane) with motor x configuration (Gazebo HITL)
=============================================================================
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
R: 4x 10000 10000 10000 0

2
ROMFS/px4fmu_common/mixers/uuv_quad_x.mix
View File

@ -1,4 +1,4 @@
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
M: 4
S: 0 0 -10000 -10000 0 -10000 10000

2
ROMFS/px4fmu_common/mixers/zmr250.main.mix
View File

@ -1,5 +1,5 @@
#
# @board px4fmu-v2 exclude
# @board px4_fmu-v2 exclude
#
# R: <geometry> <roll scale> <pitch scale> <yaw scale> <deadband>
R: 4x 7654 10000 10000 0

6
ROMFS/px4fmu_test/init.d/rc.sensors
View File

@ -21,7 +21,7 @@ if adc start
then
fi
if ver hwcmp PX4FMU_V2
if ver hwcmp PX4_FMU_V2
then
# External I2C bus
if hmc5883 -C -T -X start
@ -82,7 +82,7 @@ then
fi
fi
if ver hwcmp PX4FMU_V4
if ver hwcmp PX4_FMU_V4
then
# External I2C bus
if hmc5883 -C -T -X start
@ -109,7 +109,7 @@ then
fi
fi
if ver hwcmp MINDPX_V2
if ver hwcmp AIRMIND_MINDPX_V2
then
# External I2C bus
if hmc5883 -C -T -X start

2
Tools/docker_run.sh
View File

@ -2,7 +2,7 @@
if [ -z ${PX4_DOCKER_REPO+x} ]; then
echo "guessing PX4_DOCKER_REPO based on input";
if [[ $@ =~ .*px4fmu.* ]]; then
if [[ $@ =~ .*px4_fmu.* ]]; then
# nuttx-px4fmu-v{1,2,3,4,5}
PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then

8
Tools/px_uploader.py
View File

@ -642,14 +642,14 @@ class uploader(object):
% (self.fw_maxsize, fw.property('image_maxsize')))
else:
# If we're still on bootloader v4 on a Pixhawk, we don't know if we
# have the silicon errata and therefore need to flash px4fmu-v2
# with 1MB flash or if it supports px4fmu-v3 with 2MB flash.
# have the silicon errata and therefore need to flash px4_fmu-v2
# with 1MB flash or if it supports px4_fmu-v3 with 2MB flash.
if fw.property('board_id') == 9 \
and fw.property('image_size') > 1032192 \
and not force:
raise RuntimeError("\nThe Board uses bootloader revision 4 and can therefore not determine\n"
"if flashing more than 1 MB (px4fmu-v3_default) is safe, chances are\n"
"high that it is not safe! If unsure, use px4fmu-v2_default.\n"
"if flashing more than 1 MB (px4_fmu-v3_default) is safe, chances are\n"
"high that it is not safe! If unsure, use px4_fmu-v2_default.\n"
"\n"
"If you know you that the board does not have the silicon errata, use\n"
"this script with --force, or update the bootloader. If you are invoking\n"

4
Tools/sitl_multiple_run.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash
# run multiple instances of the 'px4' binary, but w/o starting the simulator.
# It assumes px4 is already built, with 'make px4sitl_default'
# It assumes px4 is already built, with 'make px4_sitl_default'
# The simulator is expected to send to UDP port 14560+i for i in [0, N-1]
# For example jmavsim can be run like this:
@ -12,7 +12,7 @@ sitl_num=2
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
src_path="$SCRIPT_DIR/.."
build_path=${src_path}/build/px4sitl_default
build_path=${src_path}/build/px4_sitl_default
echo "killing running instances"
pkill -x px4 || true

2
appveyor.yml
View File

@ -43,7 +43,7 @@ build_script:
# make SITL
- call bash --login -c "cd $repopath && make posix"
# make pixracer to check NuttX build
- call bash --login -c "cd $repopath && make px4fmu-v4_default"
- call bash --login -c "cd $repopath && make px4_fmu-v4_default"
# run tests
- call bash --login -c "cd $repopath && make tests"

2
boards/aerotenna/ocpoc/src/board_config.h
View File

@ -42,7 +42,7 @@
#define BOARD_OVERRIDE_UUID "OCPOC00000000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_OCPOC
#define BOARD_NAME "OCPOC"
#define BOARD_NAME "AEROTENNA_OCPOC"
#define BOARD_BATTERY1_V_DIV (10.177939394f)
#define BOARD_HAS_NO_RESET
#define BOARD_HAS_NO_BOOTLOADER

4
boards/airmind/mindpx-v2/nuttx-config/nsh/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_MINDPX_V2=y
CONFIG_ARCH_BOARD="airmindmindpx-v2"
CONFIG_ARCH_BOARD_AIRMIND_MINDPX_V2=y
CONFIG_ARCH_BOARD="airmind_mindpx-v2"
#
# Custom Board Configuration

2
boards/airmind/mindpx-v2/src/board_config.h
View File

@ -293,7 +293,7 @@
#define SPEKTRUM_RX_AS_UART() px4_arch_configgpio(GPIO_USART1_RX)
#define SPEKTRUM_OUT(_one_true) px4_arch_gpiowrite(GPIO_PPM_IN_AS_OUT, (_one_true))
#define BOARD_NAME "MINDPX_V2"
#define BOARD_NAME "AIRMIND_MINDPX_V2"
/* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)
* this board support the ADC system_power interface, and therefore

2
boards/atlflight/eagle/src/board_config.h
View File

@ -42,7 +42,7 @@
#define BOARD_OVERRIDE_UUID "EAGLEID000000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_EAGLE
#define BOARD_NAME "EAGLE"
#define BOARD_NAME "ATLFLIGHT_EAGLE"
#define BOARD_HAS_NO_RESET
#define BOARD_HAS_NO_BOOTLOADER

2
boards/atlflight/excelsior/src/board_config.h
View File

@ -38,7 +38,7 @@
*/
#pragma once
#define BOARD_NAME "EXCELSIOR"
#define BOARD_NAME "ATLFLIGHT_EXCELSIOR"
#define BOARD_BATTERY1_V_DIV (10.177939394f)
#define BOARD_BATTERY1_A_PER_V (15.391030303f)
#define BOARD_HAS_NO_RESET

4
boards/atmel/same70xplained/nuttx-config/nsh/defconfig
View File

@ -427,9 +427,9 @@ CONFIG_RAM_SIZE=393216
# Board Selection
#
# CONFIG_ARCH_BOARD_SAME70_XPLAINED is not set
CONFIG_ARCH_BOARD_ATMELSAME70XPLAINED=y
CONFIG_ARCH_BOARD_ATMEL_SAME70XPLAINED=y
# CONFIG_ARCH_BOARD_CUSTOM is not set
CONFIG_ARCH_BOARD="atmelsame70xplained"
CONFIG_ARCH_BOARD="atmel_same70xplained"
#
# Common Board Options

2
boards/atmel/same70xplained/src/board_config.h
View File

@ -300,7 +300,7 @@ __BEGIN_DECLS
#define GPIO_PWM_IN GPIO_TIM4_CH2IN_2
#endif
#define BOARD_NAME "PX4_SAME70XPLAINED_V1"
#define BOARD_NAME "ATMEL_SAME70XPLAINED"
/*
* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)

4
boards/auav/esc35-v1/nuttx-config/nsh/defconfig
View File

@ -559,8 +559,8 @@ CONFIG_RAM_SIZE=131072
#
# Board Selection
#
CONFIG_ARCH_BOARD_AUAVESC35_V1=y
CONFIG_ARCH_BOARD="auavesc35-v1"
CONFIG_ARCH_BOARD_AUAV_ESC35_V1=y
CONFIG_ARCH_BOARD="auav_esc35-v1"
#
# Custom Board Configuration

2
boards/auav/esc35-v1/src/board_config.h
View File

@ -134,7 +134,7 @@
GPIO_PORTA | GPIO_PIN1 | GPIO_OUTPUT_CLEAR)
#define GPIO_LED_BLUE GPIO_LED3
#define BOARD_NAME "ESC35_V1"
#define BOARD_NAME "AUAV_ESC35_V1"
__BEGIN_DECLS

2
boards/auav/x21/default.cmake
View File

@ -7,7 +7,7 @@ px4_add_board(
ARCH cortex-m4
ROMFS
ROMFSROOT px4fmu_common
IO px4io-v2_default
IO px4_io-v2_default
TESTING
UAVCAN_INTERFACES 1

2
boards/auav/x21/nuttx-config/nsh/defconfig
View File

@ -688,7 +688,7 @@ CONFIG_RAM_SIZE=262144
# Board Selection
#
CONFIG_ARCH_BOARD_AUAV_X21=y
CONFIG_ARCH_BOARD="auavx21"
CONFIG_ARCH_BOARD="auav_x21"
#
# Custom Board Configuration

4
boards/av/x-v1/nuttx-config/nsh/defconfig
View File

@ -533,8 +533,8 @@ CONFIG_RAM_SIZE=376832
#
# Board Selection
#
CONFIG_ARCH_BOARD_AVX_V1=y
CONFIG_ARCH_BOARD="avx-v1"
CONFIG_ARCH_BOARD_AV_X_V1=y
CONFIG_ARCH_BOARD="av_x-v1"
#
# Common Board Options

2
boards/beaglebone/blue/src/board_config.h
View File

@ -45,7 +45,7 @@
#define BOARD_OVERRIDE_UUID "BBBLUEID00000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_BBBLUE
#define BOARD_NAME "BBBLUE"
#define BOARD_NAME "BEAGLEBONE_BLUE"
#define BOARD_BATTERY1_V_DIV (11.0f)
//#define BOARD_BATTERY1_A_PER_V (15.391030303f)

4
boards/bitcraze/crazyflie/nuttx-config/nsh/defconfig
View File

@ -652,8 +652,8 @@ CONFIG_RAM_SIZE=196608
#
# Board Selection
#
CONFIG_ARCH_BOARD_CRAZYFLIE=y
CONFIG_ARCH_BOARD="bitcrazecrazyflie"
CONFIG_ARCH_BOARD_BITCRAZE_CRAZYFLIE=y
CONFIG_ARCH_BOARD="bitcraze_crazyflie"
#
# Custom Board Configuration

5
boards/bitcraze/crazyflie/src/board_config.h
View File

@ -215,13 +215,10 @@
#define HRT_TIMER 8 /* use timer8 for the HRT */
#define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */
#define BOARD_NAME "CRAZYFLIE"
#define BOARD_NAME "BITCRAZE_CRAZYFLIE"
#define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS
#define BOARD_NAME "CRAZYFLIE"
__BEGIN_DECLS
/****************************************************************************************************

2
boards/emlid/navio2/src/board_config.h
View File

@ -42,7 +42,7 @@
#define BOARD_OVERRIDE_UUID "RPIID00000000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_RPI
#define BOARD_NAME "EMLIDNAVIO2"
#define BOARD_NAME "EMLID_NAVIO2"
#define ADC_BATTERY_VOLTAGE_CHANNEL 2
#define ADC_BATTERY_CURRENT_CHANNEL 3

4
boards/gumstix/aerocore2/nuttx-config/nsh/defconfig
View File

@ -673,8 +673,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_AEROCORE2=y
CONFIG_ARCH_BOARD="gumstixaerocore2"
CONFIG_ARCH_BOARD_GUMSTIX_AEROCORE2=y
CONFIG_ARCH_BOARD="gumstix_aerocore2"
#
# Custom Board Configuration

2
boards/gumstix/aerocore2/src/board_config.h
View File

@ -200,7 +200,7 @@
#define HRT_TIMER 8 /* use timer8 for the HRT */
#define HRT_TIMER_CHANNEL 1 /* use capture/compare channel */
#define BOARD_NAME "AEROCORE2"
#define BOARD_NAME "GUMSTIX_AEROCORE2"
#define BOARD_HAS_PWM DIRECT_PWM_OUTPUT_CHANNELS

4
boards/intel/aerofc-v1/nuttx-config/nsh/defconfig
View File

@ -670,8 +670,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_AEROFC_V1=y
CONFIG_ARCH_BOARD="intelaerofc-v1"
CONFIG_ARCH_BOARD_INTEL_AEROFC_V1=y
CONFIG_ARCH_BOARD="intel_aerofc-v1"
#
# Common Board Options

2
boards/intel/aerofc-v1/src/board_config.h
View File

@ -129,7 +129,7 @@
#define HRT_TIMER 3 /* use timer3 for the HRT */
#define HRT_TIMER_CHANNEL 4 /* use capture/compare channel */
#define BOARD_NAME "AEROFC_V1"
#define BOARD_NAME "INTEL_AEROFC_V1"
#define FLASH_BASED_PARAMS
#define FLASH_BASED_DATAMAN

4
boards/nxp/hlite-v3/nuttx-config/nsh/defconfig
View File

@ -389,8 +389,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_NXPHLITE_V3=y
CONFIG_ARCH_BOARD="nxphlite-v3"
CONFIG_ARCH_BOARD_NXP_HLITE_V3=y
CONFIG_ARCH_BOARD="nxp_hlite-v3"
CONFIG_BOARD_HAS_PROBES=y
# CONFIG_BOARD_USE_PROBES is not set

2
boards/nxp/hlite-v3/src/board_config.h
View File

@ -391,7 +391,7 @@ __BEGIN_DECLS
#define PWMIN_TIMER_CHANNEL 2
#define GPIO_PWM_IN GPIO_FTM0_CH2IN
#define BOARD_NAME "NXPHLITE_V3"
#define BOARD_NAME "NXP_HLITE_V3"
/* Define True logic Power Control in arch agnostic form */

4
boards/omnibus/f4sd/nuttx-config/nsh/defconfig
View File

@ -662,8 +662,8 @@ CONFIG_RAM_SIZE=196608
#
# Board Selection
#
CONFIG_ARCH_BOARD_OMNIBUSF4SD=y
CONFIG_ARCH_BOARD="omnibusf4sd"
CONFIG_ARCH_BOARD_OMNIBUS_F4SD=y
CONFIG_ARCH_BOARD="omnibus_f4sd"
#
# Custom Board Configuration

2
boards/parrot/bebop/src/board_config.h
View File

@ -42,7 +42,7 @@
#define BOARD_OVERRIDE_UUID "BEBOPID000000000" // must be of length 16
#define PX4_SOC_ARCH_ID PX4_SOC_ARCH_ID_BEBOP
#define BOARD_NAME "BEBOP"
#define BOARD_NAME "PARROT_BEBOP"
#define BOARD_HAS_NO_RESET
#define BOARD_HAS_NO_BOOTLOADER

4
boards/px4/cannode-v1/default.cmake
View File

@ -25,8 +25,8 @@ add_definitions(
include(px4_make_uavcan_bootloader)
px4_make_uavcan_bootloadable(
BOARD px4cannode-v1
BIN ${PX4_BINARY_DIR}/px4cannode-v1.bin
BOARD px4_cannode-v1
BIN ${PX4_BINARY_DIR}/px4_cannode-v1.bin
HWNAME ${uavcanblid_name}
HW_MAJOR ${uavcanblid_hw_version_major}
HW_MINOR ${uavcanblid_hw_version_minor}

2
boards/px4/cannode-v1/nuttx-config/Kconfig
View File

@ -3,7 +3,7 @@
# see misc/tools/kconfig-language.txt.
#
if CONFIG_ARCH_BOARD_PX4CANNODE_V1
if CONFIG_ARCH_BOARD_PX4_CANNODE_V1
config BOARD_HAS_PROBES
bool "Board provides GPIO or other Hardware for signaling to timing analyze."

2
boards/px4/cannode-v1/nuttx-config/include/board.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* nuttx-configs/px4cannode-v1/include/board.h
* nuttx-configs/px4_cannode-v1/include/board.h
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

4
boards/px4/cannode-v1/nuttx-config/nsh/defconfig
View File

@ -574,8 +574,8 @@ CONFIG_RAM_SIZE=20480
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4CANNODE_V1=y
CONFIG_ARCH_BOARD="px4cannode-v1"
CONFIG_ARCH_BOARD_PX4_CANNODE_V1=y
CONFIG_ARCH_BOARD="px4_cannode-v1"
#
# Custom Board Configuration

4
boards/px4/cannode-v1/nuttx-config/nsh/defconfig.nsh
View File

@ -478,9 +478,9 @@ CONFIG_RAM_SIZE=20480
# Board Selection
#
# CONFIG_ARCH_BOARD_MAPLE is not set
CONFIG_ARCH_BOARD_PX4CANNODE_V1=y
CONFIG_ARCH_BOARD_PX4_CANNODE_V1=y
# CONFIG_ARCH_BOARD_CUSTOM is not set
CONFIG_ARCH_BOARD="px4cannode-v1"
CONFIG_ARCH_BOARD="px4_cannode-v1"
#
# Common Board Options

2
boards/px4/cannode-v1/nuttx-config/scripts/ld.script
View File

@ -1,5 +1,5 @@
/****************************************************************************
* nuttx-configs/px4cannode-v1/scripts/ld.script
* nuttx-configs/px4_cannode-v1/scripts/ld.script
*
* Copyright (C) 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
boards/px4/cannode-v1/src/board_config.h
View File

@ -143,7 +143,7 @@
#define GPIO_CAN_CTRL (GPIO_OUTPUT | GPIO_CNF_OUTPP | GPIO_MODE_50MHz | \
GPIO_PORTC | GPIO_PIN13 | GPIO_OUTPUT_CLEAR)
#define BOARD_NAME "PX4CANNODE_V1"
#define BOARD_NAME "PX4_CANNODE_V1"
__BEGIN_DECLS

2
boards/px4/cannode-v1/src/buttons.c
View File

@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4cannode_buttons.c
* @file px4_cannode_buttons.c
*
* PX4CANNODE- Buttons
*/

2
boards/px4/cannode-v1/src/init.c
View File

@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4cannode_init.c
* @file px4_cannode_init.c
*
* PX4CANNODE-specific early startup code. This file implements the
* board_app_initialize() function that is called early by nsh during startup.

2
boards/px4/cannode-v1/src/led.c
View File

@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4cannode_led.c
* @file px4_cannode_led.c
*
* PX4ESC LED backend.
*/

2
boards/px4/cannode-v1/src/spi.c
View File

@ -32,7 +32,7 @@
****************************************************************************/
/**
* @file px4cannode_led.c
* @file px4_cannode_led.c
*
* PX4FMU SPI backend.
*/

4
boards/px4/esc-v1/default.cmake
View File

@ -27,8 +27,8 @@ add_definitions(
include(px4_make_uavcan_bootloader)
px4_make_uavcan_bootloadable(
BOARD px4esc-v1
BIN ${PX4_BINARY_DIR}/px4esc-v1.bin
BOARD px4_esc-v1
BIN ${PX4_BINARY_DIR}/px4_esc-v1.bin
HWNAME ${uavcanblid_name}
HW_MAJOR ${uavcanblid_hw_version_major}
HW_MINOR ${uavcanblid_hw_version_minor}

2
boards/px4/esc-v1/nuttx-config/Kconfig
View File

@ -3,7 +3,7 @@
# see misc/tools/kconfig-language.txt.
#
if CONFIG_ARCH_BOARD_PX4ESC_V1
if CONFIG_ARCH_BOARD_PX4_ESC_V1
config BOARD_HAS_PROBES
bool "Board provides GPIO or other Hardware for signaling to timing analyze."

4
boards/px4/esc-v1/nuttx-config/nsh/defconfig
View File

@ -606,8 +606,8 @@ CONFIG_RAM_SIZE=131072
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4ESC_V1=y
CONFIG_ARCH_BOARD="px4esc-v1"
CONFIG_ARCH_BOARD_PX4_ESC_V1=y
CONFIG_ARCH_BOARD="px4_esc-v1"
#
# Custom Board Configuration

2
boards/px4/esc-v1/src/board_config.h
View File

@ -216,7 +216,7 @@
#define GPIO_TEST1 (GPIO_OUTPUT | GPIO_PUSHPULL | GPIO_SPEED_50MHz | \
GPIO_PORTD | GPIO_PIN2 | GPIO_OUTPUT_CLEAR)
#define BOARD_NAME "PX4ESC_V1"
#define BOARD_NAME "PX4_ESC_V1"
__BEGIN_DECLS

2
boards/px4/fmu-v2/default.cmake
View File

@ -8,7 +8,7 @@ px4_add_board(
ROMFS
ROMFSROOT px4fmu_common
BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
IO px4io-v2_default
IO px4_io-v2_default
#TESTING
CONSTRAINED_FLASH
#UAVCAN_INTERFACES 2

2
boards/px4/fmu-v2/lpe.cmake
View File

@ -8,7 +8,7 @@ px4_add_board(
ROMFS
ROMFSROOT px4fmu_common
BOOTLOADER ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/extras/px4fmuv3_bl.bin
IO px4io-v2_default
IO px4_io-v2_default
#TESTING
#UAVCAN_INTERFACES 2

2
boards/px4/fmu-v2/nuttx-config/Kconfig
View File

@ -3,7 +3,7 @@
# see misc/tools/kconfig-language.txt.
#
if ARCH_BOARD_PX4FMU_V2
if ARCH_BOARD_PX4_FMU_V2
config BOARD_HAS_PROBES
bool "Board provides GPIO or other Hardware for signaling to timing analyze."

2
boards/px4/fmu-v2/nuttx-config/include/board.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* nuttx-configs/px4fmu-v2/include/board.h
* nuttx-configs/px4_fmu-v2/include/board.h
* include/arch/board/board.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.

4
boards/px4/fmu-v2/nuttx-config/nsh/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V2=y
CONFIG_ARCH_BOARD="px4fmu-v2"
CONFIG_ARCH_BOARD_PX4_FMU_V2=y
CONFIG_ARCH_BOARD="px4_fmu-v2"
#
# Custom Board Configuration

2
boards/px4/fmu-v2/nuttx-config/scripts/ld.script
View File

@ -1,5 +1,5 @@
/****************************************************************************
* nuttx-configs/px4fmu-v2/scripts/ld.script
* nuttx-configs/px4_fmu-v2/scripts/ld.script
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>

2
boards/px4/fmu-v2/src/board_config.h
View File

@ -450,7 +450,7 @@
#define PWMIN_TIMER_CHANNEL 2
#define GPIO_PWM_IN GPIO_TIM4_CH2IN_2
#define BOARD_NAME "PX4FMU_V2"
#define BOARD_NAME "PX4_FMU_V2"
/* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)
* this board support the ADC system_power interface, and therefore

2
boards/px4/fmu-v2/src/init.c
View File

@ -440,7 +440,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
default:
/* questionable px4fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
/* questionable px4_fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
message("\nbad version detected, forcing to fmu-v2");
hw_version = HW_VER_FMUV2_STATE;

2
boards/px4/fmu-v2/test.cmake
View File

@ -7,7 +7,7 @@ px4_add_board(
ARCH cortex-m4
ROMFS
ROMFSROOT px4fmu_test
IO px4io-v2_default
IO px4_io-v2_default
TESTING
#UAVCAN_INTERFACES 2

2
boards/px4/fmu-v3/default.cmake
View File

@ -9,7 +9,7 @@ px4_add_board(
ARCH cortex-m4
ROMFS
ROMFSROOT px4fmu_common
IO px4io-v2_default
IO px4_io-v2_default
TESTING
UAVCAN_INTERFACES 2

2
boards/px4/fmu-v3/nuttx-config/Kconfig
View File

@ -3,7 +3,7 @@
# see misc/tools/kconfig-language.txt.
#
if ARCH_BOARD_PX4FMU_V2
if ARCH_BOARD_PX4_FMU_V2
config BOARD_HAS_PROBES
bool "Board provides GPIO or other Hardware for signaling to timing analyze."

2
boards/px4/fmu-v3/nuttx-config/include/board.h
View File

@ -1,5 +1,5 @@
/************************************************************************************
* nuttx-configs/px4fmu-v3/include/board.h
* nuttx-configs/px4_fmu-v3/include/board.h
* include/arch/board/board.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.

4
boards/px4/fmu-v3/nuttx-config/nsh/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V3=y
CONFIG_ARCH_BOARD="px4fmu-v3"
CONFIG_ARCH_BOARD_PX4_FMU_V3=y
CONFIG_ARCH_BOARD="px4_fmu-v3"
#
# Custom Board Configuration

4
boards/px4/fmu-v3/nuttx-config/stackcheck/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V3=y
CONFIG_ARCH_BOARD="px4fmu-v3"
CONFIG_ARCH_BOARD_PX4_FMU_V3=y
CONFIG_ARCH_BOARD="px4_fmu-v3"
#
# Custom Board Configuration

2
boards/px4/fmu-v3/rtps.cmake
View File

@ -9,7 +9,7 @@ px4_add_board(
ARCH cortex-m4
ROMFS
ROMFSROOT px4fmu_common
IO px4io-v2_default
IO px4_io-v2_default
TESTING
UAVCAN_INTERFACES 2

2
boards/px4/fmu-v3/src/board_config.h
View File

@ -450,7 +450,7 @@
#define PWMIN_TIMER_CHANNEL 2
#define GPIO_PWM_IN GPIO_TIM4_CH2IN_2
#define BOARD_NAME "PX4FMU_V2"
#define BOARD_NAME "PX4_FMU_V2"
/* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)
* this board support the ADC system_power interface, and therefore

2
boards/px4/fmu-v3/src/init.c
View File

@ -440,7 +440,7 @@ __EXPORT int board_app_initialize(uintptr_t arg)
default:
/* questionable px4fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
/* questionable px4_fmu-v2 hardware, try forcing regular FMUv2 (not much else we can do) */
message("\nbad version detected, forcing to fmu-v2");
hw_version = HW_VER_FMUV2_STATE;

2
boards/px4/fmu-v3/stackcheck.cmake
View File

@ -9,7 +9,7 @@ px4_add_board(
ARCH cortex-m4
ROMFS
ROMFSROOT px4fmu_common
IO px4io-v2_default
IO px4_io-v2_default
TESTING
#UAVCAN_INTERFACES 2

4
boards/px4/fmu-v4/nuttx-config/nsh/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V4=y
CONFIG_ARCH_BOARD="px4fmu-v4"
CONFIG_ARCH_BOARD_PX4_FMU_V4=y
CONFIG_ARCH_BOARD="px4_fmu-v4"
#
# Custom Board Configuration

4
boards/px4/fmu-v4/nuttx-config/stackcheck/defconfig
View File

@ -687,8 +687,8 @@ CONFIG_RAM_SIZE=262144
#
# Board Selection
#
CONFIG_ARCH_BOARD_PX4FMU_V4=y
CONFIG_ARCH_BOARD="px4fmu-v4"
CONFIG_ARCH_BOARD_PX4_FMU_V4=y
CONFIG_ARCH_BOARD="px4_fmu-v4"
#
# Custom Board Configuration

2
boards/px4/fmu-v4/src/board_config.h
View File

@ -306,7 +306,7 @@
#define SPEKTRUM_RX_AS_UART() /* Can be left as uart */
#define SPEKTRUM_OUT(_one_true) px4_arch_gpiowrite(GPIO_PPM_IN_AS_OUT, (_one_true))
#define BOARD_NAME "PX4FMU_V4"
#define BOARD_NAME "PX4_FMU_V4"
/**
* By Providing BOARD_ADC_USB_CONNECTED (using the px4_arch abstraction)

Some files were not shown because too many files have changed in this diff Show More