boards new split VENDOR_MODEL naming convention

.ci/Jenkinsfile-SITL_tests

@@ -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) {

.ci/Jenkinsfile-compile

@@ -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
           ]

.ci/Jenkinsfile-hardware

@@ -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`'

.travis.yml

@@ -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

.ycm_extra_conf.py

@@ -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',

CMakeLists.txt

@@ -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

Firmware.sublime-project

@@ -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
 		},
 		{

Jenkinsfile

@@ -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 {

Makefile

@@ -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

ROMFS/px4fmu_common/init.d/13004_quad+_tailsitter

@@ -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

ROMFS/px4fmu_common/init.d/13010_claire

@@ -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

ROMFS/px4fmu_common/init.d/4003_qavr5

@@ -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>
 #

ROMFS/px4fmu_common/init.d/4013_bebop

@@ -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

ROMFS/px4fmu_common/init.d/4020_hk_micro_pcb

@@ -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>

ROMFS/px4fmu_common/init.d/4030_3dr_solo

@@ -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>

ROMFS/px4fmu_common/init.d/4051_s250aq

@@ -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

ROMFS/px4fmu_common/init.d/4070_aerofc

@@ -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

ROMFS/px4fmu_common/init.d/4080_zmr250

@@ -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>
 #

ROMFS/px4fmu_common/init.d/4090_nanomind

@@ -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>

ROMFS/px4fmu_common/init.d/4250_teal

@@ -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