Fix USB line speed issues in NuttX

This was horribly wrong. Matrix is first cast into a matrix of size NxM (which is supposed to be the size of the result - NOT the starting point) so the transpose result becomes garbage. Instead make "Me" an MxN matrix as the original. Took me a whole evening to figure out this problem. Now my Kalman filter finally returns good results.

.ci/Jenkinsfile-SITL_tests

@@ -1,160 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-
-  stages {
-
-    stage('Build') {
-      agent {
-        docker {
-          image 'px4io/px4-dev-ros-kinetic:2019-03-08'
-          args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
-        }
-      }
-      steps {
-        sh 'export'
-        sh 'make distclean'
-        sh 'ccache -z'
-        sh 'git fetch --tags'
-        sh 'make px4_sitl_default'
-        sh 'make px4_sitl_default sitl_gazebo'
-        sh 'make px4_sitl_default package'
-        sh 'ccache -s'
-        stash(name: "px4_sitl_package", includes: "build/px4_sitl_default/*.bz2")
-        archiveArtifacts(artifacts: "build/px4_sitl_default/*.bz2", fingerprint: true, onlyIfSuccessful: true)
-      }
-      post {
-        always {
-            sh 'make distclean'
-        }
-      }
-    } // stage Build
-
-    stage('ROS Tests') {
-      steps {
-        script {
-          def missions = [
-            [
-              name: "FW",
-              test: "mavros_posix_test_mission.test",
-              mission: "FW_mission_1",
-              vehicle: "plane"
-            ],
-
-            [
-              name: "MC_box",
-              test: "mavros_posix_test_mission.test",
-              mission: "MC_mission_box",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_att",
-              test: "mavros_posix_tests_offboard_attctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_pos",
-              test: "mavros_posix_tests_offboard_posctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-
-            [
-              name: "VTOL_standard",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "standard_vtol"
-            ],
-            [
-              name: "VTOL_tailsitter",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tailsitter"
-            ],
-            [
-              name: "VTOL_tiltrotor",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tiltrotor"
-            ],
-            [
-              name: "MC_avoidance",
-              test: "mavros_posix_test_avoidance.test",
-              mission: "avoidance",
-              vehicle: "iris_obs_avoid",
-              run_script: "rostest_avoidance_run.sh"
-            ],
-
-          ]
-
-          def test_nodes = [:]
-          for (def i = 0; i < missions.size(); i++) {
-            test_nodes.put(missions[i].name, createTestNode(missions[i]))
-          }
-
-          parallel test_nodes
-        } // script
-      } // steps
-    } // stage ROS Tests
-
-  } //stages
-
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-  }
-
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-} // pipeline
-
-def createTestNode(Map test_def) {
-  return {
-    node {
-      cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
-        stage(test_def.name) {
-          def run_script = test_def.get('run_script', 'rostest_px4_run.sh')
-          def test_ok = true
-          sh('export')
-
-          unstash('px4_sitl_package')
-          sh('tar -xjpvf build/px4_sitl_default/px4-px4_sitl_default*.bz2')
-
-          // run test
-          try {
-            sh('px4-px4_sitl_default*/px4/test/' + run_script + ' ' + test_def.test + ' mission:=' + test_def.mission + ' vehicle:=' + test_def.vehicle)
-
-          } catch (exc) {
-            // save all test artifacts for debugging
-            archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.ulg, .ros/**/rosunit-*.xml, .ros/**/rostest-*.log')
-            test_ok = false
-          }
-
-          // log analysis
-          // process ekf log data
-          try {
-            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')
-            // FIXME: don't let the script to fail the build
-            // test_ok = false
-          }
-
-          // upload log to flight review (https://logs.px4.io/)
-          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) {
-            error('ROS Test failed')
-          }
-        } // stage
-        cleanWs()
-      } // docker.image
-    } // node
-  } // return
-} // createTestNode

.ci/Jenkinsfile-SITL_tests_ASan

@@ -1,153 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-
-  stages {
-
-    stage('Build') {
-      agent {
-        docker {
-          image 'px4io/px4-dev-ros-kinetic:2019-03-08'
-          args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
-        }
-      }
-      steps {
-        sh 'export'
-        sh 'make distclean'
-        sh 'ccache -z'
-        sh 'git fetch --tags'
-        sh 'make px4_sitl_default'
-        sh 'make px4_sitl_default sitl_gazebo'
-        sh 'make px4_sitl_default package'
-        sh 'ccache -s'
-        stash(name: "px4_sitl_package", includes: "build/px4_sitl_default/*.bz2")
-        //archiveArtifacts(artifacts: "build/px4_sitl_default/*.bz2", fingerprint: true, onlyIfSuccessful: true)
-      }
-      post {
-        always {
-            sh 'make distclean'
-        }
-      }
-    } // stage Build
-
-    stage('ROS Tests') {
-      steps {
-        script {
-          def missions = [
-            [
-              name: "FW",
-              test: "mavros_posix_test_mission.test",
-              mission: "FW_mission_1",
-              vehicle: "plane"
-            ],
-
-            [
-              name: "MC_box",
-              test: "mavros_posix_test_mission.test",
-              mission: "MC_mission_box",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_att",
-              test: "mavros_posix_tests_offboard_attctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_pos",
-              test: "mavros_posix_tests_offboard_posctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-
-            [
-              name: "VTOL_standard",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "standard_vtol"
-            ],
-            [
-              name: "VTOL_tailsitter",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tailsitter"
-            ],
-            [
-              name: "VTOL_tiltrotor",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tiltrotor"
-            ],
-
-          ]
-
-          def test_nodes = [:]
-          for (def i = 0; i < missions.size(); i++) {
-            test_nodes.put(missions[i].name, createTestNode(missions[i]))
-          }
-
-          parallel test_nodes
-        } // script
-      } // steps
-    } // stage ROS Tests
-
-  } //stages
-
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-    PX4_CMAKE_BUILD_TYPE = 'AddressSanitizer'
-  }
-
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-} // pipeline
-
-def createTestNode(Map test_def) {
-  return {
-    node {
-      cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
-        stage(test_def.name) {
-          def test_ok = true
-          sh('export')
-
-          unstash('px4_sitl_package')
-          sh('tar -xjpvf build/px4_sitl_default/px4-px4_sitl_default*.bz2')
-
-          // run test
-          try {
-            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
-            archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.ulg, .ros/**/rosunit-*.xml, .ros/**/rostest-*.log')
-            test_ok = false
-          }
-
-          // log analysis
-          // process ekf log data
-          try {
-            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')
-            // FIXME: don't let the script to fail the build
-            // test_ok = false
-          }
-
-          // upload log to flight review (https://logs.px4.io/)
-          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) {
-            error('ROS Test failed')
-          }
-        } // stage
-        cleanWs()
-      } // docker.image
-    } // node
-  } // return
-} // createTestNode

.ci/Jenkinsfile-SITL_tests_coverage

@@ -1,182 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-
-  stages {
-
-    stage('ROS Tests') {
-      steps {
-        script {
-          def missions = [
-            [
-              name: "FW",
-              test: "mavros_posix_test_mission.test",
-              mission: "FW_mission_1",
-              vehicle: "plane"
-            ],
-
-            [
-              name: "MC_box",
-              test: "mavros_posix_test_mission.test",
-              mission: "MC_mission_box",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_att",
-              test: "mavros_posix_tests_offboard_attctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-            [
-              name: "MC_offboard_pos",
-              test: "mavros_posix_tests_offboard_posctl.test",
-              mission: "",
-              vehicle: "iris"
-            ],
-
-            [
-              name: "VTOL_standard",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "standard_vtol"
-            ],
-            [
-              name: "VTOL_tailsitter",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tailsitter"
-            ],
-            [
-              name: "VTOL_tiltrotor",
-              test: "mavros_posix_test_mission.test",
-              mission: "VTOL_mission_1",
-              vehicle: "tiltrotor"
-            ],
-
-          ]
-
-          def test_nodes = [:]
-          for (def i = 0; i < missions.size(); i++) {
-            test_nodes.put(missions[i].name, createTestNode(missions[i]))
-          }
-
-          parallel test_nodes
-        } // script
-      } // steps
-    } // stage ROS Tests
-
-    stage('Coverage') {
-      parallel {
-
-        stage('code coverage (python)') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make python_coverage'
-            withCredentials([string(credentialsId: 'FIRMWARE_CODECOV_TOKEN', variable: 'CODECOV_TOKEN')]) {
-              sh 'curl -s https://codecov.io/bash | bash -s - -F python'
-            }
-
-            sh 'make distclean'
-          }
-        }
-
-        stage('unit tests') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make px4_sitl_test test_results_junit'
-            withCredentials([string(credentialsId: 'FIRMWARE_CODECOV_TOKEN', variable: 'CODECOV_TOKEN')]) {
-              sh 'curl -s https://codecov.io/bash | bash -s - -F unittest'
-            }
-            sh 'make distclean'
-          }
-        }
-
-      } // parallel
-    } // stage Coverage
-
-  } //stages
-
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-    CTEST_OUTPUT_ON_FAILURE = 1
-    PX4_CMAKE_BUILD_TYPE = 'Coverage'
-  }
-
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-} // pipeline
-
-def createTestNode(Map test_def) {
-  return {
-    node {
-      cleanWs()
-      docker.image("px4io/px4-dev-ros-kinetic:2019-03-08").inside('-e HOME=${WORKSPACE}') {
-        stage(test_def.name) {
-          def test_ok = true
-          sh('export')
-
-          checkout(scm)
-
-          // run test
-          try {
-            sh('make distclean')
-            sh('ccache -z')
-            sh('make px4_sitl_default')
-            sh('make px4_sitl_default sitl_gazebo')
-            sh('ccache -s')
-            sh('make rostest_run TEST_FILE=' + test_def.test + ' TEST_MISSION=' + test_def.mission + ' TEST_VEHICLE=' + test_def.vehicle)
-          } catch (exc) {
-            // save all test artifacts for debugging
-            archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.ulg, .ros/**/rosunit-*.xml, .ros/**/rostest-*.log')
-            test_ok = false
-          }
-
-          // log analysis
-          withCredentials([string(credentialsId: 'FIRMWARE_CODECOV_TOKEN', variable: 'CODECOV_TOKEN')]) {
-            sh 'curl -s https://codecov.io/bash | bash -s - -F sitl_mission_${STAGE_NAME}'
-
-            // process log data (with python code coverage)
-            try {
-              //sh('coverage run -p Tools/ecl_ekf/process_logdata_ekf.py .ros/log/*/*.ulg')
-              sh('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')
-              // FIXME: don't let the script to fail the build
-              // test_ok = false
-            }
-
-            // upload log to flight review (https://logs.px4.io/) with python code coverage
-            sh('coverage run -p 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}'
-          }
-
-          if (!test_ok) {
-            error('ROS Test failed')
-          }
-        } // stage
-        cleanWs()
-      } // docker.image
-    } // node
-  } // return
-} // createTestNode

.ci/Jenkinsfile-compile

@@ -1,153 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-  stages {
-
-    stage('Build') {
-      steps {
-        script {
-          def build_nodes = [:]
-          def docker_images = [
-            armhf: "px4io/px4-dev-armhf:2019-03-08",
-            base: "px4io/px4-dev-base-bionic:2019-03-08",
-            nuttx: "px4io/px4-dev-nuttx:2019-03-08",
-            ros: "px4io/px4-dev-ros-kinetic:2019-03-08",
-            rpi: "px4io/px4-dev-raspi:2019-03-08",
-            snapdragon: "lorenzmeier/px4-dev-snapdragon:2018-09-12"
-          ]
-
-          def armhf_builds = [
-            target: ["aerotenna_ocpoc_ubuntu"],
-            image: docker_images.armhf,
-            archive: false
-          ]
-
-          def base_builds = [
-            target: ["px4_sitl_rtps"],
-            image: docker_images.base,
-            archive: false
-          ]
-
-          def nuttx_builds_archive = [
-            target: [
-                     "px4_fmu-v2_default", "px4_fmu-v2_fixedwing", "px4_fmu-v2_lpe", "px4_fmu-v2_multicopter", "px4_fmu-v2_rover", "px4_fmu-v2_test",
-                     "px4_fmu-v3_default",
-                     "px4_fmu-v4_default",
-                     "px4_fmu-v4pro_default",
-                     "px4_fmu-v5_default", "px4_fmu-v5_fixedwing", "px4_fmu-v5_multicopter", "px4_fmu-v5_rover", "px4_fmu-v5_rtps", "px4_fmu-v5_stackcheck",
-                     "intel_aerofc-v1_default", "auav_x21_default", "av_x-v1_default", "bitcraze_crazyflie_default", "airmind_mindpx-v2_default",
-                     "nxp_fmuk66-v3_default", "omnibus_f4sd_default"],
-            image: docker_images.nuttx,
-            archive: true
-          ]
-
-          def nuttx_builds_other = [
-            target: ["px4_cannode-v1_default", "px4_esc-v1_default", "thiemar_s2740vc-v1_default"],
-            image: docker_images.nuttx,
-            archive: false
-          ]
-
-          def rpi_builds = [
-            target: ["emlid_navio2_cross", "parrot_bebop_default"],
-            image: docker_images.rpi,
-            archive: false
-          ]
-
-          def snapdragon_builds = [
-            target: ["atlflight_eagle_qurt-default", "atlflight_eagle_default"],
-            image: docker_images.snapdragon,
-            archive: false
-          ]
-
-          def docker_builds = [
-            armhf_builds, base_builds, nuttx_builds_archive, nuttx_builds_other, rpi_builds, snapdragon_builds
-          ]
-
-          for (def build_type = 0; build_type < docker_builds.size(); build_type++) {
-            for (def build_target = 0; build_target < docker_builds[build_type].target.size(); build_target++) {
-              build_nodes.put(docker_builds[build_type].target[build_target],
-                createBuildNode(docker_builds[build_type].archive, docker_builds[build_type].image, docker_builds[build_type].target[build_target])
-                )
-            }
-          }
-
-        parallel build_nodes
-
-        } // script
-      } // steps
-    } // stage Build
-
-    // TODO: actually upload artifacts to S3
-    // stage('S3 Upload') {
-    //   agent {
-    //     docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-    //   }
-    //   options {
-    //         skipDefaultCheckout()
-    //   }
-    //   when {
-    //     anyOf {
-    //       branch 'master'
-    //       branch 'beta'
-    //       branch 'stable'
-    //       branch 'pr-jenkins' // for testing
-    //     }
-    //   }
-    //   steps {
-    //     sh 'echo "uploading to S3"'
-    //   }
-    // }
-
-  } // stages
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-  }
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '2', artifactDaysToKeepStr: '14'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-}
-
-def createBuildNode(Boolean archive, String docker_image, String target) {
-  return {
-
-    // TODO: fix the snapdragon image
-    bypass_entrypoint = ''
-    if (docker_image == 'lorenzmeier/px4-dev-snapdragon:2018-09-12') {
-      bypass_entrypoint = ' --entrypoint=""'
-    }
-
-    node {
-      docker.withRegistry('https://registry.hub.docker.com', 'docker_hub_dagar') {
-        docker.image(docker_image).inside('-e CCACHE_BASEDIR=${WORKSPACE} -v ${CCACHE_DIR}:${CCACHE_DIR}:rw' + bypass_entrypoint) {
-          stage(target) {
-            try {
-              sh('export')
-              checkout(scm)
-              sh('make distclean')
-              sh('git fetch --tags')
-              sh('ccache -z')
-              sh('make ' + target)
-              sh('ccache -s')
-              sh('make sizes')
-              if (archive) {
-                archiveArtifacts(allowEmptyArchive: false, artifacts: 'build/*/*.px4, build/*/*.elf, build/*/*.bin', fingerprint: true, onlyIfSuccessful: true)
-              }
-              sh('make ' + target + ' package')
-              archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/*/*.tar.bz2', fingerprint: true, onlyIfSuccessful: true)
-              archiveArtifacts(allowEmptyArchive: true, artifacts: 'build/*/*.deb', fingerprint: true, onlyIfSuccessful: true)
-            }
-            catch (exc) {
-              throw (exc)
-            }
-            finally {
-              sh('make distclean')
-            }
-          }
-        }
-      }
-    }
-  }
-}

.ci/Jenkinsfile-compile_mac

@@ -1,87 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-  stages {
-
-    stage('Build') {
-
-      parallel {
-
-        stage('px4_sitl_default (OSX)') {
-          agent {
-            label 'mac'
-          }
-          environment {
-            CCACHE_BASEDIR = "${env.WORKSPACE}"
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'make px4_sitl_default'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        } // stage px4_sitl_default
-
-        stage('px4_fmu-v5_default (OSX)') {
-          agent {
-            label 'mac'
-          }
-          environment {
-            CCACHE_BASEDIR = "${env.WORKSPACE}"
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'make px4_fmu-v5_default'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        } // stage px4_fmu-v5_default
-
-        stage('sitl tests (OSX)') {
-          agent {
-            label 'mac'
-          }
-          environment {
-            CCACHE_BASEDIR = "${env.WORKSPACE}"
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'make tests'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        } // stage sitl tests
-
-      } // parallel
-    } // stage Build
-
-  } // stages
-  environment {
-    CCACHE_CPP2 = '1'
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-  }
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '10', artifactDaysToKeepStr: '30'))
-    timeout(time: 120, unit: 'MINUTES')
-  }
-}

.ci/Jenkinsfile-hardware

@@ -1,366 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-  stages {
-
-    stage('Build') {
-
-      parallel {
-
-        stage('px4_fmu-v2_test') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v2_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v2_default/px4_fmu-v2_default.elf', name: 'px4_fmu-v2_test'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('px4_fmu-v3_default') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v3_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v3_default/px4_fmu-v3_default.elf', name: 'px4_fmu-v3_default'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('px4_fmu-v4_default') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v4_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v4_default/px4_fmu-v4_default.elf', name: 'px4_fmu-v4_default'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('px4_fmu-v4pro_default') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v4pro_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v4pro_default/px4_fmu-v4pro_default.elf', name: 'px4_fmu-v4pro_default'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('px4_fmu-v5_default') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v5_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v5_default/px4_fmu-v5_default.elf', name: 'px4_fmu-v5_default'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('px4_fmu-v5_stackcheck') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make px4_fmu-v5_stackcheck'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/px4_fmu-v5_stackcheck/px4_fmu-v5_stackcheck.elf', name: 'px4_fmu-v5_stackcheck'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-        stage('nxp_fmuk66-v3_default') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make nxp_fmuk66-v3_default'
-            sh 'make sizes'
-            sh 'ccache -s'
-            stash includes: 'build/nxp_fmuk66-v3_default/nxp_fmuk66-v3_default.elf', name: 'nxp_fmuk66-v3_default'
-          }
-          post {
-            always {
-                sh 'make distclean'
-            }
-          }
-        }
-
-      } // parallel
-    } // stage Build
-
-    stage('Flash and Run') {
-
-      parallel {
-
-        stage('px4_fmu-v2_test') {
-          agent {
-            label 'px4_fmu-v2'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v2_test'
-                sh 'platforms/nuttx/Debug/jlink_gdb_upload.sh build/px4_fmu-v2_test/px4_fmu-v2_test.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                //sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('px4_fmu-v3_default') {
-          agent {
-            label 'px4_fmu-v3'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v3_default'
-                sh 'platforms/nuttx/Debug/jlink_gdb_upload.sh build/px4_fmu-v3_default/px4_fmu-v3_default.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('px4_fmu-v4_default') {
-          agent {
-            label 'px4_fmu-v4'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v4_default'
-                sh 'platforms/nuttx/Debug/jlink_gdb_upload.sh build/px4_fmu-v4_default/px4_fmu-v4_default.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('px4_fmu-v4pro_default') {
-          agent {
-            label 'px4_fmu-v4pro'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v4pro_default'
-                sh 'platforms/nuttx/Debug/jlink_gdb_upload.sh build/px4_fmu-v4pro_default/px4_fmu-v4pro_default.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('px4_fmu-v5_default') {
-          agent {
-            label 'px4_fmu-v5'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v5_default'
-                sh './platforms/nuttx/Debug/jlink_gdb_upload.sh  build/px4_fmu-v5_default/px4_fmu-v5_default.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('px4_fmu-v5_stackcheck') {
-          agent {
-            label 'px4_fmu-v5'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'px4_fmu-v5_stackcheck'
-                sh './platforms/nuttx/Debug/jlink_gdb_upload.sh build/px4_fmu-v5_stackcheck/px4_fmu-v5_stackcheck.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI_*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-        stage('nxp_fmuk66-v3_default') {
-          agent {
-            label 'nxp_fmuk66-v3'
-          }
-          steps {
-            script {
-              try {
-                sh 'export'
-                sh 'find /dev/serial'
-                unstash 'nxp_fmuk66-v3_default'
-                sh './platforms/nuttx/Debug/jlink_gdb_upload.sh build/nxp_fmuk66-v3_default/nxp_fmuk66-v3_default.elf'
-                sh './Tools/HIL/monitor_firmware_upload.py --device `find /dev/serial -name *usb-FTDI*` --baudrate 57600'
-                sh './Tools/HIL/run_tests.py --device `find /dev/serial -name *usb-FTDI_*`'
-              } catch (Exception err) {
-                  // always report passed for now
-                  currentBuild.result = 'SUCCESS'
-              }
-            } // script
-          }
-          options {
-            timeout(time: 600, unit: 'SECONDS')
-          }
-        }
-
-      } // parallel
-    } // stage Flash
-
-  } // stages
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-  }
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '30'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-}

.clang-tidy

@@ -1,89 +0,0 @@
-Checks:          '*
-		,-cert-dcl50-cpp
-		,-cert-env33-c
-		,-cert-err34-c
-		,-cert-err58-cpp
-		,-cert-msc30-c
-		,-cert-msc50-cpp
-		,-clang-analyzer-core.CallAndMessage
-		,-clang-analyzer-core.NullDereference
-		,-clang-analyzer-core.UndefinedBinaryOperatorResult
-		,-clang-analyzer-core.uninitialized.Assign
-		,-clang-analyzer-core.VLASize
-		,-clang-analyzer-cplusplus.NewDelete
-		,-clang-analyzer-cplusplus.NewDeleteLeaks
-		,-clang-analyzer-deadcode.DeadStores
-		,-clang-analyzer-optin.cplusplus.VirtualCall
-		,-clang-analyzer-optin.performance.Padding
-		,-clang-analyzer-security.insecureAPI.strcpy
-		,-clang-analyzer-unix.API
-		,-clang-analyzer-unix.cstring.BadSizeArg
-		,-clang-analyzer-unix.Malloc
-		,-clang-analyzer-unix.MallocSizeof
-		,-cppcoreguidelines-c-copy-assignment-signature
-		,-cppcoreguidelines-interfaces-global-init
-		,-cppcoreguidelines-no-malloc
-		,-cppcoreguidelines-pro-bounds-array-to-pointer-decay
-		,-cppcoreguidelines-pro-bounds-constant-array-index
-		,-cppcoreguidelines-pro-bounds-pointer-arithmetic
-		,-cppcoreguidelines-pro-type-const-cast
-		,-cppcoreguidelines-pro-type-cstyle-cast
-		,-cppcoreguidelines-pro-type-member-init
-		,-cppcoreguidelines-pro-type-reinterpret-cast
-		,-cppcoreguidelines-pro-type-union-access
-		,-cppcoreguidelines-pro-type-vararg
-		,-cppcoreguidelines-special-member-functions
-		,-google-build-using-namespace
-		,-google-explicit-constructor
-		,-google-global-names-in-headers
-		,-google-readability-casting
-		,-google-readability-namespace-comments
-		,-google-readability-todo
-		,-google-runtime-int
-		,-google-runtime-references
-		,-llvm-header-guard
-		,-llvm-include-order
-		,-llvm-namespace-comment
-		,-misc-incorrect-roundings
-		,-misc-macro-parentheses
-		,-misc-misplaced-widening-cast
-		,-misc-redundant-expression
-		,-misc-unconventional-assign-operator
-		,-misc-unused-parameters
-		,-modernize-deprecated-headers
-		,-modernize-loop-convert
-		,-modernize-use-auto
-		,-modernize-use-bool-literals
-		,-modernize-use-default-member-init
-		,-modernize-use-emplace
-		,-modernize-use-equals-default
-		,-modernize-use-equals-delete
-		,-modernize-use-override
-		,-modernize-use-using
-		,-modernize-pass-by-value
-		,-performance-inefficient-string-concatenation
-		,-readability-avoid-const-params-in-decls
-		,-readability-else-after-return
-		,-readability-implicit-bool-cast
-		,-readability-inconsistent-declaration-parameter-name
-		,-readability-non-const-parameter
-		,-readability-redundant-declaration
-		,-readability-redundant-member-init
-		,-readability-simplify-boolean-expr
-		'
-WarningsAsErrors: '*'
-CheckOptions:    
-  - key:             google-readability-braces-around-statements.ShortStatementLines
-    value:           '1'
-  - key:             google-readability-function-size.BranchThreshold
-    value:           '600'
-  - key:             google-readability-function-size.LineThreshold
-    value:           '4000'
-  - key:             google-readability-function-size.StatementThreshold
-    value:           '4000'
-  - key:             readability-braces-around-statements.ShortStatementLines
-    value:           '1'
-  - key:             readability-function-size.LineThreshold
-    value:           '4000'
-  - key:             readability-function-size.StatementThreshold
-    value:           '4000'

.github/ISSUE_TEMPLATE/1_Bug_report.md

@@ -1,32 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of the bug.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Drone switched on '...'
-2. Uploaded mission '....' (attach QGC mission file)
-3. Took off '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Log Files and Screenshots**
-*Always* provide a link to the flight log file:
-- Download the flight log file from the vehicle ([tutorial](https://docs.px4.io/en/getting_started/flight_reporting.html)).
-- Share the link to a log showing the problem on [PX4 Flight Review](http://logs.px4.io/).
-
-Add screenshots to help explain your problem.
-
-**Drone (please complete the following information):**
-- Describe the type of drone.
-- Photo of the IMU / autopilot setup if possible.
-
-**Additional context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/2_Feature_request.md

@@ -1,19 +0,0 @@
----
-name: 🚀 Feature Request
-about: Suggest an idea for this project
-
----
-
-For general questions please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](http://slack.px4.io/).
-
-**Describe problem solved by the proposed feature**
-A clear and concise description of the problem, if any, this feature will solve. E.g. I'm always frustrated when ...
-
-**Describe your preferred solution**
-A clear and concise description of what you want to happen.
-
-**Describe possible alternatives**
-A clear and concise description of alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots for the feature request here.

.github/ISSUE_TEMPLATE/3_Support_question.md

@@ -1,10 +0,0 @@
----
-name: ⛔ Support Question
-about: See [PX4 Discuss](http://discuss.px4.io/) for questions about using PX4.
-
----
-
-We use GitHub issues only to discuss PX4 bugs and new features. For
-questions about using PX4 or related components, please use [PX4 Discuss](http://discuss.px4.io/).
-
-Thanks!

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

@@ -1,9 +0,0 @@
----
-name: ⛔ Documentation Issue
-about: See https://github.com/PX4/Devguide for documentation issues
-
----
-
-PX4 has dedicated repositories for developer documentation (https://github.com/PX4/Devguide) and user documentation (https://github.com/PX4/px4_user_guide).
-
-Thanks!

.github/stale.yml

@@ -1,18 +0,0 @@
-# Number of days of inactivity before an issue becomes stale
-daysUntilStale: 90
-# Number of days of inactivity before a stale issue is closed
-daysUntilClose: 14
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-  - security
-# Label to use when marking an issue as stale
-staleLabel: wontfix
-# Comment to post when marking an issue as stale. Set to `false` to disable
-markComment: >
-  This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed if no further activity occurs. Thank you
-  for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: >
-  Closing as stale.

.github_changelog_generator

@@ -1,33 +0,0 @@
-# How to install:
-#   gem install github_changelog_generator
-# How to run:
-#   github_changelog_generator -u PX4 -p Firmware
-# Description:
-#   The following params are sensible defaults for the PX4 project,
-#   if you want to do a changelog before a release you need to update since-tag and future-releases,
-
-# Params:
-#   github_changelog_generator --help for all options
-
-# max-issues
-#   max threshold for github api queries
-#   make sure you set your CHANGELOG_GITHUB_TOKEN before
-#   running
-max-issues=1500
-
-# exclude-tags-regex
-#   excludes release candidates
-exclude-tags-regex=rc[0-9]{1,}|beta[0-9]{1,}
-
-# since-tag
-#   version of last stable release
-#   you need to change this depending on what you need
-#   if you want a changelog between versions this is the lowest version
-since-tag=1.6.5
-
-# future-release
-#   version you are about to release
-#   if you want a changelog between a version and all unreleased changes grouped as a release
-#     eg: v1.6.5 to v1.7.0
-future-release=v1.7.0
-

.gitignore

@@ -1,6 +1,10 @@
+*.d
+!ROMFS/*/*.d
+!ROMFS/*/*/*.d
+!ROMFS/*/*/*/*.d
+*.px4log
 *.dSYM
 *.o
-*.gch
 *.pyc
 *~
 .*.swp
@@ -8,13 +12,13 @@
 .cproject
 .DS_Store
 .gdbinit
-.gdb_history
 .project
 .settings
 .swp
 .~lock.*
+Archives/*
+Build/*
 Testing/
-Packages/*
 build/*
 build_*/
 core
@@ -23,6 +27,15 @@ cscope.in.out
 cscope.po.out
 Firmware.sublime-workspace
 user.sublime*
+Images/*.bin
+Images/*.px4
+mavlink/include/mavlink/v0.9/
+/nuttx-configs/px4io-v2/src/.depend
+/nuttx-configs/px4io-v2/src/Make.dep
+/nuttx-configs/px4io-v2/src/libboard.a
+/nuttx-configs/px4io-v1/src/.depend
+/nuttx-configs/px4io-v1/src/Make.dep
+/nuttx-configs/px4io-v1/src/libboard.a
 /Documentation/doxy.log
 /Documentation/html/
 /Documentation/doxygen*objdb*tmp
@@ -32,11 +45,19 @@ tags
 .pydevproject
 .ropeproject
 *.orig
+src/modules/uORB/topics/*
+src/platforms/nuttx/px4_messages/*
+src/platforms/ros/px4_messages/*
 Firmware.zip
+unittests/build
 *.generated.h
 .vagrant
 *.pretty
 xcode
+src/platforms/posix/px4_messages/
+src/platforms/posix-arm/px4_messages/
+src/platforms/qurt/px4_messages/
+ROMFS/*/*/rc.autostart
 rootfs/
 *.autosave
 CMakeLists.txt.user
@@ -48,19 +69,6 @@ GTAGS
 *.files
 *.includes
 
-# CLion ignores
-.idea
-cmake-build-*/
-
-posix-configs/SITL/init/test/*_generated
-
-/airframes.md
-/airframes.xml
-/parameters.md
-/parameters.xml
-/modules
-/msg/ros/*.msg
-
-*.gcov
-.coverage
-.coverage.*
+# uavcan firmware
+ROMFS/px4fmu_common/uavcan/
+vectorcontrol/

.gitmodules

@@ -1,60 +1,43 @@
+[submodule "mavlink/include/mavlink/v1.0"]
+	path = mavlink/include/mavlink/v1.0
+	url = https://github.com/mavlink/c_library_v1.git
 [submodule "mavlink/include/mavlink/v2.0"]
 	path = mavlink/include/mavlink/v2.0
 	url = https://github.com/mavlink/c_library_v2.git
-	branch = master
-[submodule "src/drivers/uavcan/libuavcan"]
-	path = src/drivers/uavcan/libuavcan
-	url = https://github.com/PX4/uavcan.git
-	branch = px4
-[submodule "msg/tools/genmsg"]
-	path = msg/tools/genmsg
-	url = https://github.com/PX4/genmsg.git
-	branch = px4
-[submodule "msg/tools/gencpp"]
-	path = msg/tools/gencpp
-	url = https://github.com/PX4/gencpp.git
-	branch = px4
+[submodule "NuttX"]
+	path = NuttX
+	url = https://github.com/PX4/NuttX.git
+[submodule "src/modules/uavcan/libuavcan"]
+	path = src/modules/uavcan/libuavcan
+	url = https://github.com/UAVCAN/libuavcan.git
+[submodule "Tools/genmsg"]
+	path = Tools/genmsg
+	url = https://github.com/ros/genmsg.git
+[submodule "Tools/gencpp"]
+	path = Tools/gencpp
+	url = https://github.com/ros/gencpp.git
 [submodule "Tools/jMAVSim"]
 	path = Tools/jMAVSim
 	url = https://github.com/PX4/jMAVSim.git
-	branch = master
 [submodule "Tools/sitl_gazebo"]
 	path = Tools/sitl_gazebo
 	url = https://github.com/PX4/sitl_gazebo.git
-	branch = master
+[submodule "unittests/googletest"]
+	path = unittests/googletest
+	url = https://github.com/google/googletest.git
+	ignore = untracked
 [submodule "src/lib/matrix"]
 	path = src/lib/matrix
 	url = https://github.com/PX4/Matrix.git
-	branch = master
 [submodule "src/lib/DriverFramework"]
 	path = src/lib/DriverFramework
 	url = https://github.com/PX4/DriverFramework.git
-	branch = master
 [submodule "src/lib/ecl"]
 	path = src/lib/ecl
 	url = https://github.com/PX4/ecl.git
-	branch = master
-[submodule "boards/atlflight/cmake_hexagon"]
-	path = boards/atlflight/cmake_hexagon
-	url = https://github.com/PX4/cmake_hexagon.git
-	branch = px4
+[submodule "cmake/cmake_hexagon"]
+	path = cmake/cmake_hexagon
+	url = https://github.com/ATLFlight/cmake_hexagon
 [submodule "src/drivers/gps/devices"]
 	path = src/drivers/gps/devices
 	url = https://github.com/PX4/GpsDrivers.git
-	branch = master
-[submodule "src/modules/micrortps_bridge/micro-CDR"]
-	path = src/modules/micrortps_bridge/micro-CDR
-	url = https://github.com/PX4/micro-CDR.git
-	branch = px4
-[submodule "platforms/nuttx/NuttX/nuttx"]
-	path = platforms/nuttx/NuttX/nuttx
-	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-7.28+
-[submodule "platforms/nuttx/NuttX/apps"]
-	path = platforms/nuttx/NuttX/apps
-	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-7.28+
-[submodule "cmake/configs/uavcan_board_ident"]
-	path = cmake/configs/uavcan_board_ident
-	url = https://github.com/PX4/uavcan_board_ident.git
-	branch = master

.travis.yml

@@ -1,33 +1,131 @@
-language: cpp
+# Build and autotest script for PX4 Firmware
+# http://travis-ci.org
 
-git:
-  depth: 100
-  submodules: false
+language: cpp
 
 matrix:
   fast_finish: true
   include:
     - os: linux
-      dist: xenial
-      if: branch = coverity_scan
+      sudo: required
+      env: GCC_VER=4.8 DOCKER_REPO="px4io/px4-dev-base:2016-07-14"
+      services:
+        - docker
+    - os: osx
+      sudo: true
+      osx_image: xcode7.3
+      env: CCACHE_CPP2=1
+
+cache:
+  ccache: true
+  pip: true
+  directories:
+    - $HOME/.pip/cache/
+    - $HOME/Library/Caches/pip
 
 before_install:
-    - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+         cd ${TRAVIS_BUILD_DIR}
+      && git fetch --unshallow && git fetch --all --tags
+      && docker pull ${DOCKER_REPO}
+      ;
+    elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+         sudo -H easy_install pip
+      && sudo -H pip install empy
+      && wget https://s3.amazonaws.com/px4-travis/toolchain/macos/ccache
+      && sudo mv ccache /usr/local/bin
+      && chmod +x /usr/local/bin/ccache
+      && mkdir -p ~/bin
+      && sudo ln -s /usr/local/bin/ccache ~/bin/c++
+      && sudo ln -s /usr/local/bin/ccache ~/bin/cc
+      && sudo ln -s /usr/local/bin/ccache ~/bin/clang
+      && sudo ln -s /usr/local/bin/ccache ~/bin/clang++
+      && sudo ln -s /usr/local/bin/ccache ~/bin/g++
+      && sudo ln -s /usr/local/bin/ccache ~/bin/gcc
+      && export PATH=~/bin:$PATH
+      && wget https://s3.amazonaws.com/px4-travis/toolchain/macos/ninja
+      && sudo mv ninja /usr/local/bin
+      && chmod +x /usr/local/bin/ninja
+      ;
+    fi
 
-install:
-    - export PATH=$HOME/.local/bin:$PATH
-    - pip install --user --upgrade pip
-    - pip install --user -r Tools/setup/requirements.txt
+env:
+  global:
+# AWS KEY: $PX4_AWS_KEY
+    - secure: "XknnZHWBbpHbN4f3fuAVwUztdLIu8ej4keC3aQSDofo3uw8AFEzojfsQsN9u77ShWSIV4iYJWh9C9ALkCx7TocJ+xYjiboo10YhM9lH/8u+EXjYWG6GHS8ua0wkir+cViSxoLNaMtmcb/rPTicJecAGANxLsIHyBAgTL3fkbLSA="
+# AWS SECRET: $PX4_AWS_SECRET
+    - secure: "h6oajlW68dWIr+wZhO58Dv6e68dZHrBLVA6lPXZmheFQBW6Xam1HuLGA0LOW6cL9TnrAsOZ8g4goB58eMQnMEijFZKi3mhRwZhd/Xjq/ZGJOWBUrLoQHZUw2dQk5ja5vmUlKEoQnFZjDuMjx8KfX5ZMNy8A3yssWZtJYHD8c+bk="
+    - PX4_AWS_BUCKET=px4-travis
+    - GIT_SUBMODULES_ARE_EVIL=1
 
 script:
-    - make
+  - ccache -M 1GB; ccache -z
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+      docker run --rm -v `pwd`:`pwd`:rw -v $HOME/.ccache:$HOME/.ccache:rw -e CCACHE_DIR=$HOME/.ccache -e GIT_SUBMODULES_ARE_EVIL=1 -w=`pwd` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "make check_qgc_firmware VECTORCONTROL=1";
+    elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+      make check_posix_sitl_default;
+    fi
+  - ccache -s
 
-addons:
-  coverity_scan:
-    project:
-      name: "PX4/Firmware"
-      description: "Build submitted via Travis CI"
-    notification_email: ci@px4.io
-    build_command_prepend: "make distclean"
-    build_command: "make px4_sitl_default"
-    branch_pattern: coverity_scan
+after_success:
+  - make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/
+# find all px4 firmware (*.px4) and rename
+  - find . -type f -name 'nuttx-*-default.px4' -exec cp "{}" . \;
+  - find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*-default.px4' | sed 's/.\/nuttx-//' | sed 's/-default.px4//' | xargs -I{} mv nuttx-{}-default.px4 {}_default.px4
+  - mkdir s3deploy-branch && mv *_default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml s3deploy-branch/
+# only deploy GCC 4.8 builds on master/beta/stable
+  - if [[ "$GCC_VER" == "4.8" && ( "$TRAVIS_BRANCH" == "master" || "$TRAVIS_BRANCH" == "beta" || "$TRAVIS_BRANCH" == "stable" ) ]]; then
+      export PX4_S3_DEPLOY=1;
+    fi
+
+deploy:
+# deploy *.px4 to S3 px4-travis/Firmware/$TRAVIS_BRANCH
+  - provider: s3
+    access_key_id: $PX4_AWS_KEY
+    secret_access_key:
+      secure: $PX4_AWS_SECRET
+    bucket: px4-travis
+    local_dir: s3deploy-branch
+    upload-dir: Firmware/$TRAVIS_BRANCH
+    acl: public_read
+    skip_cleanup: true
+    on:
+      all_branches: true
+      condition: $PX4_S3_DEPLOY = 1
+
+# deploy Firmware.zip to S3 px4-travis/archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID
+  - provider: s3
+    access_key_id: $PX4_AWS_KEY
+    secret_access_key:
+      secure: $PX4_AWS_SECRET
+    bucket: px4-travis
+    local_dir: s3deploy-archive
+    upload-dir: archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID
+    acl: public_read
+    skip_cleanup: true
+    on:
+      all_branches: true
+      condition: $PX4_S3_DEPLOY = 1
+
+# on tags deploy Firmware.zip to Github releases
+  - provider: releases
+    api_key: 
+      secure: cdHWLRBxA5UlYpOS0Sp891QK7PFmMgQ5ZWs1aPt+sw0rIrowyWMHCwXNBEdUqaExHYNYgXCUDI0EzNgfB7ZcR63Qv1MQeoyamV4jsxlyAqDqmxNtWO82S6RhHGeMLk26VgFKzynVcEk1IYlQP2nqzMQLdu+jTrngERuAIrCdRuc=
+    file: "Firmware.zip"
+    skip_cleanup: true
+    on:
+      tags: true
+      all_branches: true
+      repo: PX4/Firmware
+      condition: $GCC_VER = 4.8
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/2b9c4a4cb2211f8befba
+    on_success: always  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+  slack:
+    secure: "QKw73Zel/s3JAbe/7XyO9tPnJwiiGFpYzSjdR8lG3tYFjRdXZnhxG4c+G7bkgkaPTS4Hult33VXE3kcEqOI7+C+eRwRlZhDfL0knQbXVCxjcLjzmUFdoPOwurlgZDw66PFWCi5tZcLKSRo3u4U8ibT4WKi3jm9sDSyOcfBAucMU="
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always

.vscode/.gitignore

@@ -1,6 +0,0 @@
-.cortex-debug.peripherals.state.json
-.cortex-debug.registers.state.json
-compile_commands.json
-
-# C/C++ extension does some local caching in this folder
-ipch/

.vscode/c_cpp_properties.json

@@ -1,26 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "Linux",
-            "intelliSenseMode": "gcc-x64",
-            "includePath": [
-                "${workspaceFolder}/**"
-            ],
-            "defines": [],
-            "browse": {
-                "path": [
-                    "${workspaceFolder}/src/",
-                    "${workspaceFolder}/src/lib/",
-                    "${workspaceFolder}/src/lib/matrix",
-                    "${workspaceFolder}/src/platforms",
-                    "${workspaceFolder}/platforms/",
-                    "."
-                ],
-                "limitSymbolsToIncludedHeaders": true
-            },
-            "compileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
-            "configurationProvider": "vector-of-bool.cmake-tools"
-        }
-    ],
-    "version": 4
-}

.vscode/cmake-kits.json

@@ -1,5 +0,0 @@
-[
-	{
-		"name": "PX4 detect"
-	}
-]

.vscode/cmake-variants.yaml

@@ -1,63 +0,0 @@
-CONFIG:
-  default: px4_sitl_default
-  choices:
-    px4_sitl_default:
-      short: px4_sitl
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_default
-    px4_sitl_default_Debug:
-      short: px4_sitl (Debug)
-      buildType: Debug
-      settings:
-        CONFIG: px4_sitl_default
-    px4_sitl_default_ASan:
-      short: px4_sitl (Address Sanitizer)
-      buildType: AddressSanitizer
-      settings:
-        CONFIG: px4_sitl_default
-    px4_fmu-v2_default:
-      short: px4_fmu-v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v2_default
-    px4_fmu-v3_default:
-      short: px4_fmu-v3
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v3_default
-    px4_fmu-v4_default:
-      short: px4_fmu-v4
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v4_default
-    px4_fmu-v4pro_default:
-      short: px4_fmu-v4pro
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v4pro_default
-    px4_fmu-v5_default:
-      short: px4_fmu-v5
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v5_default
-    airmind_mindpx-v2_default:
-      short: airmind_mindpx-v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: airmind_mindpx-v2_default
-    av_x-v1_default:
-      short: av-x
-      buildType: MinSizeRel
-      settings:
-        CONFIG: av_x-v1_default
-    intel_aerofc-v1_default:
-      short: intel_aerofc-v1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: intel_aerofc-v1_default
-    nxp_fmuk66-v3_default:
-      short: nxp_fmuk66-v3
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_fmuk66-v3_default

.vscode/extensions.json

@@ -1,18 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "ajshort.ros",
-        "chiehyu.vscode-astyle",
-        "dan-c-underwood.arm",
-        "github.vscode-pull-request-github",
-        "marus25.cortex-debug",
-        "ms-python.python",
-        "ms-vscode.cpptools",
-        "peterjausovec.vscode-docker",
-        "twxs.cmake",
-        "uavcan.dsdl",
-        "vector-of-bool.cmake-tools",
-        "wholroyd.jinja"
-    ]
-}

.vscode/launch.json

@@ -1,194 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "SITL shell",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "${workspaceFolder}/ROMFS/px4fmu_common",
-                "-s",
-                "etc/init.d-posix/rcS",
-                "-t",
-                "${workspaceFolder}/test_data"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/build/px4_sitl_default/tmp",
-            "environment": [
-                {
-                    "name": "PX4_SIM_MODEL",
-                    "value": "shell"
-                }
-            ],
-            "externalConsole": false,
-            "linux": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "description": "Enable pretty-printing for gdb",
-                        "text": "-enable-pretty-printing",
-                        "ignoreFailures": true
-                    },
-                    {
-                        "description": "PX4 ignore wq signals",
-                        "text": "handle SIGCONT nostop noprint nopass",
-                        "ignoreFailures": true
-                    }
-                ]
-            },
-            "osx": {
-                "MIMode": "lldb",
-                "setupCommands": [
-                    {
-                        "text": "pro hand -p true -s false -n false SIGCONT",
-                    }
-                ]
-            }
-        },
-        {
-            "name": "SITL jmavsim iris",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "${workspaceFolder}/ROMFS/px4fmu_common",
-                "-s",
-                "etc/init.d-posix/rcS",
-                "-t",
-                "${workspaceFolder}/test_data"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/build/px4_sitl_default/tmp",
-            "environment": [
-                {
-                    "name": "PX4_SIM_MODEL",
-                    "value": "iris"
-                }
-            ],
-            "externalConsole": false,
-            "preLaunchTask": "jmavsim",
-            "postDebugTask": "jmavsim kill",
-            "linux": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "description": "Enable pretty-printing for gdb",
-                        "text": "-enable-pretty-printing",
-                        "ignoreFailures": true
-                    },
-                    {
-                        "description": "PX4 ignore wq signals",
-                        "text": "handle SIGCONT nostop noprint nopass",
-                        "ignoreFailures": true
-                    }
-                ]
-            },
-            "osx": {
-                "MIMode": "lldb",
-                "setupCommands": [
-                    {
-                        "text": "pro hand -p true -s false -n false SIGCONT",
-                    }
-                ]
-            }
-        },
-        {
-            "name": "SITL gazebo iris",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${command:cmake.launchTargetPath}",
-            "args": [
-                "${workspaceFolder}/ROMFS/px4fmu_common",
-                "-s",
-                "etc/init.d-posix/rcS",
-                "-t",
-                "${workspaceFolder}/test_data"
-            ],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}/build/px4_sitl_default/tmp",
-            "environment": [
-                {
-                    "name": "PX4_SIM_MODEL",
-                    "value": "iris"
-                }
-            ],
-            "externalConsole": false,
-            "preLaunchTask": "gazebo iris",
-            "postDebugTask": "gazebo kill",
-            "linux": {
-                "MIMode": "gdb",
-                "setupCommands": [
-                    {
-                        "description": "Enable pretty-printing for gdb",
-                        "text": "-enable-pretty-printing",
-                        "ignoreFailures": true
-                    },
-                    {
-                        "description": "PX4 ignore wq signals",
-                        "text": "handle SIGCONT nostop noprint nopass",
-                        "ignoreFailures": true
-                    }
-                ]
-            },
-            "osx": {
-                "MIMode": "lldb",
-                "setupCommands": [
-                    {
-                        "text": "pro hand -p true -s false -n false SIGCONT",
-                    }
-                ]
-            }
-        },
-        {
-            "name": "px4_fmu-v2 (jlink) ",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F427VI",
-            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F427.svd",
-            "interface": "swd"
-        },
-        {
-            "name": "px4_fmu-v3 (jlink)",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F427VI",
-            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F427.svd",
-            "interface": "swd"
-        },
-        {
-            "name": "px4_fmu-v4 (jlink)",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F427VI",
-            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F427.svd",
-            "interface": "swd"
-        },
-        {
-            "name": "px4_fmu-v4pro (jlink)",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F469VI",
-            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F469.svd",
-            "interface": "swd"
-        },
-        {
-            "name": "px4_fmu-v5 (jlink)",
-            "executable": "${command:cmake.launchTargetPath}",
-            "request": "launch",
-            "type": "cortex-debug",
-            "servertype": "jlink",
-            "device": "STM32F765VI",
-            "svdFile": "${workspaceRoot}/../cmsis-svd/data/STMicro/STM32F7x5.svd",
-            "interface": "swd"
-        },
-    ]
-}

.vscode/settings.json

@@ -1,91 +0,0 @@
-{
-        "astyle.astylerc": "${workspaceFolder}/Tools/astyle/astylerc",
-        "astyle.c.enable": true,
-        "astyle.cpp.enable": true,
-        "breadcrumbs.enabled": true,
-        "cmake.autoRestartBuild": true,
-        "cmake.buildDirectory": "${workspaceFolder}/build/${variant:CONFIG}",
-        "cmake.buildBeforeRun": true,
-        "cmake.configureOnOpen": true,
-        "cmake.copyCompileCommands": "${workspaceFolder}/.vscode/compile_commands.json",
-        "cmake.debugConfig": {
-                "name": "SITL shell (gdb)",
-                "type": "cppdbg",
-                "request": "launch",
-                "program": "${command:cmake.launchTargetPath}",
-                "args": [
-                        "${workspaceFolder}/ROMFS/px4fmu_common",
-                        "-s",
-                        "etc/init.d-posix/rcS",
-                        "-t",
-                        "${workspaceFolder}/test_data"
-                ],
-                "stopAtEntry": false,
-                "cwd": "${workspaceFolder}/build/px4_sitl_default/tmp",
-                "environment": [
-                        {
-                                "name": "PX4_SIM_MODEL",
-                                "value": "shell"
-                        }
-                ],
-                "externalConsole": false,
-                "linux": {
-                        "MIMode": "gdb",
-                        "setupCommands": [
-                                {
-                                        "description": "Enable pretty-printing for gdb",
-                                        "text": "-enable-pretty-printing",
-                                        "ignoreFailures": true
-                                },
-                                {
-                                        "description": "PX4 ignore wq signals",
-                                        "text": "handle SIGCONT nostop noprint nopass",
-                                        "ignoreFailures": true
-                                }
-                        ]
-                },
-                "osx": {
-                        "MIMode": "lldb",
-                        "setupCommands": [
-                                {
-                                        "text": "pro hand -p true -s false -n false SIGCONT",
-                                }
-                        ]
-                }
-        },
-        "C_Cpp.clang_format_fallbackStyle": "none",
-        "C_Cpp.configurationWarnings": "Disabled",
-        "C_Cpp.default.cppStandard": "c++11",
-        "C_Cpp.default.cStandard": "c99",
-        "C_Cpp.default.intelliSenseMode": "gcc-x64",
-        "C_Cpp.errorSquiggles": "Disabled",
-        "C_Cpp.formatting": "Disabled",
-        "C_Cpp.intelliSenseEngine": "Default",
-        "C_Cpp.intelliSenseEngineFallback": "Disabled",
-        "debug.toolBarLocation": "docked",
-        "editor.insertSpaces": false,
-        "editor.minimap.maxColumn": 120,
-        "editor.minimap.renderCharacters": false,
-        "editor.minimap.showSlider": "always",
-        "editor.smoothScrolling": true,
-        "editor.suggest.localityBonus": true,
-        "editor.tabSize": 8,
-        "editor.wordWrapColumn": 120,
-        "explorer.openEditors.visible": 0,
-        "files.insertFinalNewline": true,
-        "files.trimTrailingWhitespace": true,
-        "git.detectSubmodulesLimit": 20,
-        "files.associations": {
-                "*.jinja": "jinja"
-        },
-        "search.exclude": {
-                "build/**": true
-        },
-        "search.showLineNumbers": true,
-        "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
-        "workbench.editor.enablePreview": false,
-        "workbench.editor.enablePreviewFromQuickOpen": false,
-        "workbench.editor.highlightModifiedTabs": true,
-        "workbench.settings.enableNaturalLanguageSearch": false,
-        "workbench.statusBar.feedback.visible": false
-}

.vscode/tasks.json

@@ -1,97 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "jmavsim",
-            "type": "shell",
-            "command": "Tools/jmavsim_run.sh",
-            "isBackground": true,
-            "args": [
-                "-r",
-                "500"
-            ],
-            "options": {
-                "cwd": "${workspaceRoot}"
-            },
-            "presentation": {
-                "reveal": "always",
-                "panel": "dedicated"
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
-        {
-            "label": "jmavsim kill",
-            "type": "shell",
-            "command": "kill $(ps aux | grep jmavsim | grep -v 'grep' | awk '{print $2}')",
-            "problemMatcher": []
-        },
-        {
-            "label": "gazebo build",
-            "type": "shell",
-            "command": "make px4_sitl_default sitl_gazebo",
-            "options": {
-                "cwd": "${workspaceRoot}"
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "gazebo iris",
-            "type": "shell",
-            "dependsOn": "gazebo build",
-            "options": {
-                "cwd": "${workspaceRoot}",
-                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceRoot}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceRoot}/Tools/sitl_gazebo/models"
-                }
-            },
-            "command": "gzserver --verbose ${workspaceRoot}/Tools/sitl_gazebo/worlds/iris.world",
-            "isBackground": true,
-            "presentation": {
-                "reveal": "always",
-                "panel": "dedicated"
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
-        {
-            "label": "gazebo kill",
-            "type": "shell",
-            "command": "killall gzserver",
-            "problemMatcher": []
-        },
-    ]
-}

.ycm_extra_conf.py

@@ -61,7 +61,8 @@ 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/px4_io-v2_default.build/nuttx-export/include/',
+'-I', 'Build/px4io-v1_default.build/nuttx-export/include/',
+'-I', 'Build/px4io-v2_default.build/nuttx-export/include/',
 '-I', './NuttX/nuttx/arch/arm/include',
 '-include', './src/include/visibility.h',
 '-I', './src',

CMakeLists.txt

@@ -1,6 +1,6 @@
 ############################################################################
 #
-# Copyright (c) 2017 - 2019 PX4 Development Team. All rights reserved.
+# Copyright (c) 2015 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -40,7 +40,7 @@
 # * Common functions should be included in px_base.cmake.
 #
 # * OS/ board specific fucntions should be include in
-#	px_impl_${PX4_PLATFORM}.cmake or px4_impl_${PX4_PLATFORM}_${PX4_BOARD}.cmake.
+#	px_impl_${OS}.cmake or px4_impl_${OS}_${BOARD}.cmake.
 #
 # Formatting
 # ---------------------------------------------------------------------------
@@ -55,6 +55,24 @@
 #
 # * For else, endif, endfunction, etc, never put the name of the statement
 #
+#	Instead of the very confusing:
+#		if (${var} STREQUAL "1") <-- condition now becomes if name
+#			# do somthing
+#		elseif (${var} STREQUAL "2") <-- another condition
+#			# do somthing
+#		else (${var} STREQUAL "1") <-- tag is referring to name of if
+#			# do somthing
+#		endif (${var} STREQUAL "1") <-- tag is referring to name of if
+#
+#	Do this:
+#		if (${var} STREQUAL "1") <-- condition now becomes if name
+#			# do somthing
+#		elseif (${var} STREQUAL "2") <-- another condition
+#			# do somthing
+#		else () <-- leave blank
+#			# do somthing
+#		endif () <-- leave blank
+#
 # Functions/Macros
 # ---------------------------------------------------------------------------
 #
@@ -69,7 +87,7 @@
 #
 # * Avoid use of global variables in functions. Functions in a nested
 #	scope may use global variables, but this makes it difficult to
-#	reuse functions.
+#	resuse functions.
 #
 # Included CMake Files
 # ---------------------------------------------------------------------------
@@ -83,7 +101,7 @@
 #
 # * Setting a global variable in a CMakeLists.txt file is ok, because
 #	each CMakeLists.txt file has scope in the current directory and all
-#	subdirectories, so it is not truly global.
+#	subdirecties, so it is not truly global.
 #
 # * All toolchain files should be included in the cmake
 #	directory and named Toolchain-"name".cmake.
@@ -92,300 +110,218 @@
 # ---------------------------------------------------------------------------
 #
 # * If referencing a string variable, don't put it in quotes.
-#	Don't do "${PX4_PLATFORM}" STREQUAL "posix",
-#	instead type ${PX4_PLATFORM} STREQUAL "posix". This will throw an
-#	error when ${PX4_PLATFORM} is not defined instead of silently
+#	Don't do "${OS}" STREQUAL "posix",
+#	instead type ${OS} STREQUAL "posix". This will throw an
+#	error when ${OS} is not defined instead of silently
 #	evaluating to false.
 #
 #=============================================================================
 
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+# Warning: Changing this modifies CMake's internal workings
+# and leads to wrong toolchain detection
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
-set(PX4_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-set(PX4_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}")
-
-list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake)
+# Use clang
+#SET (CMAKE_C_COMPILER /usr/bin/clang-3.6)
+#SET (CMAKE_CXX_COMPILER /usr/bin/clang++-3.6)
 
 #=============================================================================
-# git
+# parameters
 #
-include(px4_git)
 
-execute_process(
-	COMMAND git describe --always --tags
-	OUTPUT_VARIABLE PX4_GIT_TAG
-	OUTPUT_STRIP_TRAILING_WHITESPACE
-	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
-	)
-
-define_property(GLOBAL PROPERTY PX4_MODULE_LIBRARIES
-                 BRIEF_DOCS "PX4 module libs"
-                 FULL_DOCS "List of all PX4 module libraries"
-                 )
-
-define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
-                 BRIEF_DOCS "PX4 module paths"
-                 FULL_DOCS "List of paths to all PX4 modules"
-                 )
+set(CMAKE_BUILD_TYPE "" CACHE STRING "build type")
+set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
+	STRINGS ";Debug;Release;RelWithDebInfo;MinSizeRel")
+set(CONFIG "posix_sitl_default" CACHE STRING "desired configuration")
+file(GLOB_RECURSE configs RELATIVE cmake/configs "cmake/configs/*.cmake")
+set_property(CACHE CONFIG PROPERTY STRINGS ${configs})
+set(THREADS "4" CACHE STRING
+	"number of threads to use for external build processes")
+set(DEBUG_PORT "/dev/ttyACM0" CACHE STRING "debugging port")
 
 #=============================================================================
 # configuration
 #
+# must come before project to set toolchain
 
-set(CONFIG "px4_sitl_default" CACHE STRING "desired configuration")
+string(REPLACE "_" ";" config_args ${CONFIG})
+list(GET config_args 0 OS)
+list(GET config_args 1 BOARD)
+list(GET config_args 2 LABEL)
+set(target_name "${OS}-${BOARD}-${LABEL}")
 
-include(px4_add_module)
-set(config_module_list)
-set(config_df_driver_list)
+message(STATUS "${target_name}")
 
-# find PX4 config
-#  look for in tree board config that matches CONFIG input
-if(NOT PX4_CONFIG_FILE)
+# Define GNU standard installation directories
+include(GNUInstallDirs)
 
-	file(GLOB_RECURSE board_configs
-		RELATIVE "${PX4_SOURCE_DIR}/boards"
-		"boards/*.cmake"
-		)
-
-	set(PX4_CONFIGS ${board_configs} CACHE STRING "PX4 board configs" FORCE)
-
-	foreach(filename ${board_configs})
-		# parse input CONFIG into components to match with existing in tree configs
-		#  the platform prefix (eg nuttx_) is historical, and removed if present
-		string(REPLACE ".cmake" "" filename_stripped ${filename})
-		string(REPLACE "/" ";" config ${filename_stripped})
-		list(LENGTH config config_len)
-
-		if(${config_len} EQUAL 3)
-
-
-			list(GET config 0 vendor)
-			list(GET config 1 model)
-			list(GET config 2 label)
-
-			set(board "${vendor}${model}")
-
-			# <VENDOR>_<MODEL>_<LABEL> (eg px4_fmu-v2_default)
-			# <VENDOR>_<MODEL>_default (eg px4_fmu-v2) # allow skipping label if "default"
-			if ((${CONFIG} MATCHES "${vendor}_${model}_${label}") OR # match full vendor, model, label
-			    ((${label} STREQUAL "default") AND (${CONFIG} STREQUAL "${vendor}_${model}")) # default label can be omitted
-			)
-				set(PX4_CONFIG_FILE "${PX4_SOURCE_DIR}/boards/${filename}" CACHE FILEPATH "path to PX4 CONFIG file" FORCE)
-				break()
-			endif()
-
-			# <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
-			)
-				set(PX4_CONFIG_FILE "${PX4_SOURCE_DIR}/boards/${filename}" CACHE FILEPATH "path to PX4 CONFIG file" FORCE)
-				break()
-			endif()
-
-
-			# LEGACY form
-			# <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}"))
-				set(PX4_CONFIG_FILE "${PX4_SOURCE_DIR}/boards/${filename}" CACHE FILEPATH "path to PX4 CONFIG file" FORCE)
-				break()
-			endif()
-
-
-			# LEGACY form special case to ease board layout transition (2018-11-18)
-			#  match board with model and label only: eg sitl_default -> px4_sitl_default
-			if ((${config_no_os} MATCHES "${model}_${label}"))
-				set(PX4_CONFIG_FILE "${PX4_SOURCE_DIR}/boards/${filename}" CACHE FILEPATH "path to PX4 CONFIG file" FORCE)
-				break()
-			endif()
-
-		endif()
-
-	endforeach()
-endif()
-
-if(NOT PX4_CONFIG_FILE)
-	message(FATAL_ERROR "PX4 config file not set, try one of ${PX4_CONFIGS}")
-endif()
-
-message(STATUS "PX4 config file: ${PX4_CONFIG_FILE}")
-include(px4_add_board)
-include(${PX4_CONFIG_FILE})
-message(STATUS "PX4 config: ${PX4_CONFIG}")
-message(STATUS "PX4 platform: ${PX4_PLATFORM}")
-
-if (ENABLE_LOCKSTEP_SCHEDULER)
-	add_definitions(-DENABLE_LOCKSTEP_SCHEDULER)
-	message(STATUS "PX4 lockstep: enabled")
-else()
-	message(STATUS "PX4 lockstep: disabled")
-endif()
-
-# external modules
-set(EXTERNAL_MODULES_LOCATION "" CACHE STRING "External modules source location")
-
-if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
-	get_filename_component(EXTERNAL_MODULES_LOCATION "${EXTERNAL_MODULES_LOCATION}" ABSOLUTE)
-endif()
-
-set_property(GLOBAL PROPERTY PX4_MODULE_CONFIG_FILES)
-
-include(platforms/${PX4_PLATFORM}/cmake/px4_impl_os.cmake)
-list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake)
-
-if(EXISTS "${PX4_SOURCE_DIR}/platforms/${PX4_PLATFORM}/cmake/init.cmake")
-	include(init)
-endif()
-
-# CMake build type (Debug Release RelWithDebInfo MinSizeRel Coverage)
-if (NOT CMAKE_BUILD_TYPE)
-	if (${PX4_PLATFORM} STREQUAL "nuttx")
-		set(PX4_BUILD_TYPE "MinSizeRel")
-	else()
-		set(PX4_BUILD_TYPE "RelWithDebInfo")
+# Setup install paths
+if(NOT CMAKE_INSTALL_PREFIX)
+	if (${OS} STREQUAL "posix")
+		set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install path prefix" FORCE)
 	endif()
-
-	set(CMAKE_BUILD_TYPE ${PX4_BUILD_TYPE} CACHE STRING "Build type" FORCE)
 endif()
+message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
 
-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug;Release;RelWithDebInfo;MinSizeRel;Coverage;AddressSanitizer;UndefinedBehaviorSanitizer")
+# switch to ros CMake file if building ros
+if (${OS} STREQUAL "ros")
+	include("cmake/ros-CMakeLists.txt")
+else()  # otherwise use the rest of this file
 
-#=============================================================================
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set(config_module "configs/${CONFIG}")
+include(${config_module})
 
-message(STATUS "PX4 version: ${PX4_GIT_TAG}")
-message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
+# cmake modules
+include(ExternalProject)
+
+# require px4 module interface
+set(px4_required_interface
+	px4_os_prebuild_targets
+	px4_os_add_flags
+	)
+foreach(cmd ${px4_required_interface})
+	if(NOT COMMAND ${cmd})
+		message(FATAL_ERROR "${config_module} must implement ${cmd}")
+	endif()
+endforeach()
+set(px4_required_config
+	config_module_list
+	)
+foreach(conf ${px4_required_config})
+	if(NOT DEFINED ${conf})
+		message(FATAL_ERROR "cmake/${config_module} must define ${conf}")
+	endif()
+endforeach()
+
+# List the DriverFramework drivers
+if(DEFINED config_df_driver_list)
+	message("DF Drivers: ${config_df_driver_list}")
+endif()
 
 #=============================================================================
 # project definition
 #
 project(px4 CXX C ASM)
+if (NOT ${CMAKE_VERSION} VERSION_LESS 3.0.0)
+	cmake_policy(SET CMP0045 NEW) # error on non-existent target in get prop
+	cmake_policy(SET CMP0046 NEW) # no non-existent targets as dependencies
+	cmake_policy(SET CMP0025 OLD) # still report AppleClang as Clang
+endif()
+if (NOT ${CMAKE_VERSION} VERSION_LESS 3.1.0)
+	cmake_policy(SET CMP0054 NEW) # don't dereference quoted variables
+endif()
 
+set(version_major 1)
+set(version_minor 4)
+set(version_patch 1)
+set(version "${version_major}.${version_minor}.${version_patch}")
 set(package-contact "px4users@googlegroups.com")
 
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-
-# For the catkin build process, unset build of dynamically-linked binaries
-# and do not change CMAKE_RUNTIME_OUTPUT_DIRECTORY
-if (NOT CATKIN_DEVEL_PREFIX)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PX4_BINARY_DIR})
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${PX4_BINARY_DIR})
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${PX4_BINARY_DIR})
-else()
-	SET(BUILD_SHARED_LIBS OFF)
-endif()
-
 #=============================================================================
-
-# Setup install paths
-if (${PX4_PLATFORM} STREQUAL "posix")
-
-	# This makes it possible to dynamically load code which depends on symbols
-	# inside the px4 executable.
-	set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-	set(CMAKE_ENABLE_EXPORTS ON)
-
-	include(coverage)
-	include(sanitizers)
-
-	# Define GNU standard installation directories
-	include(GNUInstallDirs)
-
-	if (NOT CMAKE_INSTALL_PREFIX)
-		set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install path prefix" FORCE)
-	endif()
-endif()
-
-#=============================================================================
-# ccache
+# programs
 #
-option(CCACHE "Use ccache if available" ON)
-find_program(CCACHE_PROGRAM ccache)
-if (CCACHE AND CCACHE_PROGRAM AND NOT DEFINED ENV{CCACHE_DISABLE})
-
-	get_filename_component(ccache_real_path ${CCACHE_PROGRAM} REALPATH)
-	get_filename_component(cxx_real_path ${CMAKE_CXX_COMPILER} REALPATH)
-	get_filename_component(cxx_abs_path ${CMAKE_CXX_COMPILER} ABSOLUTE)
-
-	if ("${ccache_real_path}" STREQUAL "${cxx_real_path}")
-		message(STATUS "ccache enabled via symlink (${cxx_abs_path} -> ${cxx_real_path})")
-	else()
-		message(STATUS "ccache enabled (export CCACHE_DISABLE=1 to disable)")
-		set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
-	endif()
-
-endif()
-
-#=============================================================================
-# find programs and packages
-#
-
-# see if catkin was invoked to build this
-if (CATKIN_DEVEL_PREFIX)
-	message(STATUS "catkin ENABLED")
-	find_package(catkin REQUIRED)
-	if (catkin_FOUND)
-		catkin_package()
-	else()
-		message(FATAL_ERROR "catkin not found")
-	endif()
-endif()
-
 find_package(PythonInterp REQUIRED)
 
-option(PYTHON_COVERAGE "Python code coverage" OFF)
-if(PYTHON_COVERAGE)
-	message(STATUS "python coverage enabled")
-	set(PYTHON_EXECUTABLE coverage run -p)
-else()
-	# run normally (broken under coveragepy)
-	px4_find_python_module(jinja2 REQUIRED)
-endif()
+#=============================================================================
+# cmake modules
+#
+enable_testing()
+
+#=============================================================================
+# check required toolchain variables
+#
+set(required_variables
+	CMAKE_C_COMPILER_ID
+	)
+foreach(var ${required_variables})
+	if (NOT ${var})
+		message(FATAL_ERROR "Toolchain/config must define ${var}")
+	endif()
+endforeach()
+
+#=============================================================================
+# git
+#
+px4_add_git_submodule(TARGET git_genmsg PATH "Tools/genmsg")
+px4_add_git_submodule(TARGET git_gencpp PATH "Tools/gencpp")
+px4_add_git_submodule(TARGET git_mavlink PATH "mavlink/include/mavlink/v1.0")
+px4_add_git_submodule(TARGET git_gtest PATH "unittests/gtest")
+px4_add_git_submodule(TARGET git_uavcan PATH "src/modules/uavcan/libuavcan")
+px4_add_git_submodule(TARGET git_nuttx PATH "NuttX")
+px4_add_git_submodule(TARGET git_driverframework PATH "src/lib/DriverFramework")
+px4_add_git_submodule(TARGET git_ecl PATH "src/lib/ecl")
+px4_add_git_submodule(TARGET git_jmavsim PATH "Tools/jMAVSim")
+px4_add_git_submodule(TARGET git_gazebo PATH "Tools/sitl_gazebo")
+px4_add_git_submodule(TARGET git_matrix PATH "src/lib/matrix")
+px4_add_git_submodule(TARGET git_cmake_hexagon PATH "cmake/cmake_hexagon")
+
+add_custom_target(submodule_clean
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	COMMAND git submodule deinit -f .
+	COMMAND rm -rf .git/modules/*
+	)
+
+#=============================================================================
+# misc targets
+#
+add_custom_target(check_format
+	COMMAND Tools/check_code_style.sh
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+	)
+
+add_custom_target(config
+	COMMAND cmake-gui .
+	WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+	)
+
+#=============================================================================
+# external libraries
+#
+px4_os_prebuild_targets(OUT prebuild_targets
+	BOARD ${BOARD}
+	THREADS ${THREADS})
 
 #=============================================================================
 # build flags
 #
-include(px4_add_common_flags)
-px4_add_common_flags()
-px4_os_add_flags()
+px4_os_add_flags(
+	BOARD ${BOARD}
+	C_FLAGS c_flags
+	CXX_FLAGS cxx_flags
+	EXE_LINKER_FLAGS exe_linker_flags
+	INCLUDE_DIRS include_dirs
+	LINK_DIRS link_dirs
+	DEFINITIONS definitions)
+
+px4_join(OUT CMAKE_EXE_LINKER_FLAGS LIST "${exe_linker_flags}" GLUE " ")
+px4_join(OUT CMAKE_C_FLAGS LIST "${c_flags}" GLUE " ")
+px4_join(OUT CMAKE_CXX_FLAGS LIST "${cxx_flags}" GLUE " ")
+
+include_directories(${include_dirs})
+#message("INCLUDE_DIRS=${include_dirs}")
+link_directories(${link_dirs})
+add_definitions(${definitions})
 
 #=============================================================================
-# message, and airframe generation
+# source code generation
 #
-include(px4_metadata)
-
-add_subdirectory(msg EXCLUDE_FROM_ALL)
-
-px4_generate_airframes_xml(BOARD ${PX4_BOARD})
-
-#=============================================================================
-# DriverFramework
-#
-px4_add_git_submodule(TARGET git_driverframework PATH "src/lib/DriverFramework")
-set(OS ${PX4_PLATFORM})
-add_subdirectory(src/lib/DriverFramework/framework)
-
-# List the DriverFramework drivers
-if (DEFINED config_df_driver_list)
-	message("DF Drivers: ${config_df_driver_list}")
-endif()
-
-set(df_driver_libs)
-foreach(driver ${config_df_driver_list})
-	add_subdirectory(src/lib/DriverFramework/drivers/${driver})
-	list(APPEND df_driver_libs df_${driver})
-	message("Adding DF driver: ${driver}")
-endforeach()
+add_subdirectory(msg)
+px4_generate_messages(TARGET msg_gen
+	MSG_FILES ${msg_files}
+	OS ${OS}
+	DEPENDS git_genmsg git_gencpp prebuild_targets
+	)
+px4_generate_parameters_xml(OUT parameters.xml BOARD ${BOARD})
+px4_generate_airframes_xml(OUT airframes.xml BOARD ${BOARD})
+add_custom_target(xml_gen
+	DEPENDS parameters.xml airframes.xml)
 
 #=============================================================================
 # external projects
 #
-set(ep_base ${PX4_BINARY_DIR}/external)
+
+set(ep_base ${CMAKE_BINARY_DIR}/external)
 set_property(DIRECTORY PROPERTY EP_BASE ${ep_base})
 
 # add external project install folders to build
@@ -396,205 +332,79 @@ execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/lib)
 execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/include)
 
 #=============================================================================
-# external modules
+# DriverFramework Drivers
 #
-set(external_module_paths)
-if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
-	message(STATUS "External modules: ${EXTERNAL_MODULES_LOCATION}")
-	add_subdirectory("${EXTERNAL_MODULES_LOCATION}/src" external_modules)
-
-	foreach(external_module ${config_module_list_external})
-		add_subdirectory(${EXTERNAL_MODULES_LOCATION}/src/${external_module} external_modules/${external_module})
-		list(APPEND external_module_paths ${EXTERNAL_MODULES_LOCATION}/src/${external_module})
-	endforeach()
-endif()
-
-#=============================================================================
-# Testing - Automatic unit and integration testing with CTest
-#
-
-# optionally enable cmake testing (supported only on posix)
-option(CMAKE_TESTING "Configure test targets" OFF)
-if (${PX4_CONFIG} STREQUAL "px4_sitl_test")
-	set(CMAKE_TESTING ON)
-endif()
-if(CMAKE_TESTING)
-	include(CTest) # sets BUILD_TESTING variable
-endif()
-
-# enable test filtering to run only specific tests with the ctest -R regex functionality
-set(TESTFILTER "" CACHE STRING "Filter string for ctest to selectively only run specific tests (ctest -R)")
-
-# if testing is enabled download and configure gtest
-list(APPEND CMAKE_MODULE_PATH ${PX4_SOURCE_DIR}/cmake/gtest/)
-include(px4_add_gtest)
-if(BUILD_TESTING)
-	include(gtest)
-endif()
-
-add_custom_target(test_results
-		COMMAND GTEST_COLOR=1 ${CMAKE_CTEST_COMMAND} --output-on-failure -T Test -R ${TESTFILTER} USES_TERMINAL
-		DEPENDS
-			px4
-			examples__dyn_hello
-			test_mixer_multirotor
-		USES_TERMINAL
-		COMMENT "Running tests"
-		WORKING_DIRECTORY ${PX4_BINARY_DIR})
-set_target_properties(test_results PROPERTIES EXCLUDE_FROM_ALL TRUE)
+set(df_driver_libs)
+foreach(driver ${config_df_driver_list})
+	add_subdirectory(src/lib/DriverFramework/drivers/${driver})
+	list(APPEND df_driver_libs df_${driver})
+	message("Adding DF driver: ${driver}")
+endforeach()
 
 #=============================================================================
 # subdirectories
 #
-add_library(parameters_interface INTERFACE)
-
-include(px4_add_library)
-add_subdirectory(src/lib EXCLUDE_FROM_ALL)
-
-add_subdirectory(src/platforms EXCLUDE_FROM_ALL)
-add_subdirectory(src/modules/uORB EXCLUDE_FROM_ALL) # TODO: platform layer
-add_subdirectory(src/drivers/boards EXCLUDE_FROM_ALL)
-
-if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
-	add_subdirectory(${PX4_BOARD_DIR})
-endif()
-
+set(module_libraries)
 foreach(module ${config_module_list})
-	add_subdirectory(src/${module})
-endforeach()
-
-# must be the last module before firmware
-add_subdirectory(src/lib/parameters EXCLUDE_FROM_ALL)
-target_link_libraries(parameters_interface INTERFACE parameters)
-
-# firmware added last to generate the builtin for included modules
-add_subdirectory(platforms/${PX4_PLATFORM})
-
-#=============================================================================
-# uORB graph generation: add a custom target 'uorb_graph'
-#
-set(uorb_graph_config ${PX4_BOARD})
-
-set(graph_module_list "")
-foreach(module ${config_module_list})
-	set(graph_module_list "${graph_module_list}" "--src-path" "src/${module}")
-endforeach()
-
-add_custom_command(OUTPUT ${uorb_graph_config}
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/uorb_graph/create.py
-		${module_list}
-		--exclude-path src/examples
-		--file ${PX4_SOURCE_DIR}/Tools/uorb_graph/graph_${uorb_graph_config}
-	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
-	COMMENT "Generating uORB graph"
-)
-add_custom_target(uorb_graph DEPENDS ${uorb_graph_config})
-
-#=============================================================================
-# Doxygen
-#
-option(BUILD_DOXYGEN "Build doxygen documentation" OFF)
-
-if (BUILD_DOXYGEN)
-	find_package(Doxygen)
-	if (DOXYGEN_FOUND)
-	    # set input and output files
-	    set(DOXYGEN_IN ${CMAKE_SOURCE_DIR}/Documentation/Doxyfile.in)
-	    set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
-
-	    # request to configure the file
-	    configure_file(${DOXYGEN_IN} ${DOXYGEN_OUT} @ONLY)
-
-	    # note the option ALL which allows to build the docs together with the application
-	    add_custom_target(doxygen ALL
-	        COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_OUT}
-	        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-			COMMENT "Generating documentation with Doxygen"
-			DEPENDS uorb_msgs parameters
-			VERBATIM
-			USES_TERMINAL
-			)
-
+	string(REGEX MATCH "^[./]" external_module ${module})
+	if(external_module)
+		STRING(REGEX REPLACE "//" "/" EXT_MODULE ${module})
+		STRING(REGEX REPLACE "/" "__" EXT_MODULE_PREFIX ${EXT_MODULE})
+		add_subdirectory(${module} ${CMAKE_BINARY_DIR}/${EXT_MODULE_PREFIX})
 	else()
-		message("Doxygen needs to be installed to generate documentation")
+		add_subdirectory(src/${module})
 	endif()
+	px4_mangle_name(${module} mangled_name)
+	list(APPEND module_libraries ${mangled_name})
+	#message(STATUS "adding module: ${module}")
+endforeach()
+
+# Keep track of external shared libs required for modules
+set(module_external_libraries "${module_external_libraries}" CACHE INTERNAL "module_external_libraries")
+
+add_subdirectory(src/firmware/${OS})
+
+#add_dependencies(df_driver_framework nuttx_export_${CONFIG}.stamp)
+if (NOT "${OS}" STREQUAL "nuttx")
+endif()
+
+if (config_io_board)
+	add_subdirectory(src/modules/px4iofirmware)
 endif()
 
 #=============================================================================
-# Metadata - helpers for generating documentation
+# generate git version
 #
-
-add_custom_target(metadata_airframes
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${PX4_BINARY_DIR}/docs
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
-		-v -a ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/init.d
-		--markdown ${PX4_BINARY_DIR}/docs/airframes.md
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
-		-v -a ${PX4_SOURCE_DIR}/ROMFS/px4fmu_common/init.d
-		--xml ${PX4_BINARY_DIR}/docs/airframes.xml
-	COMMENT "Generating full airframe metadata (markdown and xml)"
-	USES_TERMINAL
-)
-
-file(GLOB_RECURSE yaml_config_files ${PX4_SOURCE_DIR}/src/modules/*.yaml
-	${PX4_SOURCE_DIR}/src/drivers/*.yaml ${PX4_SOURCE_DIR}/src/lib/*.yaml)
-add_custom_target(metadata_parameters
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${PX4_BINARY_DIR}/docs
-	COMMAND ${PYTHON_EXECUTABLE}
-	${PX4_SOURCE_DIR}/Tools/serial/generate_config.py --all-ports --params-file ${PX4_SOURCE_DIR}/src/generated_serial_params.c --config-files ${yaml_config_files}
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/src/lib/parameters/px_process_params.py
-		--src-path `find ${PX4_SOURCE_DIR}/src -maxdepth 4 -type d`
-		--inject-xml ${PX4_SOURCE_DIR}/src/lib/parameters/parameters_injected.xml
-		--markdown ${PX4_BINARY_DIR}/docs/parameters.md
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/src/lib/parameters/px_process_params.py
-		--src-path `find ${PX4_SOURCE_DIR}/src -maxdepth 4 -type d`
-		--inject-xml ${PX4_SOURCE_DIR}/src/lib/parameters/parameters_injected.xml
-		--xml ${PX4_BINARY_DIR}/docs/parameters.xml
-	COMMENT "Generating full parameter metadata (markdown and xml)"
-	USES_TERMINAL
-)
-
-add_custom_target(metadata_module_documentation
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${PX4_BINARY_DIR}/docs
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_module_doc.py -v --src-path ${PX4_SOURCE_DIR}/src
-		--markdown ${PX4_BINARY_DIR}/docs/modules
-	COMMENT "Generating module documentation"
-	USES_TERMINAL
-)
-
-add_custom_target(all_metadata
-	DEPENDS
-		metadata_airframes
-		metadata_parameters
-		metadata_module_documentation
-)
+px4_create_git_hash_header(HEADER ${CMAKE_BINARY_DIR}/build_git_version.h)
 
 #=============================================================================
 # packaging
 #
 # Important to having packaging at end of cmake file.
 #
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-${PX4_CONFIG})
-set(CPACK_PACKAGE_VERSION ${PX4_GIT_TAG})
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-${CONFIG})
+set(CPACK_PACKAGE_VERSION ${version})
 set(CPACK_PACKAGE_CONTACT ${package-contact})
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF) # TODO: review packaging for linux boards
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
 set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "The PX4 Pro autopilot.")
-set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PX4_CONFIG}-${PX4_GIT_TAG}")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${PX4_GIT_TAG}")
+set(short-description "The px4 autopilot.")
+set(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${short-description})
+set(CPACK_GENERATOR "ZIP")
+set(CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CONFIG}-${version}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${version}")
 set(CPACK_SOURCE_GENERATOR "ZIP;TBZ2")
-set(CPACK_PACKAGING_INSTALL_PREFIX "")
-set(CPACK_SET_DESTDIR "OFF")
-
 if ("${CMAKE_SYSTEM}" MATCHES "Linux")
-	set(CPACK_GENERATOR "TBZ2")
-	find_program(DPKG_PROGRAM dpkg)
-	if (EXISTS ${DPKG_PROGRAM})
-		list (APPEND CPACK_GENERATOR "DEB")
-	endif()
-else()
-	set(CPACK_GENERATOR "ZIP")
+  find_program(DPKG_PROGRAM dpkg)
+  if (EXISTS ${DPKG_PROGRAM})
+    list (APPEND CPACK_GENERATOR "DEB")
+  endif()
+endif()
+if (${OS} STREQUAL "posix")
+	set(CPACK_SET_DESTDIR "ON")
 endif()
-
 include(CPack)
+
+endif() # ros alternative endif
+
+# vim: set noet fenc=utf-8 ff=unix ft=cmake :

CODE_OF_CONDUCT.md

@@ -1,46 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at lorenz@px4.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/

CONTRIBUTING.md

@@ -16,7 +16,7 @@ git checkout -b mydescriptivebranchname
 
 ### Edit and build the code
 
-The [developer guide](http://dev.px4.io/) explains how to set up the development environment on Mac OS, Linux or Windows. Please take note of our [coding style](https://dev.px4.io/master/en/contribute/code.html) when editing files.
+The [developer guide](http://dev.px4.io/) explains how to set up the development environment on Mac OS, Linux or Windows. Please take note of our [coding style](http://px4.io/dev/code_style) when editing files.
 
 ### Commit your changes
 
@@ -41,4 +41,4 @@ Since we care about safety, we will regularly ask you for test results. Best is
 
 Push changes to your repo and send a [pull request](https://github.com/PX4/Firmware/compare/).
 
-MuncherMake sure to provide some testing feedback and if possible the link to a flight log file. Upload flight log files to [Flight Review](http://logs.px4.io) and link the resulting report.
+Make sure to provide some testing feedback and if possible the link to a flight log file. Upload flight log files to [Log Muncher](http://dash.oznet.ch) and link the resulting report.

CTestConfig.cmake

@@ -1,15 +0,0 @@
-## This file should be placed in the root directory of your project.
-## Then modify the CMakeLists.txt file in the root directory of your
-## project to incorporate the testing dashboard.
-##
-## # The following are required to submit to the CDash dashboard:
-##   ENABLE_TESTING()
-##   INCLUDE(CTest)
-
-set(CTEST_PROJECT_NAME "PX4 Firmware")
-set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
-
-set(CTEST_DROP_METHOD "http")
-set(CTEST_DROP_SITE "my.cdash.org")
-set(CTEST_DROP_LOCATION "/submit.php?project=PX4+Firmware")
-set(CTEST_DROP_SITE_CDASH TRUE)

Debug/Nuttx.py

@@ -81,7 +81,7 @@ class NX_register_set(object):
 			self.regs['LR']         = self.mon_reg_call('lr')
 			self.regs['R15']        = self.mon_reg_call('r15')
 			self.regs['PC']         = self.mon_reg_call('pc')
-			#self.regs['XPSR']       = self.mon_reg_call('xPSR')
+			self.regs['XPSR']       = self.mon_reg_call('xPSR')
 		else:
 			for key in self.v7em_regmap.keys():
 				self.regs[key] = int(xcpt_regs[self.v7em_regmap[key]])
@@ -91,11 +91,11 @@ class NX_register_set(object):
 		register is the register as a string e.g. 'pc'
 		return integer containing the value of the register
 		"""
-		str_to_eval = "info registers "+register
+		str_to_eval = "mon reg "+register
 		resp = gdb.execute(str_to_eval,to_string = True)
-		content = resp.split()[-1]
+		content = resp.split()[-1];
 		try:
-			return int(content)
+			return int(content,16)
 		except:
 			return 0
 

Debug/PX4

@@ -1,6 +1,8 @@
 #
 # Various PX4-specific macros
 #
+source Debug/NuttX
+source Debug/ARMv7M
 
 echo Loading PX4 GDB macros.  Use 'help px4' for more information.\n
 

Debug/dot.gdbinit

@@ -0,0 +1,13 @@
+# copy the file to .gdbinit in your Firmware tree, and adjust the path
+# below to match your system
+# For example:
+# target extended /dev/serial/by-id/usb-Black_Sphere_Technologies_Black_Magic_Probe_DDE5A1C4-if00
+# target extended /dev/ttyACM4
+
+
+monitor swdp_scan
+attach 1
+monitor vector_catch disable hard
+set mem inaccessible-by-default off
+set print pretty
+source Debug/PX4

Debug/olimex-px4fmu-debug.cfg

@@ -0,0 +1,22 @@
+# program a bootable device load on a mavstation
+# To run type openocd -f mavprogram.cfg
+
+source [find interface/olimex-arm-usb-ocd-h.cfg]
+source [find px4fmu-v1-board.cfg]
+
+init
+halt
+
+# Find the flash inside this CPU
+flash probe 0
+
+# erase it (128 pages) then program and exit
+
+#flash erase_sector 0 0 127
+# stm32f1x mass_erase 0 
+
+# It seems that Pat's image has a start address offset of 0x1000 but the vectors need to be at zero, so fixbin.sh moves things around
+#flash write_bank 0 fixed.bin 0
+#flash write_image firmware.elf
+#shutdown
+

Debug/openocd.gdbinit

@@ -0,0 +1,21 @@
+target remote :3333
+
+# Don't let GDB get confused while stepping
+define hook-step
+  mon cortex_m maskisr on
+end
+define hookpost-step
+  mon cortex_m maskisr off
+end
+
+mon init
+mon stm32_init
+# mon reset halt
+mon poll
+mon cortex_m maskisr auto
+set mem inaccessible-by-default off
+set print pretty
+source Debug/PX4
+
+echo PX4 resumed, press ctrl-c to interrupt\n
+continue

Debug/poor-mans-profiler.sh

@@ -1,24 +1,16 @@
 #!/bin/bash
 #
-# Author: Pavel Kirienko <pavel.kirienko@zubax.com>
-#
 # Poor man's sampling profiler for NuttX.
 #
 # Usage: Install flamegraph.pl in your PATH, configure your .gdbinit, run the script with proper arguments and go
 #        have a coffee. When you're back, you'll see the flamegraph. Note that frequent calls to GDB significantly
 #        interfere with normal operation of the target, which means that you can't profile real-time tasks with it.
-#        For best results, ensure that the PC is not overloaded, the USB host controller to which the debugger is
-#        connected is not congested. You should also allow the current user to set negative nice values.
 #
-# The FlameGraph script can be downloaded from https://github.com/brendangregg/FlameGraph. Thanks Mr. Gregg.
-#
-# Requirements: ARM GDB with Python support. You can get one by downloading the sources from
-#               https://launchpad.net/gcc-arm-embedded and building them with correct flags.
-#               Note that Python support is not required if no per-task sampling is needed.
+# Requirements: ARM GDB with Python support
 #
 
 set -e
-root=$(dirname $0)
+root=$(dirname $0)/..
 
 function die()
 {
@@ -41,7 +33,7 @@ which flamegraph.pl > /dev/null || die "Install flamegraph.pl first"
 nsamples=0
 sleeptime=0.1    # Doctors recommend 7-8 hours a day
 taskname=
-elf=
+elf=$root/Build/px4fmu-v2_default.build/firmware.elf
 append=0
 fgfontsize=10
 fgwidth=1900
@@ -77,8 +69,6 @@ do
     shift
 done
 
-[[ -z "$elf" ]] && die "Please specify the ELF file location, e.g.: build/px4_fmu-v4_default/px4_fmu-v4_default.elf"
-
 #
 # Temporary files
 #
@@ -102,22 +92,13 @@ then
     do
         if [[ "$taskname" = "" ]]
         then
-            arm-none-eabi-gdb $elf --nx --quiet --batch \
-                                           -ex "set print asm-demangle on" \
-                                           -ex "target extended /dev/ttyACM0" \
-                                           -ex "monitor swdp_scan" \
-                                           -ex "attach 1" \
-                                           -ex bt \
+            arm-none-eabi-gdb $elf --batch -ex "set print asm-demangle on" -ex bt \
                 2> $gdberrfile \
                 | sed -n 's/\(#.*\)/\1/p' \
                 >> $stacksfile
         else
-            arm-none-eabi-gdb $elf --nx --quiet --batch \
-                                           -ex "set print asm-demangle on" \
-                                           -ex "target extended /dev/ttyACM0" \
-                                           -ex "monitor swdp_scan" \
-                                           -ex "attach 1" \
-                                           -ex "source $root/Nuttx.py" \
+            arm-none-eabi-gdb $elf --batch -ex "set print asm-demangle on" \
+                                           -ex "source $root/Debug/Nuttx.py" \
                                            -ex "show mybt $taskname" \
                 2> $gdberrfile \
                 | sed -n 's/0\.0:\(#.*\)/\1/p' \
@@ -256,8 +237,8 @@ for s, f in sorted(stacks.items(), key=lambda (s, f): s):
 
 print('Total stack frames:', num_stack_frames, file=sys.stderr)
 print('Top consumers (distribution of the stack tops):', file=sys.stderr)
-for name,num in sorted(stack_tops.items(), key=lambda (name, num): num, reverse=True)[:300]:
-    print('% 7.3f%%   ' % (100 * num / num_stack_frames), name, file=sys.stderr)
+for name,num in sorted(stack_tops.items(), key=lambda (name, num): num, reverse=True)[:10]:
+    print('% 5.1f%%   ' % (100 * num / num_stack_frames), name, file=sys.stderr)
 EOF
 
 cat $stacksfile | python /tmp/pmpn-folder.py > $foldfile

Debug/px4fmu-v1-board.cfg

@@ -0,0 +1,38 @@
+# The latest defaults in OpenOCD 0.7.0 are actually prettymuch correct for the px4fmu
+
+# increase working area to 32KB for faster flash programming
+set WORKAREASIZE 0x8000
+
+source [find target/stm32f4x.cfg]
+
+# needed for px4
+reset_config trst_only
+
+proc stm32_reset {} {
+  reset halt
+# FIXME - needed to init periphs on reset
+# 0x40023800 RCC base
+# 0x24 RCC_APB2 0x75933
+# RCC_APB2 0
+}
+
+# perform init that is required on each connection to the target
+proc stm32_init {} {
+
+  # force jtag to not shutdown during sleep
+  #uint32_t cr = getreg32(STM32_DBGMCU_CR);
+  #cr |= DBGMCU_CR_STANDBY | DBGMCU_CR_STOP | DBGMCU_CR_SLEEP;
+  #putreg32(cr, STM32_DBGMCU_CR);
+  mww 0xe0042004 00000007
+}
+
+# if srst is not fitted use SYSRESETREQ to
+# perform a soft reset
+cortex_m reset_config sysresetreq
+
+# Let GDB directly program elf binaries
+gdb_memory_map enable
+
+# doesn't work yet
+gdb_flash_program disable
+

Debug/runopenocd.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+openocd -f interface/olimex-arm-usb-ocd-h.cfg -f $DIR/px4fmu-v1-board.cfg

Documentation/doxygen.README

@@ -0,0 +1,37 @@
+Linux/Mac OS X
+==============
+To install doxygen: 
+$sudo apt-get install doxygen
+
+If the above does not work go to:
+http://www.stack.nl/~dimitri/doxygen/download.html for the correct download.
+
+Then go to the following website for inforamtion on the install:
+http://www.stack.nl/~dimitri/doxygen/install.html
+
+Then to generate the html, run the following code while you are in this directory:
+$doxygen Doxyfile
+
+The html file index.html should be in doc/html unless you changed the output directory. 
+
+The other option for generating the documentation is to use the wizard:
+$doxywizard &
+
+doxywizard information:
+http://www.stack.nl/~dimitri/doxygen/doxywizard_usage.html
+
+Or go to the Doxygen Manual for information at the website noted below.
+
+Windows
+=======
+Go to the following website for the correct download and follow the wizard to install:
+http://www.stack.nl/~dimitri/doxygen/download.html
+
+Run the wizard to generate the documentation. 
+Go to the website below or the Doxygen Manual for information on running doxywizard.
+http://www.stack.nl/~dimitri/doxygen/doxywizard_usage.html
+
+Doxygen Manual
+==============
+http://www.stack.nl/~dimitri/doxygen/
+

Documentation/doxygen.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf html
+doxygen

Documentation/px4_hil/UserGuide.md

@@ -0,0 +1,98 @@
+[TOC]
+
+# Introduction
+
+The HIL architecture allows you to test the flight stack replacing the real physical vehicle and sensors with a simulator of vehicle dynamics and sensor outputs.  The flight stack "is not aware" that it is not on a real vehicle.  This is a powerful tool for develping and testing code rapidly in a benchtop environment. 
+
+The flight stack can be run anywhere that supports a network connection to the simulator (with sufficient bandwidth and latency to transport the sensor and actuator messages).  This can be on a standard linux workstation, an on-target linux image, or the on-target DSP image.  These modes can be selected based on the goals of the testing.  Workstation is useful for rapid testing in a tool-rich environment.  DSP image testing is the closest to the final implementation, so is useful for testing actual HW operation, other than the physical sensing and actuation.
+
+## Px4 High-level HIL Architecture
+
+A diagram of the setup described is shown here.  Note that UDP port numbers are only displayed on the socket server and are left blank on the socket client. 
+
+(???NOTES:  This diagram needs to be updated to use control inputs over UDP, either from QGC or from other)
+
+![SITL Diagram](./SITL_Diagram_QGC.png "SITL Diagram")  
+
+## Requirements
+The simulator that is currently supported is jMAVSim.  The setup described here requires PX4 and jMAVSim installed and running.  qGroundControl (QGC) is also required because it is the supported method of providing manual control commands.  
+
+## Assumptions
+
+# Compiling Code
+
+## JMAVSim
+
+### Platform Requirements
+Linux with java-1.7.x or greater
+
+### Build Instructions
+In a clean directory
+```
+> git clone https://github.com/PX4/jMAVSim.git
+> cd jMAVSim
+> git submodule init
+> git submodule update
+> ant
+```
+
+## qGroundControl
+
+### Platform Requirements
+Windows 7
+Logitech Gamepad F310 joystick controller
+
+### Download/Install Instructions
+Download QGC from http://qgroundcontrol.org/downloads and install using the windows executable.
+
+
+## PX4
+
+### Platform Requirements
+Linux or Eagle with a working IP interface (?? does this need further instructions?)
+
+### Build Host Requirements
+(???Notes:  Windows?)
+
+### Download & Build Instructions
+
+### Installing binaries on the Qualcomm Target
+
+# Running PX4 in HIL Mode
+
+## Starting PX4 on Qualcomm Eagle
+
+```
+> adb shell
+# bash
+root@linaro-developer:/# cd ???
+root@linaro-developer:/# ./px4
+App name: px4
+Enter a command and its args:
+uorb start
+muorb start
+mavlink start -u 14556
+simulator start -p
+```
+
+## Starting jMAVSim
+In the directory where jMAVSim is installed
+```
+ java -cp lib/*:out/production/jmavsim.jar me.drton.jmavsim.Simulator -udp <IPADDR>:14560 -n 100
+```
+replacing <IPADDR> with the IP address of the machine running PX4 (Eagle).  This can be found by running "ifconfig" on that machine.
+
+## Starting qGroundControl
+Launch the qGroundControl application
+1. Set up the communication to the flight stack.  In the menu File:Settings:CommLinks, select Add.  Enter a Link Name of your choice.  Select Link Type: UDP.  Set the listening port to an unused port (example: 14561).  Select Add.  Enter the IP address and port of the PX4 Mavlink app, which is <IPADDR>:14556 with <IPADDR> being the IP address of the Eagle board. Select OK.
+1. Set up the joystick.  Plug in the joystick to your Windows machine.  In the menu File:Settings:CommLinks, check Enable Controllers.  Select "Gamepad F310".  Select "Manual".  Set the axes/channel mapping to 0:Yaw, 1:Throttle, 2:unset, 3:Pitch, 4:Roll.  Seletct "Inverted" for the throttle axis.  Click "Calibrate range".  Move the right joystick through its full range of motion.  Move the left joystick full left then full right.  Move the left joystick full forward (but not full backward).  Click "end calibration."
+1. Connect to the flight stack.  Click Analyze.  Click the "Connect" button in the upper right, and select the connection that you created in the first step.
+
+You should now be connected to the flight stack.  You can see incoming Mavlink packets using the MAVLink Instpector (from Advanced:Tool Widgets)
+
+
+## Controlling PX4 flight in HIL Mode
+The joystick can now be used to fly the simulated vehicle.  The jMAVSim world visualization gives a FPV view, and QGC can be used to display instruments such as artificial horizon and maps (if GPS simulation is enabled).
+
+
+# Debugging/FAQ

Documentation/versionfilter.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+git log --pretty=format:"Last change: commit %h - %aN, %ar : %s" -1 $1 || echo no git

Firmware.sublime-project

@@ -25,8 +25,7 @@
 			[
 				".settings",
 				"nuttx/arch/arm/src/board",
-				"nuttx/arch/arm/src/chip",
-				"build_*"
+				"nuttx/arch/arm/src/chip"
 			]
 		}
 	],
@@ -40,12 +39,12 @@
 			"options_c":
 			{
 				"use_only_additional_options": true,
-				"additional_options_file": "${project_path}/Tools/astyle/astylerc"
+				"additional_options_file": "${project_path}/Tools/astylerc"
 			},
 			"options_c++":
 			{
 				"use_only_additional_options": true,
-				"additional_options_file": "${project_path}/Tools/astyle/astylerc"
+				"additional_options_file": "${project_path}/Tools/astylerc"
 			}
 		}
 	},
@@ -62,7 +61,7 @@
 			"name": "PX4: make and upload",
 			"working_dir": "${project_path}",
 			"file_regex": "^(..[^:]*):([0-9]+):?([0-9]+)?:? (.*)$",
-			"cmd": ["make upload px4_fmu-v2_default -j8"],
+			"cmd": ["make upload px4fmu-v2_default -j8"],
 			"shell": true
 		},
 		{

Images/aerocore.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 19,
+    "magic": "AeroCore",
+    "description": "Firmware for the Gumstix AeroCore board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AEROCORE",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/mindpx-v2.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 88,
+    "magic": "MindPX",
+    "description": "Firmware for the MindPXFMUv2 board",
+    "image": "", 
+    "build_time": 0, 
+    "summary": "MindPXFMUv2",
+    "version": "2.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4-stm32f4discovery.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 99, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the STM32F4Discovery board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4/STM32F4Discovery",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4fmu-v1.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 5, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4FMU board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4FMU",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4fmu-v2.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 9, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4FMUv2 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4FMUv2",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4fmu-v4.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 11,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the PX4FMUv4 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "PX4FMUv4",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4io-v1.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 7, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4IO board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4IO",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4io-v2.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 10, 
+    "magic": "PX4FWv2", 
+    "description": "Firmware for the PX4IOv2 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4IOv2",
+    "version": "2.0",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/px4iov2.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 10, 
+    "magic": "PX4FWv2", 
+    "description": "Firmware for the PX4IOv2 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4IOv2",
+    "version": "2.0",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Images/tap-v1.prototype

@@ -0,0 +1,12 @@
+{
+    "board_id": 78,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the TAPv1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "TAPv1",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}

Jenkinsfile

@@ -1,670 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-  stages {
-
-    stage('Analysis') {
-
-      parallel {
-
-        stage('Catkin build on ROS workspace') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-ros-melodic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
-            }
-          }
-          steps {
-            sh 'ls -l'
-            sh '''#!/bin/bash -l
-              echo $0;
-              mkdir -p catkin_ws/src;
-              cd catkin_ws;
-              git -C ${WORKSPACE}/catkin_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo
-              git clone --recursive ${WORKSPACE}/catkin_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
-              source /opt/ros/melodic/setup.bash;
-              catkin init;
-              catkin build -j$(nproc) -l$(nproc);
-            '''
-            // test if the binary was correctly installed and runs using 'mavros_posix_silt.launch'
-            sh '''#!/bin/bash -l
-              echo $0;
-              source catkin_ws/devel/setup.bash;
-              rostest px4 pub_test.launch;
-            '''
-          }
-          post {
-            always {
-              sh 'rm -rf catkin_ws'
-            }
-          }
-          options {
-            checkoutToSubdirectory('catkin_ws/src/Firmware')
-          }
-        }
-
-        stage('Colcon build on ROS2 workspace') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-ros2-bouncy:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw -e HOME=$WORKSPACE'
-            }
-          }
-          steps {
-            sh 'ls -l'
-            sh '''#!/bin/bash -l
-              echo $0;
-              unset ROS_DISTRO;
-              mkdir -p colcon_ws/src;
-              cd colcon_ws;
-              git -C ${WORKSPACE}/colcon_ws/src/Firmware submodule update --init --recursive --force Tools/sitl_gazebo
-              git clone --recursive ${WORKSPACE}/colcon_ws/src/Firmware/Tools/sitl_gazebo src/mavlink_sitl_gazebo;
-              source /opt/ros/bouncy/setup.sh;
-              source /opt/ros/melodic/setup.sh;
-              colcon build --event-handlers console_direct+ --symlink-install;
-            '''
-          }
-          post {
-            always {
-              sh 'rm -rf colcon_ws'
-            }
-          }
-          options {
-            checkoutToSubdirectory('colcon_ws/src/Firmware')
-          }
-        }
-
-        stage('Style check') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh 'make check_format'
-          }
-          post {
-            always {
-              sh 'rm -rf catkin_ws'
-            }
-          }
-        }
-
-        stage('Bloaty px4_fmu-v2') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            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'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Bloaty px4_fmu-v5') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            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'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('No-ninja px4_fmu-v2') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'NO_NINJA_BUILD=1 make px4_fmu-v2_default'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('No-ninja px4_fmu-v5') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'NO_NINJA_BUILD=1 make px4_fmu-v5_default'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('No-ninja SITL build') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'NO_NINJA_BUILD=1 make px4_sitl_default'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('SITL unit tests') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'ccache -z'
-            sh 'git fetch --tags'
-            sh 'make tests'
-            sh 'ccache -s'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Clang analyzer') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-clang:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make scan-build'
-            // publish html
-            publishHTML target: [
-              reportTitles: 'clang static analyzer',
-              allowMissing: false,
-              alwaysLinkToLastBuild: true,
-              keepAll: true,
-              reportDir: 'build/scan-build/report_latest',
-              reportFiles: '*',
-              reportName: 'Clang Static Analyzer'
-            ]
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'beta'
-              branch 'stable'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-        }
-
-        // stage('Clang tidy') {
-        //   agent {
-        //     docker {
-        //       image 'px4io/px4-dev-clang:2019-03-08'
-        //       args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-        //     }
-        //   }
-        //   steps {
-        //     sh 'export'
-        //     retry (3) {
-        //       sh 'make distclean'
-        //       sh 'make clang-tidy-quiet'
-        //     }
-        //   }
-        //   post {
-        //     always {
-        //       sh 'make distclean'
-        //     }
-        //   }
-        // }
-
-        stage('Cppcheck') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make cppcheck'
-            // publish html
-            publishHTML target: [
-              reportTitles: 'Cppcheck',
-              allowMissing: false,
-              alwaysLinkToLastBuild: true,
-              keepAll: true,
-              reportDir: 'build/cppcheck/',
-              reportFiles: '*',
-              reportName: 'Cppcheck'
-            ]
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'beta'
-              branch 'stable'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-        }
-
-        stage('Check stack') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make px4_fmu-v2_default stack_check'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('ShellCheck') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make shellcheck_all'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Module config validation') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-base-bionic:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make validate_module_configs'
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-      } // parallel
-    } // stage Analysis
-
-    stage('Generate Metadata') {
-
-      parallel {
-
-        stage('Airframe') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'make airframe_metadata'
-            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'airframes.md, airframes.xml')
-              stash includes: 'airframes.md, airframes.xml', name: 'metadata_airframes'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Parameter') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'make parameters_metadata'
-            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'parameters.md, parameters.xml')
-              stash includes: 'parameters.md, parameters.xml', name: 'metadata_parameters'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Module') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'make module_documentation'
-            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'modules/*.md')
-              stash includes: 'modules/*.md', name: 'metadata_module_documentation'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('uORB graphs') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-nuttx:2019-03-08'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'make uorb_graphs'
-            dir('Tools/uorb_graph') {
-              archiveArtifacts(artifacts: 'graph_px4_sitl.json')
-              stash includes: 'graph_px4_sitl.json', name: 'uorb_graph'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-      } // parallel
-    } // stage: Generate Metadata
-
-    stage('Deploy') {
-
-      parallel {
-
-        stage('Devguide') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            unstash 'metadata_module_documentation'
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/Devguide.git')
-              sh('cp airframes.md Devguide/en/airframes/airframe_reference.md')
-              sh('cp parameters.md Devguide/en/advanced/parameter_reference.md')
-              sh('cp -R modules/*.md Devguide/en/middleware/')
-              sh('cd Devguide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
-              sh('cd Devguide; git push origin master || true')
-              sh('rm -rf Devguide')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
-        stage('Userguide') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_user_guide.git')
-              sh('cp airframes.md px4_user_guide/en/airframes/airframe_reference.md')
-              sh('cp parameters.md px4_user_guide/en/advanced_config/parameter_reference.md')
-              sh('cd px4_user_guide; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
-              sh('cd px4_user_guide; git push origin master || true')
-              sh('rm -rf px4_user_guide')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
-        stage('QGroundControl') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh('git clone https://${GIT_USER}:${GIT_PASS}@github.com/mavlink/qgroundcontrol.git')
-              sh('cp airframes.xml qgroundcontrol/src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml')
-              sh('cp parameters.xml qgroundcontrol/src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml')
-              sh('cd qgroundcontrol; git status; git add .; git commit -a -m "Update PX4 Firmware metadata `date`" || true')
-              sh('cd qgroundcontrol; git push origin master || true')
-              sh('rm -rf qgroundcontrol')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
-        stage('PX4 ROS msgs') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            sh('make distclean')
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_msgs.git")
-              // 'master' branch
-              sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
-              sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
-              sh('cd px4_msgs; git push origin master || true')
-              // 'ros1' branch
-              sh('cd px4_msgs; git checkout ros1')
-              sh('python msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/')
-              sh('cd px4_msgs; git status; git add .; git commit -a -m "Update message definitions `date`" || true')
-              sh('cd px4_msgs; git push origin ros1 || true')
-              sh('rm -rf px4_msgs')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-        }
-
-        stage('PX4 ROS2 bridge') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            sh('make distclean')
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/px4_ros_com.git -b ${BRANCH_NAME}")
-              // deploy uORB RTPS ID map
-              sh('python msg/tools/uorb_to_ros_rtps_ids.py -i msg/tools/uorb_rtps_message_ids.yaml -o px4_ros_com/templates/uorb_rtps_message_ids.yaml')
-              sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS ID map `date`" || true')
-              sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
-              // deploy uORB RTPS required tools
-              sh('cp msg/tools/uorb_rtps_classifier.py px4_ros_com/scripts/uorb_rtps_classifier.py')
-              sh('cp msg/tools/generate_microRTPS_bridge.py px4_ros_com/scripts/generate_microRTPS_bridge.py')
-              sh('cp msg/tools/px_generate_uorb_topic_files.py px4_ros_com/scripts/px_generate_uorb_topic_files.py')
-              sh('cp msg/tools/px_generate_uorb_topic_helper.py px4_ros_com/scripts/px_generate_uorb_topic_helper.py')
-              sh('cd px4_ros_com; git status; git add .; git commit -a -m "Update uORB RTPS script tools `date`" || true')
-              sh('cd px4_ros_com; git push origin ${BRANCH_NAME} || true')
-              sh('rm -rf px4_msgs')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-        }
-
-        stage('S3') {
-          agent {
-            docker { image 'px4io/px4-dev-base-bionic:2019-03-08' }
-          }
-          steps {
-            sh('export')
-            unstash 'metadata_airframes'
-            unstash 'metadata_parameters'
-            sh('ls')
-            withAWS(credentials: 'px4_aws_s3_key', region: 'us-east-1') {
-              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'airframes.xml', path: 'Firmware/master/')
-              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'parameters.xml', path: 'Firmware/master/')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-          options {
-            skipDefaultCheckout()
-          }
-        }
-
-      } // parallel
-    } // stage: Generate Metadata
-
-  } // stages
-
-  environment {
-    CCACHE_DIR = '/tmp/ccache'
-    CI = true
-    GIT_AUTHOR_EMAIL = "bot@px4.io"
-    GIT_AUTHOR_NAME = "PX4BuildBot"
-    GIT_COMMITTER_EMAIL = "bot@px4.io"
-    GIT_COMMITTER_NAME = "PX4BuildBot"
-  }
-  options {
-    buildDiscarder(logRotator(numToKeepStr: '20', artifactDaysToKeepStr: '30'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-}

LICENSE

@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2012 - 2019, PX4 Development Team
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the copyright holder nor the names of its
-  contributors may be used to endorse or promote products derived from
-  this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.md

@@ -0,0 +1,41 @@
+The PX4 firmware is licensed generally under a permissive 3-clause BSD license. Contributions are required
+to be made under the same license. Any exception to this general rule is listed below.
+
+	/****************************************************************************
+	 *
+	 *   Copyright (c) 2012-2015 PX4 Development Team. All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions
+	 * are met:
+	 *
+	 * 1. Redistributions of source code must retain the above copyright
+	 *    notice, this list of conditions and the following disclaimer.
+	 * 2. Redistributions in binary form must reproduce the above copyright
+	 *    notice, this list of conditions and the following disclaimer in
+	 *    the documentation and/or other materials provided with the
+	 *    distribution.
+	 * 3. Neither the name PX4 nor the names of its contributors may be
+	 *    used to endorse or promote products derived from this software
+	 *    without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+	 * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	 * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+	 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+	 * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+	 * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+	 * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+	 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+	 * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 ****************************************************************************/
+
+
+  - PX4 middleware: BSD 3-clause
+  - PX4 flight control stack: BSD 3-clause
+  - NuttX operating system: BSD 3-clause
+  - Exceptions: Currently only this [400 LOC file](https://github.com/PX4/Firmware/blob/master/src/lib/external_lgpl/tecs/tecs.cpp) remains LGPL, but will be replaced with a BSD implementation.

Makefile

@@ -1,6 +1,6 @@
 ############################################################################
 #
-# Copyright (c) 2015 - 2019 PX4 Development Team. All rights reserved.
+# Copyright (c) 2015 - 2016 PX4 Development Team. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,6 +39,26 @@ ifeq ($(wildcard .git),)
     $(error YOU HAVE TO USE GIT TO DOWNLOAD THIS REPOSITORY. ABORTING.)
 endif
 
+CMAKE_VER := $(shell Tools/check_cmake.sh; echo $$?)
+ifneq ($(CMAKE_VER),0)
+    $(warning Not a valid CMake version or CMake not installed.)
+    $(warning On Ubuntu, install or upgrade via:)
+    $(warning )
+    $(warning 3rd party PPA:)
+    $(warning sudo add-apt-repository ppa:george-edison55/cmake-3.x -y)
+    $(warning sudo apt-get update)
+    $(warning sudo apt-get install cmake)
+    $(warning )
+    $(warning Official website:)
+    $(warning wget https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.sh)
+    $(warning chmod +x cmake-3.4.3-Linux-x86_64.sh)
+    $(warning sudo mkdir /opt/cmake-3.4.3)
+    $(warning sudo ./cmake-3.4.3-Linux-x86_64.sh --prefix=/opt/cmake-3.4.3 --exclude-subdir)
+    $(warning export PATH=/opt/cmake-3.4.3/bin:$$PATH)
+    $(warning )
+    $(error Fatal)
+endif
+
 # Help
 # --------------------------------------------------------------------
 # Don't be afraid of this makefile, it is just passing
@@ -48,60 +68,41 @@ endif
 #
 # Example usage:
 #
-# make px4_fmu-v2_default 			(builds)
-# make px4_fmu-v2_default upload 	(builds and uploads)
-# make px4_fmu-v2_default test 		(builds and tests)
+# make px4fmu-v2_default 			(builds)
+# make px4fmu-v2_default upload 	(builds and uploads)
+# make px4fmu-v2_default test 		(builds and tests)
 #
-# This tells cmake to build the nuttx px4_fmu-v2 default config in the
-# directory build/px4_fmu-v2_default and then call make
+# This tells cmake to build the nuttx px4fmu-v2 default config in the
+# directory build_nuttx_px4fmu-v2_default and then call make
 # in that directory with the target upload.
 
-# explicity set default build target
-all: px4_sitl_default
-
-# define a space character to be able to explicitly find it in strings
-space := $(subst ,, )
+#  explicity set default build target
+all: posix_sitl_default
 
 # Parsing
 # --------------------------------------------------------------------
 # assume 1st argument passed is the main target, the
 # rest are arguments to pass to the makefile generated
 # by cmake in the subdirectory
-FIRST_ARG := $(firstword $(MAKECMDGOALS))
 ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
 j ?= 4
 
-NINJA_BIN := ninja
-ifndef NO_NINJA_BUILD
-	NINJA_BUILD := $(shell $(NINJA_BIN) --version 2>/dev/null)
-
-	ifndef NINJA_BUILD
-		NINJA_BIN := ninja-build
-		NINJA_BUILD := $(shell $(NINJA_BIN) --version 2>/dev/null)
-	endif
-endif
-
+NINJA_BUILD := $(shell ninja --version 2>/dev/null)
 ifdef NINJA_BUILD
-	PX4_CMAKE_GENERATOR := Ninja
-	PX4_MAKE := $(NINJA_BIN)
-
-	ifdef VERBOSE
-		PX4_MAKE_ARGS := -v
-	else
-		PX4_MAKE_ARGS :=
-	endif
+    PX4_CMAKE_GENERATOR ?= "Ninja"
+    PX4_MAKE = ninja
+    PX4_MAKE_ARGS =
 else
-	ifdef SYSTEMROOT
-		# Windows
-		PX4_CMAKE_GENERATOR := "MSYS\ Makefiles"
-	else
-		PX4_CMAKE_GENERATOR := "Unix\ Makefiles"
-	endif
-	PX4_MAKE = $(MAKE)
-	PX4_MAKE_ARGS = -j$(j) --no-print-directory
-endif
 
-SRC_DIR := $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
+ifdef SYSTEMROOT
+	# Windows
+	PX4_CMAKE_GENERATOR ?= "MSYS Makefiles"
+else
+	PX4_CMAKE_GENERATOR ?= "Unix Makefiles"
+endif
+    PX4_MAKE = make
+    PX4_MAKE_ARGS = -j$(j) --no-print-directory
+endif
 
 # check if replay env variable is set & set build dir accordingly
 ifdef replay
@@ -110,376 +111,246 @@ else
 	BUILD_DIR_SUFFIX :=
 endif
 
-# additional config parameters passed to cmake
-ifdef EXTERNAL_MODULES_LOCATION
-	CMAKE_ARGS += -DEXTERNAL_MODULES_LOCATION:STRING=$(EXTERNAL_MODULES_LOCATION)
-endif
-
-ifdef PX4_CMAKE_BUILD_TYPE
-	CMAKE_ARGS += -DCMAKE_BUILD_TYPE=${PX4_CMAKE_BUILD_TYPE}
-else
-
-	# Address Sanitizer
-	ifdef PX4_ASAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=AddressSanitizer
-	endif
-
-	# Memory Sanitizer
-	ifdef PX4_MSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=MemorySanitizer
-	endif
-
-	# Thread Sanitizer
-	ifdef PX4_TSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=ThreadSanitizer
-	endif
-
-	# Undefined Behavior Sanitizer
-	ifdef PX4_UBSAN
-		CMAKE_ARGS += -DCMAKE_BUILD_TYPE=UndefinedBehaviorSanitizer
-	endif
-
-endif
-
 # Functions
 # --------------------------------------------------------------------
 # describe how to build a cmake config
 define cmake-build
-	@$(eval BUILD_DIR = "$(SRC_DIR)/build/$(1)")
-	@# check if the desired cmake configuration matches the cache then CMAKE_CACHE_CHECK stays empty
-	@$(call cmake-cache-check)
-	@# make sure to start from scratch when switching from GNU Make to Ninja
-	@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(BUILD_DIR)/Makefile ]; then rm -rf $(BUILD_DIR); fi
-	@# only excplicitly configure the first build, if cache file already exists the makefile will rerun cmake automatically if necessary
-	@if [ ! -e $(BUILD_DIR)/CMakeCache.txt ] || [ $(CMAKE_CACHE_CHECK) ]; then \
-		mkdir -p $(BUILD_DIR) \
-		&& cd $(BUILD_DIR) \
-		&& cmake "$(SRC_DIR)" -G"$(PX4_CMAKE_GENERATOR)" $(CMAKE_ARGS) \
-		|| (rm -rf $(BUILD_DIR)); \
-	fi
-	@# run the build for the specified target
-	@cmake --build $(BUILD_DIR) -- $(PX4_MAKE_ARGS) $(ARGS)
++@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e ./build_$@$(BUILD_DIR_SUFFIX)/Makefile ]; then rm -rf ./build_$@$(BUILD_DIR_SUFFIX); fi
++@if [ ! -e ./build_$@$(BUILD_DIR_SUFFIX)/CMakeCache.txt ]; then Tools/check_submodules.sh && mkdir -p ./build_$@$(BUILD_DIR_SUFFIX) && cd ./build_$@$(BUILD_DIR_SUFFIX) && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1) || (cd .. && rm -rf ./build_$@$(BUILD_DIR_SUFFIX)); fi
++@Tools/check_submodules.sh
++@(echo "PX4 CONFIG: $@$(BUILD_DIR_SUFFIX)" && cd ./build_$@$(BUILD_DIR_SUFFIX) && $(PX4_MAKE) $(PX4_MAKE_ARGS) $(ARGS))
 endef
 
-# check if the options we want to build with in CMAKE_ARGS match the ones which are already configured in the cache inside BUILD_DIR
-define cmake-cache-check
-	@# change to build folder which fails if it doesn't exist and CACHED_CMAKE_OPTIONS stays empty
-	@# fetch all previously configured and cached options from the build folder and transform them into the OPTION=VALUE format without type (e.g. :BOOL)
-	@$(eval CACHED_CMAKE_OPTIONS = $(shell cd $(BUILD_DIR) 2>/dev/null && cmake -L 2>/dev/null | sed -n 's/\([^[:blank:]]*\):[^[:blank:]]*\(=[^[:blank:]]*\)/\1\2/gp' ))
-	@# transform the options in CMAKE_ARGS into the OPTION=VALUE format without -D
-	@$(eval DESIRED_CMAKE_OPTIONS = $(shell echo $(CMAKE_ARGS) | sed -n 's/-D\([^[:blank:]]*=[^[:blank:]]*\)/\1/gp' ))
-	@# find each currently desired option in the already cached ones making sure the complete configured string value is the same
-	@$(eval VERIFIED_CMAKE_OPTIONS = $(foreach option,$(DESIRED_CMAKE_OPTIONS),$(strip $(findstring $(option)$(space),$(CACHED_CMAKE_OPTIONS)))))
-	@# if the complete list of desired options is found in the list of verified options we don't need to reconfigure and CMAKE_CACHE_CHECK stays empty
-	@$(eval CMAKE_CACHE_CHECK = $(if $(findstring $(DESIRED_CMAKE_OPTIONS),$(VERIFIED_CMAKE_OPTIONS)),,y))
+define cmake-build-other
++@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e ./build_$@/Makefile ]; then rm -rf ./build_$@; fi
++@if [ ! -e ./build_$@/CMakeCache.txt ]; then Tools/check_submodules.sh && mkdir -p ./build_$@ && cd ./build_$@ && cmake $(2) -G$(PX4_CMAKE_GENERATOR) || (cd .. && rm -rf ./build_$@); fi
++@(cd ./build_$@ && $(PX4_MAKE) $(PX4_MAKE_ARGS) $(ARGS))
 endef
 
-COLOR_BLUE = \033[0;94m
-NO_COLOR   = \033[m
+# create empty targets to avoid msgs for targets passed to cmake
+define cmake-targ
+$(1):
+	@#
+.PHONY: $(1)
+endef
 
 define colorecho
-+@echo -e '${COLOR_BLUE}${1} ${NO_COLOR}'
+      @tput setaf 6
+      @echo $1
+      @tput sgr0
 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/\//_/g' | sort)
-
 # ADD CONFIGS HERE
 # --------------------------------------------------------------------
 #  Do not put any spaces between function arguments.
 
-# All targets.
-$(ALL_CONFIG_TARGETS):
-	@$(eval PX4_CONFIG = $@)
-	@$(eval CMAKE_ARGS += -DCONFIG=$(PX4_CONFIG))
-	@$(call cmake-build,$(PX4_CONFIG)$(BUILD_DIR_SUFFIX))
+tap-v1_default:
+	$(call cmake-build,nuttx_tap-v1_default)
 
-# Filter for only default targets to allow omiting the "_default" postfix
-CONFIG_TARGETS_DEFAULT := $(patsubst %_default,%,$(filter %_default,$(ALL_CONFIG_TARGETS)))
-$(CONFIG_TARGETS_DEFAULT):
-	@$(eval PX4_CONFIG = $@_default)
-	@$(eval CMAKE_ARGS += -DCONFIG=$(PX4_CONFIG))
-	@$(call cmake-build,$(PX4_CONFIG)$(BUILD_DIR_SUFFIX))
+px4fmu-v1_default:
+	$(call cmake-build,nuttx_px4fmu-v1_default)
 
-all_config_targets: $(ALL_CONFIG_TARGETS)
-all_default_targets: $(CONFIG_TARGETS_DEFAULT)
+px4fmu-v2_default:
+	$(call cmake-build,nuttx_px4fmu-v2_default)
 
-posix: px4_sitl_default
+px4fmu-v2_test:
+	$(call cmake-build,nuttx_px4fmu-v2_test)
 
-# board reorganization deprecation warnings (2018-11-22)
-define deprecation_warning
-	$(warning $(1) has been deprecated and will be removed, please use $(2)!)
-endef
+px4fmu-v4_default:
+	$(call cmake-build,nuttx_px4fmu-v4_default)
 
-px4fmu-%_default:
-	$(call deprecation_warning, ${@},$(subst px4fmu,px4_fmu,$@))
-	$(MAKE) $(subst px4fmu,px4_fmu, $@)
+px4-stm32f4discovery_default:
+	$(call cmake-build,nuttx_px4-stm32f4discovery_default)
+
+px4fmu-v2_ekf2:
+	$(call cmake-build,nuttx_px4fmu-v2_ekf2)
+
+mindpx-v2_default:
+	$(call cmake-build,nuttx_mindpx-v2_default)
 
 posix_sitl_default:
-	$(call deprecation_warning, ${@},px4_sitl_default)
-	$(MAKE) px4_sitl_default
+	$(call cmake-build,$@)
 
-# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
-.PHONY: all posix px4_sitl_default all_config_targets all_default_targets
+posix_sitl_lpe:
+	$(call cmake-build,$@)
 
-# Multi- config targets.
-eagle_default: atlflight_eagle_default atlflight_eagle_qurt-default
-eagle_rtps: atlflight_eagle_rtps atlflight_eagle_qurt-rtps
+posix_sitl_replay:
+	$(call cmake-build,$@)
 
-excelsior_default: atlflight_excelsior_default atlflight_excelsior_qurt-default
-excelsior_rtps: atlflight_excelsior_rtps atlflight_excelsior_qurt-rtps
+posix_sitl_broadcast:
+	$(call cmake-build,$@)
 
-.PHONY: eagle_default eagle_rtps
-.PHONY: excelsior_default excelsior_rtps
+ros_sitl_default:
+	@echo "This target is deprecated. Use make 'posix_sitl_default gazebo' instead."
+
+qurt_eagle_travis:
+	$(call cmake-build,$@)
+
+qurt_eagle_default:
+	$(call cmake-build,$@)
+
+posix_eagle_default:
+	$(call cmake-build,$@)
+
+eagle_default: posix_eagle_default qurt_eagle_default
+eagle_legacy_default: posix_eagle_legacy_driver_default qurt_eagle_legacy_driver_default
+
+qurt_eagle_legacy_driver_default:
+	$(call cmake-build,$@)
+
+posix_eagle_legacy_driver_default:
+	$(call cmake-build,$@)
+
+qurt_excelsior_default:
+	$(call cmake-build,$@)
+
+posix_excelsior_default:
+	$(call cmake-build,$@)
+
+excelsior_default: posix_excelsior_default qurt_excelsior_default
+
+posix_rpi_native:
+	$(call cmake-build,$@)
+
+posix_rpi_cross:
+	$(call cmake-build,$@)
+
+posix_bebop_default:
+	$(call cmake-build,$@)
+
+posix: posix_sitl_default
+
+broadcast: posix_sitl_broadcast
+
+sitl_deprecation:
+	@echo "Deprecated. Use 'make posix_sitl_default jmavsim' or"
+	@echo "'make posix_sitl_default gazebo' if Gazebo is preferred."
+
+run_sitl_quad: sitl_deprecation
+run_sitl_plane: sitl_deprecation
+run_sitl_ros: sitl_deprecation
 
 # Other targets
 # --------------------------------------------------------------------
 
-.PHONY: qgc_firmware px4fmu_firmware misc_qgc_extra_firmware alt_firmware check_rtps
+.PHONY: gazebo_build uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
+.NOTPARALLEL: gazebo_build uavcan_firmware check check_format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
 
-# QGroundControl flashable NuttX firmware
-qgc_firmware: px4fmu_firmware misc_qgc_extra_firmware
+gazebo_build:
+	@mkdir -p build_gazebo
+	@if [ ! -e ./build_gazebo/CMakeCache.txt ];then cd build_gazebo && cmake -Wno-dev -G$(PX4_CMAKE_GENERATOR) ../Tools/sitl_gazebo; fi
+	@cd build_gazebo && $(PX4_MAKE) $(PX4_MAKE_ARGS)
+	@cd build_gazebo && $(PX4_MAKE) $(PX4_MAKE_ARGS) sdf
 
-# px4fmu NuttX firmware
-px4fmu_firmware: \
-	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
+uavcan_firmware:
+ifeq ($(VECTORCONTROL),1)
+	$(call colorecho,"Downloading and building Vector control (FOC) firmware for the S2740VC and PX4ESC 1.6")
+	@(rm -rf vectorcontrol && git clone --quiet --depth 1 https://github.com/thiemar/vectorcontrol.git && cd vectorcontrol && BOARD=s2740vc_1_0 make --silent --no-print-directory && BOARD=px4esc_1_6 make --silent --no-print-directory && ../Tools/uavcan_copy.sh)
+endif
 
-misc_qgc_extra_firmware: \
-	check_nxp_fmuk66-v3_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
+checks_defaults: \
+	check_px4fmu-v1_default \
+	check_px4fmu-v2_default \
+	check_mindpx-v2_default \
+	check_px4-stm32f4discovery_default \
+	check_tap-v1_default \
 
-# Other NuttX firmware
-alt_firmware: \
-	check_px4_cannode-v1_default \
-	check_px4_esc-v1_default \
-	check_auav_esc35-v1_default \
-	check_thiemar_s2740vc-v1_default \
-	sizes
+checks_bootloaders: \
 
-# builds with RTPS
-check_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
+checks_tests: \
+	check_px4fmu-v2_test
 
-sizes:
-	@-find build -name *.elf -type f | xargs size 2> /dev/null || :
+checks_alts: \
+	check_px4fmu-v2_ekf2 \
 
-# All default targets that don't require a special build environment
-check: check_px4_sitl_default px4fmu_firmware misc_qgc_extra_firmware alt_firmware tests check_format
+checks_uavcan: \
+	check_px4fmu-v4_default_and_uavcan
 
-# quick_check builds a single nuttx and posix target, runs testing, and checks the style
-quick_check: check_px4_sitl_test check_px4_fmu-v5_default tests check_format
+checks_sitls: \
+	check_posix_sitl_default
+
+checks_last: \
+	check_tests \
+	check_format \
+
+check: checks_defaults checks_tests checks_alts checks_uavcan checks_bootloaders checks_last
+quick_check: check_px4fmu-v2_default check_px4fmu-v4_default check_tests check_format
+
+check_format:
+	$(call colorecho,"Checking formatting with astyle")
+	@./Tools/fix_code_style.sh
+	@./Tools/check_code_style_all.sh
 
 check_%:
 	@echo
-	$(call colorecho,'Building' $(subst check_,,$@))
+	$(call colorecho,"Building" $(subst check_,,$@))
 	@$(MAKE) --no-print-directory $(subst check_,,$@)
 	@echo
 
-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 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
+check_px4fmu-v4_default: uavcan_firmware
+check_px4fmu-v4_default_and_uavcan: check_px4fmu-v4_default
+	@echo
+ifeq ($(VECTORCONTROL),1)
+	@echo "Cleaning up vectorcontrol firmware"
+	@rm -rf vectorcontrol
+	@rm -rf ROMFS/px4fmu_common/uavcan
+endif
 
+unittest: posix_sitl_default
+	$(call cmake-build-other,unittest, ../unittests)
+	@(cd build_unittest && ctest -j2 --output-on-failure)
 
-.PHONY: coverity_scan
+run_tests_posix: posix_sitl_default
+	@mkdir -p build_posix_sitl_default/src/firmware/posix/rootfs/fs/microsd
+	@mkdir -p build_posix_sitl_default/src/firmware/posix/rootfs/eeprom
+	@touch build_posix_sitl_default/src/firmware/posix/rootfs/eeprom/parameters
+	@(cd build_posix_sitl_default/src/firmware/posix && ./px4 -d ../../../../posix-configs/SITL/init/rcS_tests | tee test_output)
+	@(cd build_posix_sitl_default/src/firmware/posix && grep --color=always "All tests passed" test_output)
 
-coverity_scan: px4_sitl_default
+tests: check_unittest run_tests_posix
 
-# Documentation
-# --------------------------------------------------------------------
-.PHONY: parameters_metadata airframe_metadata module_documentation px4_metadata doxygen
+# QGroundControl flashable firmware
+qgc_firmware: \
+	check_px4fmu-v1_default \
+	check_px4fmu-v2_default \
+	check_mindpx-v2_default \
+	check_px4fmu-v4_default_and_uavcan \
+	check_format
 
-parameters_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters
+extra_firmware: \
+	check_px4-stm32f4discovery_default \
+	check_px4fmu-v2_test \
+	check_px4fmu-v2_ekf2
 
-airframe_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_airframes
-
-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=px4_sitl_default -DBUILD_DOXYGEN=ON
-	@$(PX4_MAKE) -C "$(SRC_DIR)"/build/doxygen
-	@touch "$(SRC_DIR)"/build/doxygen/Documentation/.nojekyll
-
-# Astyle
-# --------------------------------------------------------------------
-.PHONY: check_format format
-
-check_format:
-	$(call colorecho,'Checking formatting with astyle')
-	@"$(SRC_DIR)"/Tools/astyle/check_code_style_all.sh
-	@cd "$(SRC_DIR)" && git diff --check
-
-format:
-	$(call colorecho,'Formatting with astyle')
-	@"$(SRC_DIR)"/Tools/astyle/check_code_style_all.sh --fix
-
-# Testing
-# --------------------------------------------------------------------
-.PHONY: tests tests_coverage tests_mission tests_mission_coverage tests_offboard tests_avoidance
-.PHONY: rostest python_coverage
-
-tests:
-	$(eval CMAKE_ARGS += -DCONFIG=px4_sitl_test)
-	$(eval CMAKE_ARGS += -DTESTFILTER=$(TESTFILTER))
-	$(eval ARGS += test_results)
-	$(eval ASAN_OPTIONS += color=always:check_initialization_order=1:detect_stack_use_after_return=1)
-	$(eval UBSAN_OPTIONS += color=always)
-	$(call cmake-build,px4_sitl_test)
-
-tests_coverage:
-	@$(MAKE) clean
-	@$(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: 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
-
-rostest_run: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
-	@"$(SRC_DIR)"/test/rostest_px4_run.sh $(TEST_FILE) mission:=$(TEST_MISSION) vehicle:=$(TEST_VEHICLE)
-
-tests_mission_coverage:
-	@$(MAKE) clean
-	@$(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 px4_sitl_default generate_coverage
-
-tests_offboard: rostest
-	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_attctl.test
-	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_posctl.test
-
-tests_avoidance: rostest
-	@"$(SRC_DIR)"/test/rostest_avoidance_run.sh mavros_posix_test_avoidance.test
-
-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=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
-	#@$(PX4_MAKE) -C "$(SRC_DIR)"/build/python_coverage module_documentation # TODO: fix within coverage.py
-	@coverage combine `find . -name .coverage\*`
-	@coverage report -m
-
-
-# static analyzers (scan-build, clang-tidy, cppcheck)
-# --------------------------------------------------------------------
-.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/px4_sitl_default-scan-build
-	@rm -rf "$(SRC_DIR)"/build/scan-build/report_latest
-	@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 \;
-
-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: 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: 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: 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: 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/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 px4_fmu-v5_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
-
-# Cleanup
-# --------------------------------------------------------------------
-.PHONY: clean submodulesclean submodulesupdate gazeboclean distclean
+package_firmware:
+	@zip --junk-paths Firmware.zip `find . -name \*.px4`
 
 clean:
-	@rm -rf "$(SRC_DIR)"/build
+	@rm -rf build_*/
+	@(cd NuttX/nuttx && make clean)
 
 submodulesclean:
-	@git submodule foreach --quiet --recursive git clean -ff -x -d
-	@git submodule update --quiet --init --recursive --force || true
 	@git submodule sync --recursive
+	@git submodule deinit -f .
 	@git submodule update --init --recursive --force
 
-submodulesupdate:
-	@git submodule update --quiet --init --recursive || true
-	@git submodule sync --recursive
-	@git submodule update --init --recursive
+distclean: submodulesclean
+	@git clean -ff -x -d -e ".project" -e ".cproject"
 
-gazeboclean:
-	@rm -rf ~/.gazebo/*
+# targets handled by cmake
+cmake_targets = install test upload package package_source debug debug_tui debug_ddd debug_io debug_io_tui debug_io_ddd check_weak \
+	run_cmake_config config gazebo gazebo_gdb gazebo_lldb jmavsim replay \
+	jmavsim_gdb jmavsim_lldb gazebo_gdb_iris gazebo_lldb_tailsitter gazebo_iris gazebo_iris_opt_flow gazebo_tailsitter \
+	gazebo_gdb_standard_vtol gazebo_lldb_standard_vtol gazebo_standard_vtol gazebo_plane gazebo_solo gazebo_typhoon_h480
+$(foreach targ,$(cmake_targets),$(eval $(call cmake-targ,$(targ))))
 
-distclean: gazeboclean
-	@git submodule deinit -f .
-	@git clean -ff -x -d -e ".project" -e ".cproject" -e ".idea" -e ".settings" -e ".vscode"
+.PHONY: clean
 
-# Help / Error
-# --------------------------------------------------------------------
+CONFIGS:=$(shell ls cmake/configs | sed -e "s~.*/~~" | sed -e "s~\..*~~")
 
-# All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
-%:
-	$(if $(filter $(FIRST_ARG),$@), \
-		$(error "$@ cannot be the first argument. Use '$(MAKE) help|list_config_targets' to get a list of all possible [configuration] targets."),@#)
-
-# Print a list of non-config targets (based on http://stackoverflow.com/a/26339924/1487069)
-help:
-	@echo "Usage: $(MAKE) <target>"
-	@echo "Where <target> is one of:"
-	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | \
-		awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | \
-		egrep -v -e '^[^[:alnum:]]' -e '^($(subst $(space),|,$(ALL_CONFIG_TARGETS)))$$' -e '_default$$' -e '^(posix|eagle|Makefile)'
-	@echo
-	@echo "Or, $(MAKE) <config_target> [<make_target(s)>]"
-	@echo "Use '$(MAKE) list_config_targets' for a list of configuration targets."
-
-# Print a list of all config targets.
-list_config_targets:
-	@for targ in $(patsubst %_default,%[_default],$(ALL_CONFIG_TARGETS)); do echo $$targ; done
+#help:
+#	@echo
+#	@echo "Type 'make ' and hit the tab key twice to see a list of the available"
+#	@echo "build configurations."
+#	@echo

PULL_REQUEST_TEMPLATE.md

@@ -1,16 +0,0 @@
-Please use [PX4 Discuss](http://discuss.px4.io/) or [Slack](http://slack.px4.io/) to align on pull requests if necessary. You can then open draft pull requests to get early feedback.
-
-**Describe problem solved by the proposed pull request**
-A clear and concise description of the problem this proposed change will solve. E.g. For this use case I ran into...
-
-**Test data / coverage**
-How was it tested? What cases were covered? Logs uploaded to https://review.px4.io/ and screenshots of the important plot parts.
-
-**Describe your preferred solution**
-A clear and concise description of what you have implemented.
-
-**Describe possible alternatives**
-A clear and concise description of alternative solutions or features you've considered.
-
-**Additional context**
-Add any other related context or media.

README.md

@@ -1,108 +1,35 @@
-# PX4 Drone Autopilot
+## PX4 Pro Drone Autopilot ##
 
-[![Releases](https://img.shields.io/github/release/PX4/Firmware.svg)](https://github.com/PX4/Firmware/releases) [![DOI](https://zenodo.org/badge/22634/PX4/Firmware.svg)](https://zenodo.org/badge/latestdoi/22634/PX4/Firmware)
+[![Releases](https://img.shields.io/github/release/PX4/Firmware.svg)](https://github.com/PX4/Firmware/releases) [![DOI](https://zenodo.org/badge/22634/PX4/Firmware.svg)](https://zenodo.org/badge/latestdoi/22634/PX4/Firmware) [![Build Status](https://travis-ci.org/PX4/Firmware.svg?branch=master)](https://travis-ci.org/PX4/Firmware) [![Coverity Scan](https://scan.coverity.com/projects/3966/badge.svg?flat=1)](https://scan.coverity.com/projects/3966?tab=overview)
 
-[![Build Status](http://ci.px4.io:8080/buildStatus/icon?job=PX4/Firmware/master)](http://ci.px4.io:8080/blue/organizations/jenkins/PX4%2FFirmware/activity)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/PX4/Firmware?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-[![Slack](https://px4-slack.herokuapp.com/badge.svg)](http://slack.px4.io)
+This repository holds the [PX4 Pro](http://px4.io) flight control solution for drones, with the main applications located in the src/modules directory. It also contains the PX4 Drone Middleware Platform, which provides drivers and middleware to run drones.
 
-This repository holds the [PX4](http://px4.io) flight control solution for drones, with the main applications located in the [src/modules](https://github.com/PX4/Firmware/tree/master/src/modules) directory. It also contains the PX4 Drone Middleware Platform, which provides drivers and middleware to run drones.
+*   Official Website: http://px4.io
+*   License: BSD 3-clause (see [LICENSE.md](https://github.com/PX4/Firmware/blob/master/LICENSE.md))
+*   Supported airframes (more experimental are supported):
+  * [Multicopters](http://px4.io/portfolio_category/multicopter/)
+  * [Fixed wing](http://px4.io/portfolio_category/plane/)
+  * [VTOL](http://px4.io/portfolio_category/vtol/)
+*   Releases
+  * [Downloads](https://github.com/PX4/Firmware/releases)
 
-* Official Website: http://px4.io (License: BSD 3-clause, [LICENSE](https://github.com/PX4/Firmware/blob/master/LICENSE))
-* [Supported airframes](https://docs.px4.io/en/airframes/airframe_reference.html) ([portfolio](http://px4.io/#airframes)):
-  * [Multicopters](https://docs.px4.io/en/airframes/airframe_reference.html#copter)
-  * [Fixed wing](https://docs.px4.io/en/airframes/airframe_reference.html#plane)
-  * [VTOL](https://docs.px4.io/en/airframes/airframe_reference.html#vtol)
-  * many more experimental types (Rovers, Blimps, Boats, Submarines, etc)
-* Releases: [Downloads](https://github.com/PX4/Firmware/releases)
+### Users ###
 
+Please refer to the [user documentation](http://px4.io) and [user forum](http://discuss.px4.io) for flying drones with the PX4 flight stack.
 
-## PX4 Users
+### Developers ###
 
-The [PX4 User Guide](https://docs.px4.io/en/) explains how to assemble [supported vehicles](https://docs.px4.io/en/airframes/airframe_reference.html) and fly drones with PX4.
-See the [forum and chat](https://docs.px4.io/en/#support) if you need help!
+  * [Developer Forum / Mailing list](http://groups.google.com/group/px4users)
+  * [Guide for Contributions](https://github.com/PX4/Firmware/blob/master/CONTRIBUTING.md)
+  * [Developer guide](http://dev.px4.io)
 
 
-## PX4 Developers
-
-This [Developer Guide](https://dev.px4.io/) is for software developers who want to modify the flight stack and middleware (e.g. to add new flight modes), hardware integrators who want to support new flight controller boards and peripherals, and anyone who wants to get PX4 working on a new (unsupported) airframe/vehicle.
-
-Developers should read the [Guide for Contributions](https://dev.px4.io/en/contribute/).
-See the [forum and chat](https://dev.px4.io/en/#support) if you need help!
-
-
-### Weekly Dev Call
-
-The PX4 Dev Team syncs up on a [weekly dev call](https://dev.px4.io/en/contribute/#dev_call).
-
-> **Note** The dev call is open to all interested developers (not just the core dev team). This is a great opportunity to meet the team and contribute to the ongoing development of the platform. It includes a QA session for newcomers. All regular calls are listed in the [Dronecode calendar](https://www.dronecode.org/calendar/).
-
-
-## Maintenance Team
-
-  * Project: Founder - [Lorenz Meier](https://github.com/LorenzMeier), Architecture: [Daniel Agar](https://github.com/dagar)
-    * [Dev Call](https://github.com/PX4/Firmware/labels/devcall) - [Ramon Roche](https://github.com/mrpollo)
-  * Communication Architecture
-    * [Beat Kueng](https://github.com/bkueng)
-    * [Julian Oes](https://github.com/JulianOes)
-  * UI / UX
-    * [Donald Gagne](https://github.com/DonLakeFlyer)
-    * [Gus Grubba](https://github.com/dogmaphobic)
-  * [Multicopter Flight Control](https://github.com/PX4/Firmware/labels/multicopter)
-    * [Dennis Mannhart](https://github.com/Stifael)
-    * [Matthias Grob](https://github.com/MaEtUgR)
-  * [VTOL Flight Control](https://github.com/PX4/Firmware/labels/vtol)
-    * [Daniel Agar](https://github.com/dagar)
-    * [Mathieu Bresciani](https://github.com/bresch)
-    * [Sander Smeets](https://github.com/sanderux)
-    * [Roman Bapst](https://github.com/tumbili)
-    * [Andreas Antener](https://github.com/AndreasAntener)
-  * [Fixed Wing Flight Control](https://github.com/PX4/Firmware/labels/fixedwing)
-    * [Daniel Agar](https://github.com/dagar)
-    * [Paul Riseborough](https://github.com/priseborough)
-  * Racers - [Matthias Grob](https://github.com/MaEtUgR)
-  * OS / drivers - [David Sidrane](https://github.com/davids5)
-  * [UAVCAN](https://github.com/PX4/Firmware/labels/uavcan) / Industrial - [Pavel Kirienko](https://github.com/pavel-kirienko)
-  * [State Estimation](https://github.com/PX4/Firmware/issues?q=is%3Aopen+is%3Aissue+label%3A%22state+estimation%22) - [James Goppert](https://github.com/jgoppert), [Paul Riseborough](https://github.com/priseborough)
-  * Vision based navigation
-    * [Christoph Tobler](https://github.com/ChristophTobler)
-    * [Mohammed Kabir](https://github.com/mhkabir)
-  * Obstacle Avoidance - [Martina Rivizzigno](https://github.com/mrivi)
-  * [Snapdragon](https://github.com/PX4/Firmware/labels/snapdragon)
-    * [Christoph Tobler](https://github.com/ChristophTobler)
-  * [Intel Aero](https://github.com/PX4/Firmware/labels/intel%20aero)
-    * [Sugnan Prabhu](https://github.com/sugnanprabhu)
-    * [José Roberto de Souza](https://github.com/zehortigoza)
-  * [Raspberry Pi / Navio](https://github.com/PX4/Firmware/labels/raspberry_pi) - [Beat Kueng](https://github.com/bkueng)
-  * [Airmind MindPX / MindRacer](https://github.com/PX4/Firmware/labels/mindpx) - [Henry Zhang](https://github.com/iZhangHui)
-  * RTPS/ROS2 Interface - [Nuno Marques](https://github.com/TSC21)
-
-See also [About Us](http://px4.io/about-us/#development_team) (px4.io) and the [contributors list](https://github.com/PX4/Firmware/graphs/contributors) (Github).
-
-## Supported Hardware
-
 This repository contains code supporting these boards:
-  * [Snapdragon Flight](https://docs.px4.io/en/flight_controller/snapdragon_flight.html)
-  * [Intel Aero](https://docs.px4.io/en/flight_controller/intel_aero.html)
-  * [Raspberry PI with Navio 2](https://docs.px4.io/en/flight_controller/raspberry_pi_navio2.html)
-  * [Parrot Bebop 2](https://dev.px4.io/en/advanced/parrot_bebop.html)
-  * FMUv2.x
-    * [Pixhawk](https://docs.px4.io/en/flight_controller/pixhawk.html)
-    * [Pixhawk Mini](https://docs.px4.io/en/flight_controller/pixhawk_mini.html)
-    * [Pixfalcon](https://docs.px4.io/en/flight_controller/pixfalcon.html)
-  * FMUv3.x [Pixhawk 2](https://docs.px4.io/en/flight_controller/pixhawk-2.html)
-  * FMUv4.x
-    * [Pixracer](https://docs.px4.io/en/flight_controller/pixracer.html)
-    * [Pixhawk 3 Pro](https://docs.px4.io/en/flight_controller/pixhawk3_pro.html)
-  * FMUv5.x (ARM Cortex M7)
-    * [Pixhawk 4](https://docs.px4.io/en/flight_controller/pixhawk4.html)
-    * [Pixhawk 4 mini](https://docs.px4.io/en/flight_controller/pixhawk4_mini.html)  
-  * [Airmind MindPX V2.8](http://www.mindpx.net/assets/accessories/UserGuide_MindPX.pdf)
-  * [Airmind MindRacer V1.2](http://mindpx.net/assets/accessories/mindracer_user_guide_v1.2.pdf)
-  * [Bitcraze Crazyflie 2.0](https://docs.px4.io/en/flight_controller/crazyflie2.html)
-
-Additional information about supported hardware can be found in [PX4 user Guide > Autopilot Hardware](https://docs.px4.io/en/flight_controller/).
-
-## Project Roadmap
-
-A high level project roadmap is available [here](https://www.dronecode.org/roadmap/).
+  * [Snapdragon Flight](http://dev.px4.io/hardware-snapdragon.html)
+  * FMUv1.x
+  * FMUv2.x ([Pixhawk](http://dev.px4.io/hardware-pixhawk.html), Pixhawk 2 and [Pixfalcon](http://dev.px4.io/hardware-pixfalcon.html))
+  * FMUv4.x (Pixhawk X and [Pixracer](http://dev.px4.io/hardware-pixracer.html))
+  * AeroCore (v1 and v2)
+  * STM32F4Discovery (basic support) [Tutorial](https://pixhawk.org/modules/stm32f4discovery)

ROMFS/CMakeLists.txt

@@ -1,268 +0,0 @@
-############################################################################
-#
-#   Copyright (c) 2018 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-message(STATUS "ROMFS: ${config_romfs_root}")
-
-set(romfs_src_dir ${PX4_SOURCE_DIR}/ROMFS/${config_romfs_root})
-set(romfs_gen_root_dir ${PX4_BINARY_DIR}/genromfs)
-
-set_property(GLOBAL PROPERTY PX4_ROMFS_FILES)
-set_property(GLOBAL PROPERTY PX4_ROMFS_CMAKE_FILES)
-
-#=============================================================================
-#
-#	px4_add_romfs_files
-#
-#	This function builds a list of files to be included in the ROMFS.
-#
-#	Usage:
-#		px4_add_romfs_files(<list of files in current directory to be added to the project>)
-#
-#	Output:
-#		list config_romfs_files_list populated with a list of ROMFS src files including their full file path.
-#
-#	Example:
-#		px4_add_module(
-#			<ROMFS_file_1>
-#			<ROMFS_file_2>
-#			<ROMFS_file_3>
-#			)
-#
-function(px4_add_romfs_files)
-	set_property(GLOBAL APPEND PROPERTY PX4_ROMFS_CMAKE_FILES ${CMAKE_CURRENT_LIST_FILE})
-
-	foreach(arg IN LISTS ARGN)
-		set_property(GLOBAL APPEND PROPERTY PX4_ROMFS_FILES ${CMAKE_CURRENT_LIST_DIR}/${arg})
-	endforeach()
-endfunction()
-
-# get list of all ROMFS files
-add_subdirectory(${romfs_src_dir})
-
-# directory setup
-# copy all romfs files, process airframes
-get_property(romfs_cmake_files GLOBAL PROPERTY PX4_ROMFS_CMAKE_FILES)
-get_property(romfs_copy_files GLOBAL PROPERTY PX4_ROMFS_FILES)
-get_property(module_config_files GLOBAL PROPERTY PX4_MODULE_CONFIG_FILES)
-file(GLOB jinja_templates ${PX4_SOURCE_DIR}/Tools/serial/*.jinja)
-if (px4_constrained_flash_build)
-	set(added_arguments --constrained-flash)
-endif()
-add_custom_command(
-	OUTPUT
-		${romfs_gen_root_dir}/init.d/rcS
-		${romfs_gen_root_dir}/init.d/rc.serial
-		${romfs_gen_root_dir}/init.d/rc.autostart
-		romfs_copy.stamp
-	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}
-	# TODO: we should only copy the files in ${romfs_copy_files}
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${romfs_src_dir} ${romfs_gen_root_dir}
-	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/init.d-posix
-	COMMAND ${CMAKE_COMMAND} -E remove_directory ${romfs_gen_root_dir}/mixers-sitl
-	COMMAND ${CMAKE_COMMAND} -E remove ${romfs_gen_root_dir}/mixers/CMakeLists.txt
-	COMMAND ${CMAKE_COMMAND} -E remove ${romfs_gen_root_dir}/init.d/CMakeLists.txt
-	COMMAND ${CMAKE_COMMAND} -E remove ${romfs_gen_root_dir}/init.d/airframes/CMakeLists.txt
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
-		--airframes-path ${romfs_gen_root_dir}/init.d
-		--start-script ${romfs_gen_root_dir}/init.d/rc.autostart
-		--board ${PX4_BOARD}
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
-		--rc-dir ${romfs_gen_root_dir}/init.d
-		--serial-ports ${board_serial_ports} ${added_arguments}
-		--config-files ${module_config_files} #--verbose
-	COMMAND ${CMAKE_COMMAND} -E touch romfs_copy.stamp
-	DEPENDS
-		${jinja_templates}
-		${module_config_files}
-		${romfs_cmake_files}
-		${romfs_copy_files}
-		${PX4_SOURCE_DIR}/Tools/px_process_airframes.py
-		${PX4_SOURCE_DIR}/Tools/serial/generate_config.py
-	COMMENT "ROMFS: copying, generating airframes"
-	)
-
-# copy extras into ROMFS
-set(extras_dependencies)
-
-# copy px4io binary if configured
-if(config_io_board)
-	list(APPEND extras_dependencies
-		copy_px4io_bin
-		${fw_io_bin}
-		)
-endif()
-
-
-if(config_bl_file)
-	file(MAKE_DIRECTORY ${PX4_BINARY_DIR}/romfs_extras)
-	configure_file(${config_bl_file} ${PX4_BINARY_DIR}/romfs_extras COPYONLY)
-
-	list(APPEND extras_dependencies
-		${config_bl_file}
-		)
-endif()
-
-set(OPTIONAL_BOARD_RC)
-list(APPEND OPTIONAL_BOARD_RC
-	rc.board_defaults
-	rc.board_sensors
-	rc.board_extras
-)
-
-foreach(board_rc_file ${OPTIONAL_BOARD_RC})
-
-	if(EXISTS "${PX4_BOARD_DIR}/init/${board_rc_file}")
-		message(STATUS "ROMFS: Adding ${board_rc_file}")
-
-		add_custom_command(
-			OUTPUT
-				${romfs_gen_root_dir}/init.d/${board_rc_file}
-				${board_rc_file}.stamp
-			COMMAND ${CMAKE_COMMAND} -E copy ${PX4_BOARD_DIR}/init/${board_rc_file} ${romfs_gen_root_dir}/init.d/${board_rc_file}
-			COMMAND ${CMAKE_COMMAND} -E touch ${board_rc_file}.stamp
-			DEPENDS
-				${PX4_BOARD_DIR}/init/${board_rc_file}
-				romfs_copy.stamp
-			COMMENT "ROMFS: copying ${board_rc_file}"
-		)
-
-		list(APPEND extras_dependencies
-			${board_rc_file}.stamp
-			)
-	endif()
-
-endforeach()
-
-add_custom_command(OUTPUT romfs_extras.stamp
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${romfs_gen_root_dir}/extras/
-	COMMAND ${CMAKE_COMMAND} -E make_directory ${PX4_BINARY_DIR}/romfs_extras/
-	COMMAND ${CMAKE_COMMAND} -E copy_directory ${PX4_BINARY_DIR}/romfs_extras/ ${romfs_gen_root_dir}/extras/
-	COMMAND ${CMAKE_COMMAND} -E touch romfs_extras.stamp
-	DEPENDS
-		romfs_copy.stamp
-		${extras_dependencies}
-	COMMENT "ROMFS: copying extras"
-	)
-
-add_custom_command(
-	OUTPUT romfs_pruned.stamp
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/px_romfs_pruner.py --folder ${romfs_gen_root_dir} --board ${PX4_BOARD}
-	COMMAND ${CMAKE_COMMAND} -E touch romfs_pruned.stamp
-	DEPENDS
-		romfs_copy.stamp
-		romfs_extras.stamp
-		${PX4_SOURCE_DIR}/Tools/px_romfs_pruner.py
-	COMMENT "ROMFS: pruning"
-	)
-
-if("${CONFIG_FS_CROMFS}" STREQUAL "y")
-	add_custom_command(
-		OUTPUT ${CMAKE_BINARY_DIR}/gencromfs
-		COMMAND make --no-print-directory --silent -f Makefile.host gencromfs
-		COMMAND ${CMAKE_COMMAND} -E copy gencromfs ${CMAKE_BINARY_DIR}/gencromfs
-		DEPENDS ${PX4_SOURCE_DIR}/platforms/nuttx/NuttX/nuttx/tools/gencromfs.c
-		WORKING_DIRECTORY ${NUTTX_DIR}/tools
-	)
-
-	# create nsh_romfsimg.c
-	add_custom_command(OUTPUT nsh_romfsimg.c
-		COMMAND ${CMAKE_COMMAND} -E remove -f nsh_romfsimg.c
-		COMMAND ${CMAKE_BINARY_DIR}/gencromfs ${romfs_gen_root_dir} nsh_romfsimg.c
-		DEPENDS
-			${CMAKE_BINARY_DIR}/gencromfs
-			romfs_pruned.stamp
-		COMMENT "ROMFS: generating image"
-	)
-
-else()
-	# create romfs.img
-	find_program(GENROMFS genromfs)
-	if(NOT GENROMFS)
-		message(FATAL_ERROR "genromfs not found")
-	endif()
-
-	add_custom_command(
-		OUTPUT
-			romfs.img
-			romfs.txt
-		COMMAND ${CMAKE_COMMAND} -E remove -f romfs.img romfs.txt
-		COMMAND ${GENROMFS} -f romfs.img -d ${romfs_gen_root_dir} -V "NSHInitVol" -v > romfs.txt 2>&1
-		DEPENDS romfs_pruned.stamp
-		COMMENT "ROMFS: generating image"
-	)
-
-
-	# create nsh_romfsimg.c
-	find_program(XXD xxd)
-	if(NOT XXD)
-		message(FATAL_ERROR "xxd not found")
-	endif()
-
-	find_program(SED sed)
-	if(NOT SED)
-		message(FATAL_ERROR "sed not found")
-	endif()
-
-	add_custom_command(OUTPUT nsh_romfsimg.c
-		COMMAND ${CMAKE_COMMAND} -E remove -f nsh_romfsimg.c
-		COMMAND ${XXD} -i romfs.img nsh_romfsimg.c
-		COMMAND ${SED} 's/unsigned/const unsigned/g' nsh_romfsimg.c > nsh_romfsimg.c.tmp && ${CMAKE_COMMAND} -E rename nsh_romfsimg.c.tmp nsh_romfsimg.c
-		DEPENDS romfs.img
-	)
-endif()
-
-
-add_library(romfs STATIC nsh_romfsimg.c)
-add_dependencies(romfs prebuild_targets)
-set_target_properties(romfs PROPERTIES LINKER_LANGUAGE C)
-
-
-# shellcheck
-find_program(SHELLCHECK_PATH shellcheck)
-
-if(SHELLCHECK_PATH)
-
-	# TODO: fix SC2086, SC2166
-	add_custom_target(shellcheck
-		COMMAND ${SHELLCHECK_PATH} --shell=sh
-			--exclude=SC2121 # SC2121: To assign a variable, use just 'var=value'
-			--exclude=SC2086 # SC2086: Double quote to prevent globbing and word splitting.
-			--exclude=SC2166 # SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
-			--exclude=SC2154 # SC2154: <var> is referenced but not assigned (NuttX uses different asssignment)
-			--exclude=SC2164 # SC2164: Use 'cd ... || exit' or 'cd ... || return' in case cd fails.
-			`find ${romfs_gen_root_dir}/init.d -type f`
-		DEPENDS ${romfs_gen_root_dir}/init.d/rc.autostart
-		WORKING_DIRECTORY ${romfs_gen_root_dir}
-		USES_TERMINAL
-	)
-endif()

ROMFS/px4fmu_common/CMakeLists.txt

@@ -1,35 +0,0 @@
-############################################################################
-#
-#   Copyright (c) 2018 PX4 Development Team. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name PX4 nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-add_subdirectory(init.d)
-add_subdirectory(mixers)

ROMFS/px4fmu_common/extras/README.txt

@@ -1,5 +0,0 @@
-px4fmuv3_bl.bin: Bootloader binary of the PX4 Bootloader
-  (https://github.com/PX4/Bootloader)
-  based on commit 184b813699a9cfd6f43a5a21556a06b4372baf5f
-  for the target px4fmuv3_bl
-

ROMFS/px4fmu_common/init.d-posix/10016_iris

@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL
-#
-# @type Quadrotor Wide
-#
-# @maintainer Julian Oes <julian@oes.ch>
-#
-
-sh /etc/init.d/rc.mc_defaults
-
-set MIXER quad_w
-

ROMFS/px4fmu_common/init.d-posix/10020_if750a

@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# @name IF750A SITL
-# InspiredFlight 750 Auterion edition. Gazebo Only.
-#
-# @type Quadrotor
-#
-
-sh /etc/init.d/rc.mc_defaults
-
-set MIXER quad_x
-

ROMFS/px4fmu_common/init.d-posix/1010_iris_opt_flow

@@ -1,29 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Optical Flow)
-#
-# @type Quadrotor Wide
-#
-
-sh /etc/init.d-posix/10016_iris
-
-if [ $AUTOCNF = yes ]
-then
-	# EKF2
-	param set EKF2_AID_MASK 2
-	param set EKF2_EVP_NOISE 0.05
-	param set EKF2_EVA_NOISE 0.05
-
-	# INAV
-	param set INAV_LIDAR_EST 1
-	param set INAV_W_XY_FLOW 1
-	param set INAV_W_XY_GPS_P 0
-	param set INAV_W_XY_GPS_V 0
-	param set INAV_W_Z_GPS_P 0
-
-	# LPE: Flow-only mode
-	param set LPE_FUSION 242
-	param set LPE_FAKE_ORIGIN 1
-
-	param set MPC_ALT_MODE 2
-fi

ROMFS/px4fmu_common/init.d-posix/1010_iris_opt_flow.post

@@ -1,3 +0,0 @@
-
-# shellcheck disable=SC2154
-mavlink stream -r 50 -s DISTANCE_SENSOR -u $udp_gcs_port_local

ROMFS/px4fmu_common/init.d-posix/1011_iris_irlock

@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (irlock)
-#
-# @type Quadrotor Wide
-#
-
-sh /etc/init.d-posix/10016_iris
-
-if [ $AUTOCNF = yes ]
-then
-	# enable fusion of landing target velocity
-	param set LTEST_MODE 1
-	param set PLD_HACC_RAD 0.1
-fi
-
-# Start up Landing Target Estimator module
-landing_target_estimator start

ROMFS/px4fmu_common/init.d-posix/1012_iris_rplidar

@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (rplidar)
-#
-# @type Quadrotor Wide
-#
-
-sh /etc/init.d-posix/10016_iris
-
-if [ $AUTOCNF = yes ]
-then
-	param set LPE_FUSION 242
-fi

ROMFS/px4fmu_common/init.d-posix/1013_iris_vision

@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Vision)
-#
-# @type Quadrotor Wide
-#
-
-sh /etc/init.d-posix/10016_iris
-
-if [ $AUTOCNF = yes ]
-then
-	# EKF2: Vision position and heading
-	param set EKF2_AID_MASK 24
-	param set EKF2_EV_DELAY 5
-
-	# INAV: trust more on the vision input
-	param set INAV_W_XY_VIS_P 9
-	param set INAV_W_Z_VIS_P 7
-	param set INAV_W_XY_GPS_P 0
-	param set INAV_W_XY_GPS_V 0
-	param set INAV_W_Z_GPS_P 0
-
-	# LPE: Vision + baro
-	param set LPE_FUSION 132
-
-	# AEQ: External heading set to use vision input
-	param set ATT_EXT_HDG_M 1
-fi

ROMFS/px4fmu_common/init.d-posix/1013_iris_vision.post

@@ -1,3 +0,0 @@
-
-# shellcheck disable=SC2154
-mavlink stream -r 30 -s ODOMETRY -u $udp_gcs_port_local

ROMFS/px4fmu_common/init.d-posix/1014_solo

@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# @name Solo
-#
-# @type Quadrotor
-#
-
-sh /etc/init.d/rc.mc_defaults
-
-if [ $AUTOCNF = yes ]
-then
-	param set MC_PITCHRATE_P 0.15
-	param set MC_ROLLRATE_P 0.15
-fi
-
-set MIXER quad_x

ROMFS/px4fmu_common/init.d-posix/1015_iris_obs_avoid

@@ -1,14 +0,0 @@
-#!/bin/sh
-#
-# @name 3DR Iris Quadrotor SITL (Obstacle Avoidance)
-#
-# @type Quadrotor Wide
-#
-
-sh /etc/init.d-posix/10016_iris
-
-if [ $AUTOCNF = yes ]
-then
-	param set COM_OBS_AVOID 1
-	param set MPC_XY_CRUISE 5.0
-fi