Navigator: Increase headroom in stack

Release v1.5.4
MPU6K: Make stop routine safe to call from any location in the startup code
2026-05-24 00:27:35 +08:00 · 2017-01-25 08:53:28 +01:00 · 2017-01-15 01:40:23 +01:00 · 2016-12-18 13:06:19 +01:00 · 2016-12-14 08:54:13 +01:00 · 2016-12-09 19:07:26 +01:00
5341 changed files with 309801 additions and 665953 deletions
@@ -1,202 +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:2021-04-29",
-            arm64: "px4io/px4-dev-aarch64:2021-04-29",
-            base: "px4io/px4-dev-base-bionic:2021-04-29",
-            nuttx: "px4io/px4-dev-nuttx-focal:2021-04-29",
-            snapdragon: "lorenzmeier/px4-dev-snapdragon:2020-04-01"
-          ]
-
-          def armhf_builds = [
-            target: ["beaglebone_blue_default", "emlid_navio2_default", "px4_raspberrypi_default", "scumaker_pilotpi_default"],
-            image: docker_images.armhf,
-            archive: false
-          ]
-
-          def arm64_builds = [
-            target: ["scumaker_pilotpi_arm64"],
-            image: docker_images.arm64,
-            archive: false
-          ]
-
-          def base_builds = [
-            target: ["px4_sitl_rtps"],
-            image: docker_images.base,
-            archive: false
-          ]
-
-          def nuttx_builds_archive = [
-            target: [
-                     "airmind_mindpx-v2_default",
-                     "ark_can-flow_canbootloader",
-                     "ark_can-flow_default",
-                     "av_x-v1_default",
-                     "bitcraze_crazyflie_default",
-                     "bitcraze_crazyflie21_default",
-                     "cuav_can-gps-v1_canbootloader",
-                     "cuav_can-gps-v1_default",
-                     "cuav_nora_default",
-                     "cuav_x7pro_default",
-                     "cubepilot_cubeorange_default",
-                     "cubepilot_cubeyellow_default",
-                     "holybro_can-gps-v1_canbootloader",
-                     "holybro_can-gps-v1_default",
-                     "holybro_durandal-v1_default",
-                     "holybro_kakutef7_default",
-                     "holybro_pix32v5_default",
-                     "modalai_fc-v1_default",
-                     "modalai_fc-v1_rtps",
-                     "mro_ctrl-zero-f7_default",
-                     "mro_ctrl-zero-f7-oem_default",
-                     "mro_ctrl-zero-h7_default",
-                     "mro_ctrl-zero-h7-oem_default",
-                     "mro_pixracerpro_default",
-                     "mro_x21-777_default",
-                     "mro_x21_default",
-                     "nxp_fmuk66-e_default",
-                     "nxp_fmuk66-e_rtps",
-                     "nxp_fmuk66-e_socketcan",
-                     "nxp_fmuk66-v3_default",
-                     "nxp_fmuk66-v3_rtps",
-                     "nxp_fmuk66-v3_socketcan",
-                     "nxp_fmurt1062-v1_default",
-                     "nxp_ucans32k146_default",
-                     "nxp_ucans32k146_canbootloader",
-                     "omnibus_f4sd_default",
-                     "px4_fmu-v2_default",
-                     "px4_fmu-v2_fixedwing",
-                     "px4_fmu-v2_multicopter",
-                     "px4_fmu-v2_rover",
-                     "px4_fmu-v3_default",
-                     "px4_fmu-v4_cannode",
-                     "px4_fmu-v4_default",
-                     "px4_fmu-v4pro_default",
-                     "px4_fmu-v5_ctrlalloc",
-                     "px4_fmu-v5_debug",
-                     "px4_fmu-v5_default",
-                     "px4_fmu-v5_fixedwing",
-                     "px4_fmu-v5_multicopter",
-                     "px4_fmu-v5_optimized",
-                     "px4_fmu-v5_rover",
-                     "px4_fmu-v5_rtps",
-                     "px4_fmu-v5_stackcheck",
-                     "px4_fmu-v5_uavcanv0periph",
-                     "px4_fmu-v5_uavcanv1",
-                     "px4_fmu-v5x_base_phy_DP83848C",
-                     "px4_fmu-v5x_default",
-                     "px4_fmu-v6u_default",
-                     "px4_fmu-v6x_default",
-                     "px4_io-v2_default",
-                     "spracing_h7extreme_default",
-                     "uvify_core_default"
-            ],
-            image: docker_images.nuttx,
-            archive: true
-          ]
-
-          def snapdragon_builds = [
-            target: ["atlflight_eagle_qurt", "atlflight_eagle_default"],
-            image: docker_images.snapdragon,
-            archive: false
-          ]
-
-          def docker_builds = [
-            armhf_builds, base_builds, nuttx_builds_archive//, 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 'ghcr.io/px4/px4-dev:2021-05-06' }
-    //   }
-    //   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: '5', 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:2020-04-01') {
-      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 -s')
-              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')
-            }
-          }
-        }
-      }
-    }
-  }
-}
@@ -1,107 +0,0 @@
---
-Checks:          '*,
-                  -android*,
-                  -bugprone-integer-division,
-                  -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-owning-memory,
-                  -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,
-                  -fuchsia-default-arguments,
-                  -fuchsia-overloaded-operator,
-                  -google-build-using-namespace,
-                  -google-explicit-constructor,
-                  -google-global-names-in-headers,
-                  -google-readability-casting,
-                  -google-readability-function-size,
-                  -google-readability-namespace-comments,
-                  -google-readability-todo,
-                  -google-runtime-int,
-                  -google-runtime-references,
-                  -hicpp-deprecated-headers,
-                  -hicpp-explicit-conversions,
-                  -hicpp-function-size,
-                  -hicpp-member-init,
-                  -hicpp-no-array-decay,
-                  -hicpp-no-assembler,
-                  -hicpp-no-malloc,
-                  -hicpp-signed-bitwise,
-                  -hicpp-special-member-functions,
-                  -hicpp-use-auto,
-                  -hicpp-use-equals-default,
-                  -hicpp-use-equals-delete,
-                  -hicpp-use-override,
-                  -hicpp-vararg,
-                  -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-pass-by-value,
-                  -modernize-return-braced-init-list,
-                  -modernize-use-auto,
-                  -modernize-use-bool-literals,
-                  -modernize-use-default-member-init,
-                  -modernize-use-equals-default,
-                  -modernize-use-equals-delete,
-                  -modernize-use-override,
-                  -modernize-use-using,
-                  -performance-inefficient-string-concatenation,
-                  -readability-avoid-const-params-in-decls,
-                  -readability-container-size-empty,
-                  -readability-else-after-return,
-                  -readability-function-size,
-                  -readability-implicit-bool-cast,
-                  -readability-implicit-bool-conversion,
-                  -readability-inconsistent-declaration-parameter-name,
-                  -readability-named-parameter,
-                  -readability-non-const-parameter,
-                  -readability-redundant-declaration,
-                  -readability-static-accessed-through-instance,
-                  -readability-static-definition-in-anonymous-namespace,
-                 '
-WarningsAsErrors: '*'
-CheckOptions:
-  - key:             google-readability-function-size.BranchThreshold
-    value:           '600'
-  - key:             google-readability-function-size.LineThreshold
-    value:           '4000'
-  - key:             google-readability-function-size.StatementThreshold
-    value:           '4000'
-...
@@ -1,42 +0,0 @@
-// For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
-{
-	"name": "px4-dev-nuttx",
-	"image": "px4io/px4-dev-nuttx-focal:2021-04-29",
-
-	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
-
-	// Set *default* container specific settings.json values on container create.
-	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
-	},
-
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"chiehyu.vscode-astyle",
-		"dan-c-underwood.arm",
-		"fredericbonnet.cmake-test-adapter",
-		"github.vscode-pull-request-github",
-		"marus25.cortex-debug",
-		"ms-azuretools.vscode-docker",
-		"ms-iot.vscode-ros",
-		"ms-python.python",
-		"ms-vscode.cmake-tools",
-		"ms-vscode.cpptools",
-		"ms-vscode.cpptools-extension-pack",
-		"redhat.vscode-yaml",
-		"streetsidesoftware.code-spell-checker",
-		"twxs.cmake",
-		"uavcan.dsdl",
-		"wholroyd.jinja",
-		"zixuanwang.linkerscript"
-	],
-
-	"containerUser": "user",
-	"containerEnv": {
-		"LOCAL_USER_ID": "${localEnv:UID}"
-	},
-
-	// Use 'forwardPorts' to make a list of ports inside the container available locally.
-	"forwardPorts": [14556],
-}
@@ -1,80 +0,0 @@
-* text=auto eol=lf
-
-*.cmake  text eol=lf
-*.c      text eol=lf
-*.cc     text eol=lf
-*.cpp    text eol=lf
-*.h      text eol=lf
-*.hh     text eol=lf
-*.hpp    text eol=lf
-*.hxx    text eol=lf
-*.S      text eol=lf
-
-*.ipynb  text eol=lf
-*.m      text eol=lf
-*.mat    binary
-*.py     text eol=lf
-
-*.java   text eol=lf
-*.jar    binary
-*.xml    text eol=lf
-
-# PX4 mixers, msgs, etc
-*.bin    binary
-*.mix    text eol=lf
-*.msg    text eol=lf
-*.config text eol=lf
-*.sdf    text eol=lf
-*.uavcan text eol=lf
-
-# NuttX
-Makefile.* text eol=lf
-*.defs   text eol=lf
-*.ld     text eol=lf
-
-*.csv    text eol=lf
-*.md     text eol=lf
-*.txt    text eol=lf
-
-# Scripts
-*.bash   text eol=lf
-*.sh     text eol=lf
-*.zsh    text eol=lf
-# These are explicitly windows files and should use crlf
-*.ps1    text eol=crlf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf
-
-# Serialisation
-*.json   text eol=lf
-*.toml   text eol=lf
-*.xml    text eol=lf
-*.yaml   text eol=lf
-*.yml    text eol=lf
-
-# Graphics
-*.png    binary
-*.jpg    binary
-*.jpeg   binary
-*.gif    binary
-*.tif    binary
-*.tiff   binary
-*.ico    binary
-*.pdf    binary
-# SVG treated as an asset (binary) by default.
-*.svg    text eol=lf
-
-# Text files where line endings should be preserved
-*.patch  -text
-
-# Archives
-*.7z     binary
-*.gz     binary
-*.tar    binary
-*.tgz    binary
-*.zip    binary
-
-# everything else
-.gitattributes text eol=lf
-.gitignore     text eol=lf
-Makefile       text eol=lf
@@ -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/master/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.
@@ -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.
@@ -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!
@@ -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!
@@ -1,15 +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, or `false` to disable
-daysUntilClose: false
-# Issues with these labels will never be considered stale
-exemptLabels:
-  - pinned
-# Label to use when marking an issue as stale
-staleLabel: stale
-# 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. Thank you for your contributions.
-# Comment to post when closing a stale issue. Set to `false` to disable
-closeComment: false
@@ -1,71 +0,0 @@
-name: Checks
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        check: [
-          "check_format",
-          "tests",
-          "tests_coverage",
-          "px4_fmu-v2_default stack_check",
-          "validate_module_configs",
-          "shellcheck_all",
-          "NO_NINJA_BUILD=1 px4_fmu-v5_default",
-          "NO_NINJA_BUILD=1 px4_sitl_default",
-          "airframe_metadata",
-          "module_documentation",
-          "parameters_metadata",
-        ]
-    container:
-      image: ghcr.io/px4/px4-dev:2021-05-06
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: tests_${{matrix.ubuntu_release}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: tests_${{matrix.ubuntu_release}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-    - name: ${{matrix.check}}
-      run: make ${{matrix.check}}
-    - name: upload coverage
-      if: contains(matrix.check, 'coverage')
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: unittests
-        file: coverage/lcov.info
@@ -1,46 +0,0 @@
-name: Clang Tidy
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-clang:2021-04-29
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: clang-tidy-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: clang-tidy-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make clang-tidy-quiet
-      run: |
-        ccache -z
-        make clang-tidy-quiet
-        ccache -s
@@ -1,53 +0,0 @@
-name: Linux Targets
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-armhf:2021-04-29
-    strategy:
-      matrix:
-        config: [
-          beaglebone_blue_default,
-          emlid_navio2_default,
-          px4_raspberrypi_default,
-          scumaker_pilotpi_default,
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: ${{matrix.config}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      run: make ${{matrix.config}}
-    - name: ccache post-run
-      run: ccache -s
@@ -1,50 +0,0 @@
-name: Linux ARM64 Targets
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: px4io/px4-dev-aarch64:2021-04-29
-    strategy:
-      matrix:
-        config: [
-          scumaker_pilotpi_arm64,
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: ${{matrix.config}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      run: make ${{matrix.config}}
-    - name: ccache post-run
-      run: ccache -s
@@ -1,55 +0,0 @@
-name: MacOS build
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: macos-10.15
-    strategy:
-      matrix:
-        config: [
-          px4_fmu-v5_default,
-          px4_sitl
-          #tests, # includes px4_sitl
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: setup
-      run: ./Tools/setup/macos.sh; ./Tools/setup/macos.sh
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: macos_${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: macos_${{matrix.config}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      run: |
-          ccache -z
-          make ${{matrix.config}}
-          ccache -s
@@ -1,138 +0,0 @@
-name: Nuttx Targets
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'github-actions'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    strategy:
-      matrix:
-        config: [
-          airmind_mindpx-v2_default,
-          ark_can-flow_canbootloader,
-          ark_can-flow_debug,
-          ark_can-flow_default,
-          av_x-v1_default,
-          bitcraze_crazyflie21_default,
-          bitcraze_crazyflie_default,
-          cuav_can-gps-v1_canbootloader,
-          cuav_can-gps-v1_debug,
-          cuav_can-gps-v1_default,
-          cuav_nora_default,
-          cuav_x7pro_default,
-          cubepilot_cubeorange_default,
-          cubepilot_cubeorange_test,
-          cubepilot_cubeyellow_default,
-          cubepilot_cubeyellow_test,
-          cubepilot_io-v2_default,
-          holybro_can-gps-v1_canbootloader,
-          holybro_can-gps-v1_debug,
-          holybro_can-gps-v1_default,
-          holybro_durandal-v1_default,
-          holybro_kakutef7_default,
-          holybro_pix32v5_default,
-          modalai_fc-v1_default,
-          modalai_fc-v1_rtps,
-          mro_ctrl-zero-f7-oem_default,
-          mro_ctrl-zero-f7_default,
-          mro_ctrl-zero-h7-oem_default,
-          mro_ctrl-zero-h7_default,
-          mro_pixracerpro_default,
-          mro_x21-777_default,
-          mro_x21_default,
-          nxp_fmuk66-e_default,
-          nxp_fmuk66-e_rtps,
-          nxp_fmuk66-e_socketcan,
-          nxp_fmuk66-v3_default,
-          nxp_fmuk66-v3_rtps,
-          nxp_fmuk66-v3_socketcan,
-          nxp_fmurt1062-v1_default,
-          nxp_ucans32k146_canbootloader,
-          nxp_ucans32k146_default,
-          omnibus_f4sd_default,
-          px4_fmu-v2_default,
-          px4_fmu-v2_fixedwing,
-          px4_fmu-v2_multicopter,
-          px4_fmu-v2_rover,
-          px4_fmu-v3_default,
-          px4_fmu-v4_cannode,
-          px4_fmu-v4_default,
-          px4_fmu-v4pro_default,
-          px4_fmu-v5_ctrlalloc,
-          px4_fmu-v5_debug,
-          px4_fmu-v5_default,
-          px4_fmu-v5_fixedwing,
-          px4_fmu-v5_multicopter,
-          px4_fmu-v5_optimized,
-          px4_fmu-v5_rover,
-          px4_fmu-v5_rtps,
-          px4_fmu-v5_stackcheck,
-          px4_fmu-v5_uavcanv0periph,
-          px4_fmu-v5_uavcanv1,
-          px4_fmu-v5x_base_phy_DP83848C,
-          px4_fmu-v5x_default,
-          px4_fmu-v6u_default,
-          px4_fmu-v6x_default,
-          px4_io-v2_default,
-          spracing_h7extreme_default,
-          uvify_core_default
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: ${{matrix.config}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      run: make ${{matrix.config}}
-    - name: make ${{matrix.config}} bloaty_compileunits
-      run: make ${{matrix.config}} bloaty_compileunits || true
-    - name: make ${{matrix.config}} bloaty_inlines
-      run: make ${{matrix.config}} bloaty_inlines || true
-    - name: make ${{matrix.config}} bloaty_segments
-      run: make ${{matrix.config}} bloaty_segments || true
-    - name: make ${{matrix.config}} bloaty_symbols
-      run: make ${{matrix.config}} bloaty_symbols || true
-    - name: make ${{matrix.config}} bloaty_templates
-      run: make ${{matrix.config}} bloaty_templates || true
-    - name: make ${{matrix.config}} bloaty_ram
-      run: make ${{matrix.config}} bloaty_ram || true
-    - name: make ${{matrix.config}} bloaty_compare_master
-      run: make ${{matrix.config}} bloaty_compare_master || true
-    - name: ccache post-run
-      run: ccache -s
-
-    - name: Upload px4 package
-      uses: actions/upload-artifact@v1
-      with:
-        name: px4_package_${{matrix.config}}
-        path: build/${{matrix.config}}/${{matrix.config}}.px4
@@ -1,61 +0,0 @@
-name: NuttX UAVCAN firmware
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    strategy:
-      matrix:
-        config: [
-          ark_can-flow_default,
-          cuav_can-gps-v1_default,
-          holybro_can-gps-v1_default,
-          #nxp_ucans32k146_default,
-          px4_fmu-v4_cannode
-          ]
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{matrix.config}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: ${{matrix.config}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.config}}
-      run: make ${{matrix.config}}
-
-    - name: ccache post-run
-      run: ccache -s
-
-    - name: Upload px4 package
-      uses: actions/upload-artifact@v2
-      with:
-        name: px4_cannode_${{matrix.config}}
-        path: build/${{matrix.config}}/*.uavcan.bin
@@ -1,31 +0,0 @@
-name: Build and publish Docker image
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'github-actions'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          platforms: linux/amd64
-          push: true
-          tags: |
-            px4/px4-dev:latest
-            ghcr.io/px4/px4-dev:latest
-
-      - name: Image digest
-        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -1,77 +0,0 @@
-name: Deploy metadata for all targets
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'release/*'
-    - 'pr-metadata-test'
-
-jobs:
-  enumerate_targets:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-    - id: set-matrix
-      run: echo "::set-output name=matrix::$(./Tools/generate_board_targets_json.py)"
-  build:
-    runs-on: ubuntu-latest
-    needs: enumerate_targets
-    strategy:
-      matrix: ${{fromJson(needs.enumerate_targets.outputs.matrix)}}
-    container: px4io/px4-dev-${{ matrix.container }}:2021-04-29
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{secrets.ACCESS_TOKEN}}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: ${{matrix.target}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: ${{matrix.target}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: make ${{matrix.target}}
-      run: make ${{matrix.target}}
-    - name: ccache post-run
-      run: ccache -s
-
-    - name: parameter metadata
-      run: |
-        make ${{matrix.target}} ver_gen
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/${{ matrix.target }} >> $GITHUB_ENV
-        cd build/${{ matrix.target }}
-        mkdir _metadata || true
-        cp parameters.* _metadata
-
-    - uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --acl public-read
-      env:
-        AWS_S3_BUCKET: 'px4-travis'
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: 'us-west-1'
-        SOURCE_DIR: 'build/${{ matrix.target }}/_metadata/'
-        DEST_DIR: 'Firmware/${{ env.version }}/${{ matrix.target }}/'
-
@@ -1,137 +0,0 @@
-name: MAVROS Mission Tests
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {vehicle: "iris",          mission: "MC_mission_box",  build_type: "RelWithDebInfo"}
-          - {vehicle: "rover",         mission: "rover_mission_1", build_type: "RelWithDebInfo"}
-          #- {vehicle: "plane",         mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
-          #- {vehicle: "plane_catapult",mission: "FW_mission_1",    build_type: "RelWithDebInfo"}
-          #- {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "Coverage"}
-          #- {vehicle: "standard_vtol", mission: "VTOL_mission_1",  build_type: "AddressSanitizer"}
-          #- {vehicle: "tailsitter",    mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}
-          #- {vehicle: "tiltrotor",     mission: "VTOL_mission_1",  build_type: "RelWithDebInfo"}
-
-    container:
-      image: px4io/px4-dev-ros-melodic:2021-04-29
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: sitl_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: sitl_tests-${{matrix.config.build_type}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-    - name: Build PX4 and sitl_gazebo
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        ccache -z
-        make px4_sitl_default
-        make px4_sitl_default sitl_gazebo
-        ccache -s
-
-    - name: Core dump settings
-      run: |
-          ulimit -c unlimited
-          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
-
-    - name: Run SITL tests
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        export
-        ./test/rostest_px4_run.sh mavros_posix_test_mission.test mission:=${{matrix.config.mission}} vehicle:=${{matrix.config.vehicle}}
-
-    - name: Look at core files
-      if: failure()
-      run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
-    - name: Upload px4 coredump
-      if: failure()
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: coredump
-        path: px4.core
-
-    - name: ecl EKF analysis
-      if: always()
-      run: ./Tools/ecl_ekf/process_logdata_ekf.py ~/.ros/log/*/*.ulg || true
-
-    - name: Upload logs to flight review
-      if: always()
-      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ~/.ros/log/*/*.ulg
-
-    - name: Upload px4 binary
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: binary
-        path: build/px4_sitl_default/bin/px4
-
-    - name: Store PX4 log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: px4_log
-        path: ~/.ros/log/*/*.ulg
-
-    - name: Store ROS log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: ros_log
-        path: ~/.ros/**/rostest-*.log
-
-    # Report test coverage
-    - name: Upload coverage
-      if: contains(matrix.config.build_type, 'Coverage')
-      run: |
-          git config --global credential.helper "" # disable the keychain credential helper
-          git config --global --add credential.helper store # enable the local store credential helper
-          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
-          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
-          mkdir -p coverage
-          lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
-    - name: Upload coverage information to Codecov
-      if: contains(matrix.config.build_type, 'Coverage')
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: mavros_mission
-        file: coverage/lcov.info
@@ -1,132 +0,0 @@
-name: MAVROS Offboard Tests
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {test_file: "mavros_posix_tests_offboard_posctl.test",    vehicle: "iris", build_type: "RelWithDebInfo"}
-          #- {test_file: "mavros_posix_tests_offboard_attctl.test",    vehicle: "iris", build_type: "RelWithDebInfo"}
-          #- {test_file: "mavros_posix_tests_offboard_rpyrt_ctl.test", vehicle: "iris", build_type: "RelWithDebInfo"}
-
-    container:
-      image: px4io/px4-dev-ros-melodic:2021-04-29
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: sitl_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: sitl_tests-${{matrix.config.build_type}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: check environment
-      run: |
-          export
-          ulimit -a
-    - name: Build PX4 and sitl_gazebo
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        ccache -z
-        make px4_sitl_default
-        make px4_sitl_default sitl_gazebo
-        ccache -s
-
-    - name: Core dump settings
-      run: |
-          ulimit -c unlimited
-          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
-
-    - name: Run SITL tests
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-        export
-        ./test/rostest_px4_run.sh ${{matrix.config.test_file}} vehicle:=${{matrix.config.vehicle}}
-
-    - name: Look at core files
-      if: failure()
-      run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
-    - name: Upload px4 coredump
-      if: failure()
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: coredump
-        path: px4.core
-
-    - name: ecl EKF analysis
-      if: always()
-      run: ./Tools/ecl_ekf/process_logdata_ekf.py ~/.ros/log/*/*.ulg || true
-
-    - name: Upload logs to flight review
-      if: always()
-      run: ./Tools/upload_log.py -q --description "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID}" --feedback "${GITHUB_WORKFLOW} ${GITHUB_RUN_ID} ${GITHUB_REPOSITORY} ${GITHUB_REF}" --source CI ~/.ros/log/*/*.ulg
-
-    - name: Upload px4 binary
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: binary
-        path: build/px4_sitl_default/bin/px4
-
-    - name: Store PX4 log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: px4_log
-        path: ~/.ros/log/*/*.ulg
-
-    - name: Store ROS log
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: ros_log
-        path: ~/.ros/**/rostest-*.log
-
-    # Report test coverage
-    - name: Upload coverage
-      if: contains(matrix.config.build_type, 'Coverage')
-      run: |
-          git config --global credential.helper "" # disable the keychain credential helper
-          git config --global --add credential.helper store # enable the local store credential helper
-          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
-          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
-          mkdir -p coverage
-          lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
-    - name: Upload coverage information to Codecov
-      if: contains(matrix.config.build_type, 'Coverage')
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: mavros_offboard
-        file: coverage/lcov.info
@@ -1,119 +0,0 @@
-name: Metadata
-
-on:
-  push:
-    branches:
-    - 'master'
-    - 'release/*'
-    - 'pr-metadata-test'
-
-jobs:
-
-  airframe:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: airframe metadata
-      run: |
-        make airframe_metadata
-        cd build/px4_sitl_default/docs
-        ls -ls *
-      # TODO: deploy to userguide gitbook and s3
-
-  module:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: module documentation
-      run: |
-        make module_documentation
-        cd build/px4_sitl_default/docs
-        ls -ls *
-      # TODO: deploy to userguide gitbook and s3
-
-  parameter:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: parameter metadata
-      run: |
-        make parameters_metadata
-        ./src/lib/version/get_git_tag_or_branch_version.sh build/px4_sitl_default >> $GITHUB_ENV
-
-    - uses: jakejarvis/s3-sync-action@master
-      with:
-        args: --acl public-read
-      env:
-        AWS_S3_BUCKET: 'px4-travis'
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        AWS_REGION: 'us-west-1'
-        SOURCE_DIR: 'build/px4_sitl_default/docs/'
-        DEST_DIR: 'Firmware/${{ env.version }}/_general/'
-
-  uorb_graph:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: uORB graph
-      run: |
-        make uorb_graphs
-        cd Tools/uorb_graph
-        ls -ls *
-      # TODO: deploy graph_px4_sitl.json to S3 px4-travis:Firmware/master/
-
-  micrortps_agent:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: microRTPS agent
-      run: |
-        make px4_sitl_rtps
-        git clone https://github.com/PX4/micrortps_agent.git
-        cp -R build/px4_sitl_rtps/src/modules/micrortps_bridge/micrortps_agent/* micrortps_agent
-
-  ROS_msgs:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: PX4 ROS msgs
-      run: |
-        git clone https://github.com/PX4/px4_msgs.git
-        python3 msg/tools/uorb_to_ros_msgs.py msg/ px4_msgs/msg/
-
-  ROS2_bridge:
-    runs-on: ubuntu-latest
-    container: ghcr.io/px4/px4-dev:2021-05-06
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: PX4 ROS2 bridge
-      run: |
-        git clone https://github.com/PX4/px4_ros_com.git
-        ./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
@@ -1,25 +0,0 @@
-name: Python CI Checks
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-    - name: Install Python3
-      run: sudo apt-get install python3 python3-setuptools python3-pip -y
-    - name: Install tools
-      run: pip3 install --user mypy flake8
-    - name: Check MAVSDK test scripts with mypy
-      run: $HOME/.local/bin/mypy --strict test/mavsdk_tests/*.py
-    - name: Check MAVSDK test scripts with flake8
-      run: $HOME/.local/bin/flake8 test/mavsdk_tests/*.py
@@ -1,132 +0,0 @@
-name: SITL Tests
-
-on:
-  push:
-    branches:
-    - 'master'
-  pull_request:
-    branches:
-    - '*'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        config:
-          - {latitude:  "59.617693", longitude: "-151.145316", altitude:  "48", build_type: "RelWithDebInfo", model: "iris"          } # Alaska
-          - {latitude: "-38.071235", longitude:  "145.281220", altitude:  "31", build_type: "RelWithDebInfo", model: "standard_vtol" } # Australia
-          - {latitude:  "29.660316", longitude:  "-82.316658", altitude:  "30", build_type: "RelWithDebInfo", model: "tailsitter"    } # Florida
-          - {latitude:  "47.397742", longitude:    "8.545594", altitude: "488", build_type: "Coverage",       model: "standard_vtol" } # Zurich
-    container:
-      image: px4io/px4-dev-simulation-focal:2021-04-29
-      options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
-    steps:
-    - uses: actions/checkout@v1
-      with:
-        token: ${{ secrets.ACCESS_TOKEN }}
-
-    - name: Download MAVSDK
-      run: wget "https://github.com/mavlink/MAVSDK/releases/download/v$(cat test/mavsdk_tests/MAVSDK_VERSION)/mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
-    - name: Install MAVSDK
-      run: dpkg -i "mavsdk_$(cat test/mavsdk_tests/MAVSDK_VERSION)_ubuntu20.04_amd64.deb"
-
-    - name: Prepare ccache timestamp
-      id: ccache_cache_timestamp
-      shell: cmake -P {0}
-      run: |
-        string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-        message("::set-output name=timestamp::${current_date}")
-    - name: ccache cache files
-      uses: actions/cache@v2
-      with:
-        path: ~/.ccache
-        key: sitl_tests-${{matrix.config.build_type}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
-        restore-keys: sitl_tests-${{matrix.config.build_type}}-ccache-
-    - name: setup ccache
-      run: |
-          mkdir -p ~/.ccache
-          echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
-          echo "compression_level = 5" >> ~/.ccache/ccache.conf
-          echo "max_size = 100M" >> ~/.ccache/ccache.conf
-          ccache -s
-          ccache -z
-
-    - name: check environment
-      env:
-        PX4_HOME_LAT: ${{matrix.config.latitude}}
-        PX4_HOME_LON: ${{matrix.config.longitude}}
-        PX4_HOME_ALT: ${{matrix.config.altitude}}
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: |
-          export
-          ulimit -a
-    - name: Build PX4
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: make px4_sitl_default
-    - name: ccache post-run px4/firmware
-      run: ccache -s
-    - name: Build SITL Gazebo
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: make px4_sitl_default sitl_gazebo
-    - name: ccache post-run sitl_gazebo
-      run: ccache -s
-    - name: Build MAVSDK tests
-      env:
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-        DONT_RUN: 1
-      run: make px4_sitl_default gazebo mavsdk_tests
-    - name: ccache post-run mavsdk_tests
-      run: ccache -s
-
-    - name: Core dump settings
-      run: |
-          ulimit -c unlimited
-          echo "`pwd`/%e.core" > /proc/sys/kernel/core_pattern
-
-    - name: Run SITL tests
-      env:
-        PX4_HOME_LAT: ${{matrix.config.latitude}}
-        PX4_HOME_LON: ${{matrix.config.longitude}}
-        PX4_HOME_ALT: ${{matrix.config.altitude}}
-        PX4_CMAKE_BUILD_TYPE: ${{matrix.config.build_type}}
-      run: test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 --abort-early --model ${{matrix.config.model}} --upload test/mavsdk_tests/configs/sitl.json
-
-    - name: Look at core files
-      if: failure()
-      run: gdb build/px4_sitl_default/bin/px4 px4.core -ex "thread apply all bt" -ex "quit"
-    - name: Upload px4 coredump
-      if: failure()
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: coredump
-        path: px4.core
-
-    - name: Upload px4 binary
-      if: failure()
-      uses: actions/upload-artifact@v2-preview
-      with:
-        name: binary
-        path: build/px4_sitl_default/bin/px4
-
-    # Report test coverage
-    - name: Upload coverage
-      if: contains(matrix.config.build_type, 'Coverage')
-      run: |
-          git config --global credential.helper "" # disable the keychain credential helper
-          git config --global --add credential.helper store # enable the local store credential helper
-          echo "https://x-access-token:${{ secrets.ACCESS_TOKEN }}@github.com" >> ~/.git-credentials # add credential
-          git config --global url."https://github.com/".insteadof git@github.com: # credentials add credential
-          mkdir -p coverage
-          lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
-    - name: Upload coverage information to Codecov
-      if: contains(matrix.config.build_type, 'Coverage')
-      uses: codecov/codecov-action@v1
-      with:
-        token: ${{ secrets.CODECOV_TOKEN }}
-        flags: mavsdk
-        file: coverage/lcov.info
@@ -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
-
@@ -1,3 +1,8 @@
+*.d
+!ROMFS/*/*.d
+!ROMFS/*/*/*.d
+!ROMFS/*/*/*/*.d
+*.px4log
 *.dSYM
 *.o
 *.gch
@@ -8,20 +13,30 @@
 .cproject
 .DS_Store
 .gdbinit
-.gdb_history
 .project
 .settings
 .swp
 .~lock.*
+Archives/*
+Build/*
 Testing/
-Packages/*
 build/*
 build_*/
+core
 cscope.out
 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
@@ -31,11 +46,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
@@ -47,64 +70,10 @@ GTAGS
 *.files
 *.includes

+# uavcan firmware
+ROMFS/px4fmu_common/uavcan/
+vectorcontrol/
+
+
 # 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.*
-
-# KDevelop ignores
-.kdev4/*
-*.kdev4
-
-# cmake in tree (ninja)
-.ninja_deps
-.ninja_log
-bin/
-build.ninja
-cmake_install.cmake
-CMakeCache.txt
-CMakeFiles
-compile_commands.json
-CPackConfig.cmake
-CPackSourceConfig.cmake
-CTestTestfile.cmake
-external/
-rules.ninja
-
-# in tree build
-**/*.a
-**/*.px4mod
-**/*.stamp
-/coverage*
-/functional-*
-/generated_params/
-/googletest-*/
-/logs
-/mavsdk_tests
-/test_mixer_multirotor
-/unit-*
-/uORB/
-DartConfiguration.tcl
-msg/tmp/
-msg/topics_sources/
-platforms/posix/apps.cpp
-platforms/posix/apps.h
-src/lib/version/build_git_version.h
-src/modules/simulator/simulator_config.h
-src/systemcmds/topic_listener/listener_generated.cpp
-
-# SITL
-dataman
-eeprom/
@@ -1,69 +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/libuavcan.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/PX4-SITL_gazebo.git
-	branch = master
+	url = https://github.com/PX4/sitl_gazebo.git
+[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/PX4-Matrix.git
-	branch = master
+	url = https://github.com/PX4/Matrix.git
+[submodule "src/lib/DriverFramework"]
+	path = src/lib/DriverFramework
+	url = https://github.com/PX4/DriverFramework.git
 [submodule "src/lib/ecl"]
 	path = src/lib/ecl
-	url = https://github.com/PX4/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
+	url = https://github.com/PX4/ecl.git
+[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/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 = master
-[submodule "platforms/nuttx/NuttX/nuttx"]
-	path = platforms/nuttx/NuttX/nuttx
-	url = https://github.com/PX4/NuttX.git
-	branch = px4_firmware_nuttx-10.0.0+
-[submodule "platforms/nuttx/NuttX/apps"]
-	path = platforms/nuttx/NuttX/apps
-	url = https://github.com/PX4/NuttX-apps.git
-	branch = px4_firmware_nuttx-10.0.0+
-[submodule "platforms/qurt/dspal"]
-	path = platforms/qurt/dspal
-	url = https://github.com/ATLFlight/dspal.git
-[submodule "Tools/flightgear_bridge"]
-	path = Tools/flightgear_bridge
-	url = https://github.com/PX4/PX4-FlightGear-Bridge.git
-[submodule "Tools/jsbsim_bridge"]
-	path = Tools/jsbsim_bridge
-	url = https://github.com/PX4/px4-jsbsim-bridge.git
-[submodule "src/drivers/uavcan_v1/libcanard"]
-	path = src/drivers/uavcan_v1/libcanard
-	url = https://github.com/UAVCAN/libcanard.git
-[submodule "src/drivers/uavcan_v1/public_regulated_data_types"]
-	path = src/drivers/uavcan_v1/public_regulated_data_types
-	url = https://github.com/UAVCAN/public_regulated_data_types.git
-[submodule "src/drivers/uavcannode_gps_demo/public_regulated_data_types"]
-	path = src/drivers/uavcannode_gps_demo/public_regulated_data_types
-	url = https://github.com/UAVCAN/public_regulated_data_types.git
-[submodule "src/drivers/uavcannode_gps_demo/libcanard"]
-	path = src/drivers/uavcannode_gps_demo/libcanard
-	url = https://github.com/UAVCAN/libcanard.git
-[submodule "src/drivers/uavcan_v1/legacy_data_types"]
-	path = src/drivers/uavcan_v1/legacy_data_types
-	url = https://github.com/px4/public_regulated_data_types/
-	branch = legacy
+	url = https://github.com/PX4/GpsDrivers.git
@@ -1,35 +1,136 @@
+# Build and autotest script for PX4 Firmware
+# http://travis-ci.org
+
 language: cpp

 git:
-  depth: 100
-  submodules: false
+  depth: 1000

 matrix:
  fast_finish: true
  include:
    - os: linux
-      dist: xenial
-      # In order to stay under the coverity rate limit, we only run this weekly
-      # and not on push which is configured in travis-ci settings.
-      if: branch = master
+      sudo: required
+      env: GCC_VER=4.9 DOCKER_REPO="px4io/px4-dev-base:2016-10-20"
+      services:
+        - docker
+    - os: osx
+      sudo: true
+      osx_image: xcode8
+      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 CI=true -e GIT_SUBMODULES_ARE_EVIL=1 -w=`pwd` --user=$UID -it ${DOCKER_REPO} /bin/bash -c "make check_qgc_firmware VECTORCONTROL=0";
+    elif [ "${TRAVIS_OS_NAME}" = "osx" ]; then
+      make tests;
+    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:
+  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
+         make package_firmware && mkdir s3deploy-archive && cp Firmware.zip s3deploy-archive/
+      && 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/;
+    fi
+  - if [[ "${TRAVIS_OS_NAME}" = "linux" && "$GCC_VER" == "4.9" ]]; 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.9
+
+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:
+    rooms:
+      - secure: "QKw73Zel/s3JAbe/7XyO9tPnJwiiGFpYzSjdR8lG3tYFjRdXZnhxG4c+G7bkgkaPTS4Hult33VXE3kcEqOI7+C+eRwRlZhDfL0knQbXVCxjcLjzmUFdoPOwurlgZDw66PFWCi5tZcLKSRo3u4U8ibT4WKi3jm9sDSyOcfBAucMU="
+    on_pull_requests: false
+    on_success: never  # options: [always|never|change] default: always
+    on_failure: never  # options: [always|never|change] default: always
@@ -1,11 +0,0 @@
-.cortex-debug.peripherals.state.json
-.cortex-debug.registers.state.json
-compile_commands.json
-
-# generated by cmake
-launch.json
-
-# C/C++ extension does some local caching in this folder
-ipch/
-
-browse.vc.db*
@@ -1,16 +0,0 @@
-{
-    "configurations": [
-        {
-            "name": "PX4",
-            "includePath": [
-                "${workspaceFolder}/**"
-            ],
-            "defines": [],
-            "macFrameworkPath": [],
-            "configurationProvider": "ms-vscode.cmake-tools",
-            "cppStandard": "c++14",
-            "cStandard": "c11"
-        }
-    ],
-    "version": 4
-}
@@ -1,5 +0,0 @@
-[
-	{
-		"name": "PX4 detect"
-	}
-]
@@ -1,153 +0,0 @@
-CONFIG:
-  default: px4_sitl_default
-  choices:
-    px4_sitl_default:
-      short: px4_sitl
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_default
-    px4_sitl_replay:
-      short: px4_sitl_replay
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_replay
-    px4_sitl_test:
-      short: px4_sitl_test
-      buildType: RelWithDebInfo
-      settings:
-        CONFIG: px4_sitl_test
-    px4_io-v2_default:
-      short: px4_io-v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_io-v2_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
-    px4_fmu-v5x_default:
-      short: px4_fmu-v5x
-      buildType: MinSizeRel
-      settings:
-        CONFIG: px4_fmu-v5x_default
-    airmind_mindpx-v2_default:
-      short: airmind_mindpx-v2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: airmind_mindpx-v2_default
-    ark_can-flow_default:
-      short: ark_can-flow_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-flow_default
-    ark_can-flow_canbootloader:
-      short: ark_can-flow_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: ark_can-flow_canbootloader
-    av_x-v1_default:
-      short: av_x-v1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: av_x-v1_default
-    bitcraze_crazyflie_default:
-      short: bitcraze_crazyflie
-      buildType: MinSizeRel
-      settings:
-        CONFIG: bitcraze_crazyflie_default
-    cuav_can-gps-v1_default:
-      short: cuav_can-gps-v1_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_can-gps-v1_default
-    cuav_can-gps-v1_canbootloader:
-      short: cuav_can-gps-v1_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_can-gps-v1_canbootloader
-    cuav_nora_default:
-      short: cuav_nora
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_nora_default
-    cuav_x7pro_default:
-      short: cuav_x7pro
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cuav_x7pro_default
-    cubepilot_cubeorange_test:
-      short: cubepilot_cubeorange
-      buildType: MinSizeRel
-      settings:
-        CONFIG: cubepilot_orange_test
-    emlid_navio2_default:
-      short: emlid_navio2
-      buildType: MinSizeRel
-      settings:
-        CONFIG: emlid_navio2_default
-    holybro_can-gps-v1_canbootloader:
-      short: holybro_can-gps-v1_canbootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: holybro_can-gps-v1_canbootloader
-    holybro_can-gps-v1_default:
-      short: holybro_can-gps-v1_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: holybro_can-gps-v1_default
-    holybro_durandal-v1_default:
-      short: holybro_durandal-v1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: holybro_durandal-v1_default
-    modalai_fc-v1_default:
-      short: modalai_fc-v1
-      buildType: MinSizeRel
-      settings:
-        CONFIG: modalai_fc-v1_default
-    mro_ctrl-zero-f7_default:
-      short: mro_ctrl-zero-f7
-      buildType: MinSizeRel
-      settings:
-        CONFIG: mro_ctrl-zero-f7_default
-    mro_pixracerpro_bootloader:
-      short: mro_pixracerpro_bootloader
-      buildType: MinSizeRel
-      settings:
-        CONFIG: mro_pixracerpro_bootloader
-    mro_pixracerpro_default:
-      short: mro_pixracerpro_default
-      buildType: MinSizeRel
-      settings:
-        CONFIG: mro_pixracerpro_default
-    mro_x21-777_default:
-      short: mro_x2.1-777
-      buildType: MinSizeRel
-      settings:
-        CONFIG: mro_x21-777_default
-    nxp_fmuk66-v3_default:
-      short: nxp_fmuk66-v3
-      buildType: MinSizeRel
-      settings:
-        CONFIG: nxp_fmuk66-v3_default
@@ -1,23 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "chiehyu.vscode-astyle",
-        "dan-c-underwood.arm",
-        "fredericbonnet.cmake-test-adapter",
-        "github.vscode-pull-request-github",
-        "marus25.cortex-debug",
-        "ms-azuretools.vscode-docker",
-        "ms-iot.vscode-ros",
-        "ms-python.python",
-        "ms-vscode.cmake-tools",
-        "ms-vscode.cpptools",
-        "ms-vscode.cpptools-extension-pack",
-        "redhat.vscode-yaml",
-        "streetsidesoftware.code-spell-checker",
-        "twxs.cmake",
-        "uavcan.dsdl",
-        "wholroyd.jinja",
-        "zixuanwang.linkerscript"
-    ]
-}
@@ -1,141 +0,0 @@
-{
-        "astyle.astylerc": "${workspaceFolder}/Tools/astyle/astylerc",
-        "astyle.c.enable": true,
-        "astyle.cpp.enable": true,
-        "breadcrumbs.enabled": true,
-        "C_Cpp.autoAddFileAssociations": false,
-        "C_Cpp.clang_format_fallbackStyle": "none",
-        "C_Cpp.default.browse.limitSymbolsToIncludedHeaders": true,
-        "C_Cpp.default.cppStandard": "c++14",
-        "C_Cpp.default.cStandard": "c11",
-        "C_Cpp.formatting": "Disabled",
-        "C_Cpp.intelliSenseEngine": "Default",
-        "C_Cpp.vcpkg.enabled": false,
-        "C_Cpp.workspaceParsingPriority": "low",
-        "cmake.buildBeforeRun": true,
-        "cmake.buildDirectory": "${workspaceFolder}/build/${variant:CONFIG}",
-        "cmake.buildTask": true,
-        "cmake.configureOnOpen": true,
-        "cmake.ctest.parallelJobs": 1,
-        "cmake.skipConfigureIfCachePresent": true,
-        "cmakeExplorer.buildDir": "${workspaceFolder}/build/px4_sitl_test",
-        "cmakeExplorer.parallelJobs": 1,
-        "cmakeExplorer.suiteDelimiter": "-",
-        "cortex-debug.enableTelemetry": false,
-        "cSpell.allowCompoundWords": true,
-        "cSpell.diagnosticLevel": "Hint",
-        "cSpell.showStatus": false,
-        "cSpell.words": [
-                "acro",
-                "nuttx",
-                "esc"
-        ],
-        "debug.toolBarLocation": "docked",
-        "editor.acceptSuggestionOnEnter": "off",
-        "editor.defaultFormatter": "chiehyu.vscode-astyle",
-        "editor.dragAndDrop": false,
-        "editor.insertSpaces": false,
-        "editor.minimap.maxColumn": 120,
-        "editor.minimap.renderCharacters": false,
-        "editor.minimap.showSlider": "always",
-        "editor.suggest.localityBonus": true,
-        "editor.tabSize": 8,
-        "editor.wordWrapColumn": 120,
-        "explorer.openEditors.visible": 0,
-        "files.insertFinalNewline": true,
-        "files.trimTrailingWhitespace": true,
-        "files.watcherExclude": {
-                "**/build/**": true
-        },
-        "git.detectSubmodulesLimit": 20,
-        "git.ignoreLimitWarning": true,
-        "githubPullRequests.defaultMergeMethod": "squash",
-        "githubPullRequests.telemetry.enabled": false,
-        "files.associations": {
-                "*.jinja": "jinja",
-                "algorithm": "cpp",
-                "array": "cpp",
-                "atomic": "cpp",
-                "bitset": "cpp",
-                "cctype": "cpp",
-                "cfenv": "cpp",
-                "chrono": "cpp",
-                "cinttypes": "cpp",
-                "clocale": "cpp",
-                "cmath": "cpp",
-                "codecvt": "cpp",
-                "complex": "cpp",
-                "condition_variable": "cpp",
-                "csignal": "cpp",
-                "cstdarg": "cpp",
-                "cstddef": "cpp",
-                "cstdint": "cpp",
-                "cstdio": "cpp",
-                "cstdlib": "cpp",
-                "cstring": "cpp",
-                "ctime": "cpp",
-                "cwchar": "cpp",
-                "cwctype": "cpp",
-                "deque": "cpp",
-                "exception": "cpp",
-                "forward_list": "cpp",
-                "fstream": "cpp",
-                "functional": "cpp",
-                "future": "cpp",
-                "hash_map": "cpp",
-                "hash_set": "cpp",
-                "initializer_list": "cpp",
-                "iomanip": "cpp",
-                "iosfwd": "cpp",
-                "iostream": "cpp",
-                "istream": "cpp",
-                "iterator": "cpp",
-                "limits": "cpp",
-                "list": "cpp",
-                "map": "cpp",
-                "memory": "cpp",
-                "memory_resource": "cpp",
-                "mutex": "cpp",
-                "new": "cpp",
-                "numeric": "cpp",
-                "optional": "cpp",
-                "ostream": "cpp",
-                "random": "cpp",
-                "ratio": "cpp",
-                "regex": "cpp",
-                "set": "cpp",
-                "sstream": "cpp",
-                "stdexcept": "cpp",
-                "streambuf": "cpp",
-                "string": "cpp",
-                "string_view": "cpp",
-                "strstream": "cpp",
-                "system_error": "cpp",
-                "thread": "cpp",
-                "tuple": "cpp",
-                "type_traits": "cpp",
-                "typeindex": "cpp",
-                "typeinfo": "cpp",
-                "unordered_map": "cpp",
-                "unordered_set": "cpp",
-                "utility": "cpp",
-                "valarray": "cpp",
-                "variant": "cpp",
-                "vector": "cpp"
-        },
-        "search.exclude": {
-                "${workspaceFolder}/build": true
-        },
-        "search.showLineNumbers": true,
-        "telemetry.enableTelemetry": false,
-        "terminal.integrated.copyOnSelection": true,
-        "terminal.integrated.rightClickBehavior": "paste",
-        "terminal.integrated.scrollback": 5000,
-        "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
-        "workbench.editor.highlightModifiedTabs": true,
-        "workbench.enableExperiments": false,
-        "workbench.settings.enableNaturalLanguageSearch": false,
-        "yaml.schemas": {
-                "${workspaceFolder}/validation/module_schema.yaml": "${workspaceFolder}/src/modules/*/module.yaml"
-        }
-}
@@ -1,373 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "type": "shell",
-            "command": "/bin/bash",
-            "args": [
-                "-c",
-                "${command:cmake.tasksBuildCommand}"
-            ],
-            "options": {
-                "cwd": "${command:cmake.buildDirectory}"
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true,
-            },
-            "problemMatcher": {
-                "base": "$gcc",
-                "fileLocation": ["relative", "${command:cmake.buildDirectory}"]
-            },
-            "presentation":{
-                "echo": false,
-                "showReuseMessage": false,
-                "clear": true,
-                "panel": "shared",
-                "group": "build"
-            }
-        },
-        {
-            "label": "test",
-            "type": "shell",
-            "command": "make tests",
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "group": {
-                "kind": "test",
-                "isDefault": true,
-            },
-            "presentation":{
-                "echo": true,
-                "showReuseMessage": false,
-                "clear": false,
-                "panel": "shared",
-                "group": "test"
-            }
-        },
-        {
-            "label": "jmavsim build",
-            "type": "shell",
-            "command": "ant create_run_jar copy_res",
-            "options": {
-                "cwd": "${workspaceFolder}/Tools/jMAVSim"
-            },
-            "problemMatcher": [],
-            "presentation":{
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false,
-            }
-        },
-        {
-            "label": "jmavsim",
-            "type": "shell",
-            "dependsOn": "jmavsim build",
-            "command": "java -Djava.ext.dirs= -jar jmavsim_run.jar -r 250 -lockstep -tcp localhost:4560 -qgc",
-            "options": {
-                "cwd": "${workspaceFolder}/Tools/jMAVSim/out/production",
-                "env": {
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "isBackground": true,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "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}')",
-            "presentation": {
-                "echo": false,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "gazebo build",
-            "type": "shell",
-            "command": "make px4_sitl_default sitl_gazebo",
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "problemMatcher": [],
-            "presentation":{
-                "echo": true,
-                "reveal": "always",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false,
-            }
-        },
-        {
-            "label": "gazebo start",
-            "type": "shell",
-            "dependsOn": "gazebo build",
-            "options": {
-                "cwd": "${workspaceFolder}",
-                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "command": "gzserver --verbose ${workspaceFolder}/Tools/sitl_gazebo/worlds/${input:gazeboWorld}.world",
-            "isBackground": true,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
-        {
-            "label": "gazebo",
-            "type": "shell",
-            "dependsOn": "gazebo start",
-            "options": {
-                "cwd": "${workspaceFolder}",
-                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "command": "gz model --verbose --spawn-file=${workspaceFolder}/Tools/sitl_gazebo/models/${input:vehicleModel}/${input:vehicleModel}.sdf --model-name=${input:vehicleModel} -x 1.01 -y 0.98 -z 0.83",
-            "isBackground": false,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
-        {
-            "label": "gazebo client",
-            "type": "shell",
-            "dependsOn": "gazebo build",
-            "options": {
-                "cwd": "${workspaceFolder}",
-                "env": {
-                    "GAZEBO_PLUGIN_PATH": "${workspaceFolder}/build/px4_sitl_default/build_gazebo",
-                    "GAZEBO_MODEL_PATH": "${workspaceFolder}/Tools/sitl_gazebo/models",
-                    "PX4_SIM_SPEED_FACTOR": "1"
-                }
-            },
-            "command": "gzclient --verbose",
-            "isBackground": true,
-            "presentation": {
-                "echo": true,
-                "reveal": "never",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [
-                {
-                    "pattern": [
-                        {
-                            "regexp": ".",
-                            "file": 1,
-                            "location": 2,
-                            "message": 3
-                        }
-                    ],
-                    "background": {
-                        "activeOnStart": true,
-                        "beginsPattern": ".",
-                        "endsPattern": ".",
-                    }
-                }
-            ]
-        },
-        {
-            "label": "gazebo kill",
-            "type": "shell",
-            "command": "killall gzserver",
-            "presentation": {
-                "echo": true,
-                "reveal": "silent",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [],
-            "dependsOn":["px4_sitl_cleanup"]
-        },
-        {
-            "label": "px4_sitl_cleanup",
-            "type": "shell",
-            "command": "rm -rfv /tmp/px4*",
-            "presentation": {
-                "echo": true,
-                "reveal": "silent",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": [],
-            "dependsOn":["px4_kill"]
-        },
-        {
-            "label": "px4_kill",
-            "type": "shell",
-            "command": "killall px4 || true",
-            "presentation": {
-                "echo": true,
-                "reveal": "silent",
-                "focus": false,
-                "panel": "shared",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "mavlink shell",
-            "type": "shell",
-            "command": "./Tools/mavlink_shell.py",
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": true,
-                "panel": "new",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": []
-        },
-        {
-            "label": "miniterm.py",
-            "type": "shell",
-            "command": "miniterm.py --raw - 57600",
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "presentation": {
-                "echo": true,
-                "reveal": "always",
-                "focus": true,
-                "panel": "new",
-                "showReuseMessage": false,
-                "clear": false
-            },
-            "problemMatcher": []
-        }
-    ],
-    "inputs": [
-        {
-            "type": "pickString",
-            "id": "vehicleModel",
-            "description": "gazebo model",
-            "options": [
-              "iris",
-              "typhoon_h480",
-              "plane",
-              "plane_catapult",
-              "plane_lidar",
-              "standard_vtol",
-              "tailsitter",
-              "tiltrotor",
-              "r1_rover",
-              "boat"
-            ],
-            "default": "iris"
-        },
-        {
-            "type": "pickString",
-            "id": "gazeboWorld",
-            "description": "gazebo world",
-            "options": [
-                "baylands",
-                "empty",
-                "ksql_airport",
-                "mcmillan_airfield",
-                "sonoma_raceway",
-                "warehouse",
-                "windy",
-                "yosemite"
-            ],
-            "default": "empty"
-        }
-    ]
-}
@@ -51,8 +51,8 @@ flags = [
 # headers will be compiled as C headers. You don't want that so ALWAYS specify
 # a "-std=<something>".
 # For a C project, you would set this to something like 'c99' instead of
-# 'c++14'.
-'-std=c++14',
+# 'c++11'.
+'-std=c++11',
 # ...and the same thing goes for the magic -x option which specifies the
 # language that the files to be compiled are written in. This is mostly
 # relevant for c++ headers.
@@ -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',
@@ -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,178 +110,125 @@
 # ---------------------------------------------------------------------------
 #
 # * 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)
-include(px4_parse_function_args)
-
-#=============================================================================
-# git
-#
-include(px4_git)
-
 execute_process(
-	COMMAND git describe --exclude ext/* --always --tags
-	OUTPUT_VARIABLE PX4_GIT_TAG
-	OUTPUT_STRIP_TRAILING_WHITESPACE
+	COMMAND Tools/check_submodules.sh
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
 	)
-message(STATUS "PX4 version: ${PX4_GIT_TAG}")

-define_property(GLOBAL PROPERTY PX4_MODULE_LIBRARIES
-                 BRIEF_DOCS "PX4 module libs"
-                 FULL_DOCS "List of all PX4 module libraries"
-                 )
+# Use clang
+#SET (CMAKE_C_COMPILER /usr/bin/clang-3.6)
+#SET (CMAKE_CXX_COMPILER /usr/bin/clang++-3.6)

-define_property(GLOBAL PROPERTY PX4_MODULE_PATHS
-                 BRIEF_DOCS "PX4 module paths"
-                 FULL_DOCS "List of paths to all PX4 modules"
-                 )
+#=============================================================================
+# parameters
+#
+
+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")
+set(EXTERNAL_MODULES_LOCATION "" CACHE STRING "External modules source location")

 #=============================================================================
 # 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)
+message(STATUS "${target_name}")

-include(px4_config)
-include(px4_add_board)
-include(${PX4_CONFIG_FILE})
-message(STATUS "PX4 config: ${PX4_CONFIG}")
-message(STATUS "PX4 platform: ${PX4_PLATFORM}")
+# Define GNU standard installation directories
+include(GNUInstallDirs)

-if(${PX4_PLATFORM} STREQUAL "posix")
-	if(ENABLE_LOCKSTEP_SCHEDULER)
-		add_definitions(-DENABLE_LOCKSTEP_SCHEDULER)
-		message(STATUS "PX4 lockstep: enabled")
-	else()
-		message(STATUS "PX4 lockstep: disabled")
+# Add support for external project building
+include(ExternalProject)
+
+# Setup install paths
+if(NOT CMAKE_INSTALL_PREFIX)
+	if (${OS} STREQUAL "posix")
+		set(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "Install path prefix" FORCE)
 	endif()
 endif()
+message(STATUS "CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")

-# external modules
-set(EXTERNAL_MODULES_LOCATION "" CACHE STRING "External modules source location")
+list(APPEND CMAKE_MODULE_PATH "${PX4_SOURCE_DIR}/cmake")
+message(STATUS "cmake module path: ${CMAKE_MODULE_PATH}")
+set(config_module "configs/${CONFIG}")
+include(${config_module})

-if(NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
-	get_filename_component(EXTERNAL_MODULES_LOCATION "${EXTERNAL_MODULES_LOCATION}" ABSOLUTE)
-endif()
+# cmake modules
+include(ExternalProject)

-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")
+# 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()
-
-	set(CMAKE_BUILD_TYPE ${PX4_BUILD_TYPE} CACHE STRING "Build type" FORCE)
-endif()
-
-if((CMAKE_BUILD_TYPE STREQUAL "Debug") OR (CMAKE_BUILD_TYPE STREQUAL "Coverage"))
-	set(MAX_CUSTOM_OPT_LEVEL -O0)
-elseif(CMAKE_BUILD_TYPE MATCHES "Sanitizer")
-	set(MAX_CUSTOM_OPT_LEVEL -O1)
-elseif(CMAKE_BUILD_TYPE MATCHES "Release")
-	set(MAX_CUSTOM_OPT_LEVEL -O3)
-else()
-	if(px4_constrained_flash_build)
-		set(MAX_CUSTOM_OPT_LEVEL -Os)
-	else()
-		set(MAX_CUSTOM_OPT_LEVEL -O2)
+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()

-set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug;Release;RelWithDebInfo;MinSizeRel;Coverage;AddressSanitizer;UndefinedBehaviorSanitizer")
-message(STATUS "cmake build type: ${CMAKE_BUILD_TYPE}")
+# force static lib build
+set(BUILD_SHARED_LIBS OFF)

 #=============================================================================
 # 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 5)
+set(version_patch 0)
+set(version "${version_major}.${version_minor}.${version_patch}")
 set(package-contact "px4users@googlegroups.com")

-set(CMAKE_CXX_STANDARD 14)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_C_STANDARD 11)
-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()
-
-#=============================================================================
-
-# gold linker - use if available (posix only for now)
-if(${PX4_PLATFORM} STREQUAL "posix")
-	include(CMakeDependentOption)
-	CMAKE_DEPENDENT_OPTION(USE_LD_GOLD
-			"Use GNU gold linker" ON
-			"NOT WIN32;NOT APPLE" OFF
-	)
-
-	if(USE_LD_GOLD)
-		execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-		if("${LD_VERSION}" MATCHES "GNU gold")
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=gold")
-			set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=gold")
-		else()
-			set(USE_LD_GOLD OFF)
-		endif()
-	endif()
-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()
-
-include(ccache)
-
 #=============================================================================
 # find programs and packages
 #
@@ -277,189 +242,234 @@ if (CATKIN_DEVEL_PREFIX)
 	else()
 		message(FATAL_ERROR "catkin not found")
 	endif()
-endif()
-
-# Python
-# If using catkin, Python 2 is found since it points
-# to the Python libs installed with the ROS distro
-if (NOT CATKIN_DEVEL_PREFIX)
-	find_package(PythonInterp 3)
-	# We have a custom error message to tell users how to install python3.
-	if (NOT PYTHONINTERP_FOUND)
-		message(FATAL_ERROR "Python 3 not found. Please install Python 3:\n"
-			"    Ubuntu: sudo apt install python3 python3-dev python3-pip\n"
-			"    macOS: brew install python")
-	endif()
 else()
-	find_package(PythonInterp REQUIRED)
+	message(STATUS "catkin DISABLED")
 endif()

-option(PYTHON_COVERAGE "Python code coverage" OFF)
-if(PYTHON_COVERAGE)
-	message(STATUS "python coverage enabled")
-	set(PYTHON_EXECUTABLE coverage run -p)
-endif()
+find_package(PythonInterp REQUIRED)

 #=============================================================================
-# get chip and chip manufacturer
+# cmake modules
 #
-px4_os_determine_build_chip()
-if(NOT PX4_CHIP_MANUFACTURER)
-	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP_MANUFACTURER")
-endif()
-if(NOT PX4_CHIP)
-	message(FATAL_ERROR "px4_os_determine_build_chip() needs to set PX4_CHIP")
-endif()
+enable_testing()
+
+#=============================================================================
+# generate compile command database
+#
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+#=============================================================================
+# 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 ${PX4_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 ${PX4_SOURCE_DIR}
+	)
+
+add_custom_target(config
+	COMMAND cmake-gui .
+	WORKING_DIRECTORY ${PX4_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
+	OPTIMIZATION_FLAGS optimization_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};${optimization_flags}" GLUE " ")
+px4_join(OUT CMAKE_CXX_FLAGS LIST "${cxx_flags};${optimization_flags}" GLUE " ")
+
+include_directories(${include_dirs})
+#message("INCLUDE_DIRS=${include_dirs}")
+link_directories(${link_dirs})
+add_definitions(${definitions})

 #=============================================================================
-# board cmake init (optional)
+# source code generation
 #
-if(EXISTS ${PX4_BOARD_DIR}/cmake/init.cmake)
-	include(${PX4_BOARD_DIR}/cmake/init.cmake)
-endif()
-
-#=============================================================================
-# message, and airframe generation
-#
-include(px4_metadata)
-
-add_subdirectory(msg EXCLUDE_FROM_ALL)
-
-px4_generate_airframes_xml(BOARD ${PX4_BOARD})
+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_property(DIRECTORY PROPERTY EP_BASE ${ep_base})

 # add external project install folders to build
-# add the directories so cmake won't warn
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ep_base})
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ep_base}/Install)
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ep_base}/Install/lib)
 link_directories(${ep_base}/Install/lib)
-execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${ep_base}/Install/include)
 include_directories(${ep_base}/Install/include)
+# add the directories so cmake won't warn
+execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/lib)
+execute_process(COMMAND cmake -E make_directory ${ep_base}/Install/include)
+
+#=============================================================================
+# DriverFramework Drivers
+#
+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()

 #=============================================================================
 # external modules
 #
-set(external_module_paths)
-if (NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
+if(NOT EXTERNAL_MODULES_LOCATION STREQUAL "")
 	message(STATUS "External modules: ${EXTERNAL_MODULES_LOCATION}")
-	add_subdirectory("${EXTERNAL_MODULES_LOCATION}/src" external_modules)
+	add_subdirectory("${EXTERNAL_MODULES_LOCATION}/src" external_modules_src)

+	set(config_module_list_external_expanded)
 	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})
+		list(APPEND config_module_list_external_expanded
+			${EXTERNAL_MODULES_LOCATION}/src/${external_module})
 	endforeach()
+	set(config_module_list
+		${config_module_list}
+		${config_module_list_external_expanded}
+		)
 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)
-
-	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)
-endif()
-
-
 #=============================================================================
 # subdirectories
 #
-add_library(parameters_interface INTERFACE)
+set(module_libraries)
+foreach(module ${config_module_list})
+	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} ${PX4_BINARY_DIR}/${EXT_MODULE_PREFIX})
+	else()
+		add_subdirectory(src/${module})
+	endif()
+	px4_mangle_name(${module} mangled_name)
+	list(APPEND module_libraries ${mangled_name})
+	#message(STATUS "adding module: ${module}")
+endforeach()

-include(px4_add_library)
-add_subdirectory(src/lib EXCLUDE_FROM_ALL)
+# Keep track of external shared libs required for modules
+set(module_external_libraries "${module_external_libraries}" CACHE INTERNAL "module_external_libraries")

-add_subdirectory(platforms/${PX4_PLATFORM}/src/px4)
-add_subdirectory(platforms EXCLUDE_FROM_ALL)
+add_subdirectory(src/firmware/${OS})

-if(EXISTS "${PX4_BOARD_DIR}/CMakeLists.txt")
-	add_subdirectory(${PX4_BOARD_DIR})
+#add_dependencies(df_driver_framework nuttx_export_${CONFIG}.stamp)
+if (NOT "${OS}" STREQUAL "nuttx")
 endif()

-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})
+if (config_io_board)
+	add_subdirectory(src/modules/px4iofirmware)
+endif()

 #=============================================================================
-# uORB graph generation: add a custom target 'uorb_graph'
+# generate custom target to print for all executable and module cmake targets
 #
-set(uorb_graph_config ${PX4_BOARD})
+if(all_posix_cmake_targets)
+	list(SORT all_posix_cmake_targets)
+	px4_join(OUT posix_cmake_target_list LIST ${all_posix_cmake_targets} GLUE "\\n")
+	add_custom_target(list_cmake_targets
+		COMMAND sh -c "printf \"${posix_cmake_target_list}\\n\""
+		COMMENT "List of cmake targets that can be matched by PX4_NO_OPTIMIZATION:"
+		VERBATIM
+		)
+endif()

-set(graph_module_list "")
-foreach(module ${config_module_list})
-	set(graph_module_list "${graph_module_list}" "--src-path" "src/${module}")
-endforeach()
+#=============================================================================
+# generate git version
+#
+px4_create_git_hash_header(HEADER ${PX4_BINARY_DIR}/build_git_version.h)

-add_custom_command(OUTPUT ${uorb_graph_config}
-	COMMAND ${PYTHON_EXECUTABLE} ${PX4_SOURCE_DIR}/Tools/uorb_graph/create.py
-		${graph_module_list}
-		--exclude-path src/examples
-		--file ${PX4_SOURCE_DIR}/Tools/uorb_graph/graph_${uorb_graph_config}
+#=============================================================================
+# packaging
+#
+# Important to having packaging at end of cmake file.
+#
+execute_process(
+	COMMAND git describe --always --tags
+	OUTPUT_VARIABLE git_tag
+	OUTPUT_STRIP_TRAILING_WHITESPACE
 	WORKING_DIRECTORY ${PX4_SOURCE_DIR}
-	COMMENT "Generating uORB graph"
-)
-add_custom_target(uorb_graph DEPENDS ${uorb_graph_config})
-
-
-include(doxygen)
-include(metadata)
-include(package)
-
-# print size
-add_custom_target(size
-	COMMAND size $<TARGET_FILE:px4>
-	DEPENDS px4
-	WORKING_DIRECTORY ${PX4_BINARY_DIR}
-	USES_TERMINAL
 	)
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME}-${CONFIG})
+set(CPACK_PACKAGE_VERSION ${version})
+set(CPACK_PACKAGE_CONTACT ${package-contact})
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
+set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+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}-${git_tag}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${version}")
+set(CPACK_SOURCE_GENERATOR "ZIP;TBZ2")
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")
+set(CPACK_SET_DESTDIR "OFF")
+if ("${CMAKE_SYSTEM}" MATCHES "Linux")
+	find_program(DPKG_PROGRAM dpkg)
+	if (EXISTS ${DPKG_PROGRAM})
+		list (APPEND CPACK_GENERATOR "DEB")
+	endif()
+endif()
+include(CPack)

-# install python requirements using configured python
-add_custom_target(install_python_requirements
-	COMMAND ${PYTHON_EXECUTABLE} -m pip install --requirement ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
-	DEPENDS ${PX4_SOURCE_DIR}/Tools/setup/requirements.txt
-	USES_TERMINAL
-)
+# vim: set noet fenc=utf-8 ff=unix ft=cmake :
@@ -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/
@@ -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/).

-Make 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.
@@ -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)
@@ -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

@@ -211,7 +211,7 @@ class NX_task(object):
 	def waiting_for(self):
 		"""return a description of what the task is waiting for, if it is waiting"""
 		if self._state_is('TSTATE_WAIT_SEM'):
-			try:
+			try: 
 				waitsem = self._tcb['waitsem'].dereference()
 				waitsem_holder = waitsem['holder']
 				holder = NX_task.for_tcb(waitsem_holder['htcb'])
@@ -234,8 +234,8 @@ class NX_task(object):
 	@property
 	def is_runnable(self):
 		"""tests whether the task is runnable"""
-		if (self._state_is('TSTATE_TASK_PENDING') or
-			self._state_is('TSTATE_TASK_READYTORUN') or
+		if (self._state_is('TSTATE_TASK_PENDING') or 
+			self._state_is('TSTATE_TASK_READYTORUN') or 
 			self._state_is('TSTATE_TASK_RUNNING')):
 			return True
 		return False
@@ -271,7 +271,7 @@ class NX_task(object):

 	def __str__(self):
 		return "{}:{}".format(self.pid, self.name)
-
+	
 	def showoff(self):
 		print("-------")
 		print(self.pid,end = ", ")
@@ -282,7 +282,7 @@ class NX_task(object):
 		print(self._tcb['adj_stack_size'],end = ", ")
 		print(self.file_descriptors)
 		print(self.registers)
-
+		
 	def __format__(self, format_spec):
 		return format_spec.format(
 			pid              = self.pid,
@@ -294,7 +294,7 @@ class NX_task(object):
 			file_descriptors = self.file_descriptors,
 			registers	 = self.registers
 			)
-
+	
 class NX_show_task (gdb.Command):
 	"""(NuttX) prints information about a task"""

@@ -391,7 +391,7 @@ class NX_show_interrupted_thread (gdb.Command):

 	def invoke(self, args, from_tty):
 		regs = gdb.lookup_global_symbol('current_regs').value()
-		if regs == 0:
+		if regs is 0:
 			raise gdb.GdbError('not in interrupt context')
 		else:
 			registers = NX_register_set.with_xcpt_regs(regs)
@@ -409,14 +409,13 @@ class NX_check_tcb(gdb.Command):
 	""" check the tcb of a task from a address """
 	def __init__(self):
 		super(NX_check_tcb,self).__init__('show tcb', gdb.COMMAND_USER)
-
+		
 	def invoke(self,args,sth):
 		tasks = NX_task.tasks()
 		print("tcb int: ",int(args))
 		print(tasks[int(args)]._tcb)
-		a = tasks[int(args)]._tcb['xcp']['regs']
+		a =tasks[int(args)]._tcb['xcp']['regs']
 		print("relevant registers:")
-		regmap = NX_register_set.v7em_regmap
 		for reg in regmap:
 			hex_addr= hex(int(a[regmap[reg]]))
 			eval_string = 'info line *'+str(hex_addr)
@@ -426,29 +425,29 @@ NX_check_tcb()
 class NX_tcb(object):
 	def __init__(self):
 		pass
-
+	
 	def is_in(self,arg,list):
 		for i in list:
 			if arg == i:
-				return True
+				return True;
 		return False
-
+	
 	def find_tcb_list(self,dq_entry_t):
 		tcb_list = []
 		tcb_ptr = dq_entry_t.cast(gdb.lookup_type('struct tcb_s').pointer())
 		first_tcb = tcb_ptr.dereference()
-		tcb_list.append(first_tcb)
+		tcb_list.append(first_tcb);
 		next_tcb = first_tcb['flink'].dereference()
 		while not self.is_in(parse_int(next_tcb['pid']),[parse_int(t['pid']) for t in tcb_list]):
-			tcb_list.append(next_tcb)
-			old_tcb = next_tcb
+			tcb_list.append(next_tcb); 
+			old_tcb = next_tcb;
 			next_tcb = old_tcb['flink'].dereference()
-
+		
 		return [t for t in tcb_list if parse_int(t['pid'])<2000]
-
+	
 	def getTCB(self):
 		list_of_listsnames = ['g_pendingtasks','g_readytorun','g_waitingforsemaphore','g_waitingforsignal','g_inactivetasks']
-		tcb_list = []
+		tcb_list = [];
 		for l in list_of_listsnames:
 			li = gdb.lookup_global_symbol(l)
 			print(li)
@@ -457,49 +456,49 @@ class NX_tcb(object):

 class NX_check_stack_order(gdb.Command):
 	""" Check the Stack order corresponding to the tasks """
-
+	
 	def __init__(self):
 		super(NX_check_stack_order,self).__init__('show check_stack', gdb.COMMAND_USER)
-
+		
 	def is_in(self,arg,list):
 		for i in list:
 			if arg == i:
-				return True
+				return True;
 		return False
-
+	
 	def find_tcb_list(self,dq_entry_t):
 		tcb_list = []
 		tcb_ptr = dq_entry_t.cast(gdb.lookup_type('struct tcb_s').pointer())
 		first_tcb = tcb_ptr.dereference()
-		tcb_list.append(first_tcb)
+		tcb_list.append(first_tcb);
 		next_tcb = first_tcb['flink'].dereference()
 		while not self.is_in(parse_int(next_tcb['pid']),[parse_int(t['pid']) for t in tcb_list]):
-			tcb_list.append(next_tcb)
-			old_tcb = next_tcb
+			tcb_list.append(next_tcb); 
+			old_tcb = next_tcb;
 			next_tcb = old_tcb['flink'].dereference()
-
+		
 		return [t for t in tcb_list if parse_int(t['pid'])<2000]
-
+	
 	def getTCB(self):
 		list_of_listsnames = ['g_pendingtasks','g_readytorun','g_waitingforsemaphore','g_waitingforsignal','g_inactivetasks']
-		tcb_list = []
+		tcb_list = [];
 		for l in list_of_listsnames:
 			li = gdb.lookup_global_symbol(l)
 			cursor = li.value()['head']
 			tcb_list = tcb_list + self.find_tcb_list(cursor)
 		return tcb_list
-
+		
 	def getSPfromTask(self,tcb):
 		regmap = NX_register_set.v7em_regmap
 		a =tcb['xcp']['regs']
 		return 	parse_int(a[regmap['SP']])
-
+	
 	def find_closest(self,list,val):
 		tmp_list = [abs(i-val) for i in list]
 		tmp_min = min(tmp_list)
 		idx = tmp_list.index(tmp_min)
 		return idx,list[idx]
-
+	
 	def find_next_stack(self,address,_dict_in):
 		add_list = []
 		name_list = []
@@ -511,28 +510,28 @@ class NX_check_stack_order(gdb.Command):
 						name_list.append(self.check_name(key)+"_SP")
 					else:
 						name_list.append(self.check_name(key))
-
+					
 		idx,new_address = self.find_closest(add_list,address)
 		return new_address,name_list[idx]
-
+	
 	def check_name(self,name):
 		if isinstance(name,(list)):
-			name = name[0]
+			name = name[0];
 		idx = name.find("\\")
 		newname = name[:idx]
-
+		
 		return newname
-
+	 
 	def invoke(self,args,sth):
-		tcb = self.getTCB()
-		stackadresses={}
+		tcb = self.getTCB();
+		stackadresses={};
 		for t in tcb:
-			p = []
+			p = [];
 			#print(t.name,t._tcb['stack_alloc_ptr'])
 			p.append(parse_int(t['stack_alloc_ptr']))
 			p.append(parse_int(t['adj_stack_ptr']))
 			p.append(self.getSPfromTask(t))
-			stackadresses[str(t['name'])] = p
+			stackadresses[str(t['name'])] = p;
 		address = int("0x30000000",0)
 		print("stack address  :  process")
 		for i in range(len(stackadresses)*3):
@@ -540,12 +539,12 @@ class NX_check_stack_order(gdb.Command):
 			  print(hex(address),": ",name)

 NX_check_stack_order()
-
+					 
 class NX_run_debug_util(gdb.Command):
 	""" show the registers of a task corresponding to a tcb address"""
 	def __init__(self):
 		super(NX_run_debug_util,self).__init__('show regs', gdb.COMMAND_USER)
-
+	
 	def printRegisters(self,task):
 		regmap = NX_register_set.v7em_regmap
 		a =task._tcb['xcp']['regs']
@@ -554,14 +553,14 @@ class NX_run_debug_util(gdb.Command):
 			hex_addr= hex(int(a[regmap[reg]]))
 			eval_string = 'info line *'+str(hex_addr)
 			print(reg,": ",hex_addr,)
-
+			
 	def getPCfromTask(self,task):
 		regmap = NX_register_set.v7em_regmap
 		a =task._tcb['xcp']['regs']
 		return 	hex(int(a[regmap['PC']]))
-
+	
 	def invoke(self,args,sth):
-		tasks = NX_task.tasks()
+		tasks = NX_task.tasks() 
 		if args == '':
 			for t in tasks:
 				self.printRegisters(t)
@@ -569,56 +568,56 @@ class NX_run_debug_util(gdb.Command):
 				print("this is the location in code where the current threads $pc is:")
 				gdb.execute(eval_str)
 		else:
-			tcb_nr = int(args)
+			tcb_nr = int(args);
 			print("tcb_nr = ",tcb_nr)
 			t = tasks[tcb_nr]
 			self.printRegisters(t)
 			eval_str = "list *"+str(self.getPCfromTask(t))
 			print("this is the location in code where the current threads $pc is:")
 			gdb.execute(eval_str)
-
+			
 NX_run_debug_util()

-
+		
 class NX_search_tcb(gdb.Command):
 	""" shot PID's of all running tasks """
-
+	
 	def __init__(self):
 		super(NX_search_tcb,self).__init__('show alltcb', gdb.COMMAND_USER)
-
+	
 	def is_in(self,arg,list):
 		for i in list:
 			if arg == i:
-				return True
+				return True;
 		return False
-
+	
 	def find_tcb_list(self,dq_entry_t):
 		tcb_list = []
 		tcb_ptr = dq_entry_t.cast(gdb.lookup_type('struct tcb_s').pointer())
 		first_tcb = tcb_ptr.dereference()
-		tcb_list.append(first_tcb)
+		tcb_list.append(first_tcb);
 		next_tcb = first_tcb['flink'].dereference()
 		while not self.is_in(parse_int(next_tcb['pid']),[parse_int(t['pid']) for t in tcb_list]):
-			tcb_list.append(next_tcb)
-			old_tcb = next_tcb
+			tcb_list.append(next_tcb); 
+			old_tcb = next_tcb;
 			next_tcb = old_tcb['flink'].dereference()
-
+		
 		return [t for t in tcb_list if parse_int(t['pid'])<2000]
-
+	
 	def invoke(self,args,sth):
 		list_of_listsnames = ['g_pendingtasks','g_readytorun','g_waitingforsemaphore','g_waitingforsignal','g_inactivetasks']
-		tasks = []
+		tasks = [];
 		for l in list_of_listsnames:
 			li = gdb.lookup_global_symbol(l)
 			cursor = li.value()['head']
 			tasks = tasks + self.find_tcb_list(cursor)
-
+		
 		# filter for tasks that are listed twice
 		tasks_filt = {}
 		for t in tasks:
-			pid = parse_int(t['pid'])
+			pid = parse_int(t['pid']);
 			if not pid in tasks_filt.keys():
-				tasks_filt[pid] = t['name']
+				tasks_filt[pid] = t['name']; 
 		print('{num_t} Tasks found:'.format(num_t = len(tasks_filt)))
 		for pid in tasks_filt.keys():
 			print("PID: ",pid," ",tasks_filt[pid])
@@ -627,36 +626,36 @@ NX_search_tcb()


 class NX_my_bt(gdb.Command):
-	""" 'fake' backtrace: backtrace the stack of a process and check every suspicious address for the list
+	""" 'fake' backtrace: backtrace the stack of a process and check every suspicious address for the list 
 	arg: tcb_address$
 	(can easily be found by typing 'showtask').
 	"""
-
+	
 	def __init__(self):
 		super(NX_my_bt,self).__init__('show mybt', gdb.COMMAND_USER)
-
+		
 	def readmem(self,addr):
 		'''
 		read memory at addr and return nr
-		'''
+		'''	
 		str_to_eval = "x/x "+hex(addr)
 		resp = gdb.execute(str_to_eval,to_string = True)
 		idx = resp.find('\t')
 		return int(resp[idx:],16)
-
+	
 	def is_in_bounds(self,val):
 		lower_bound = int("08004000",16)
-		upper_bound = int("080ae0c0",16)
+		upper_bound = int("080ae0c0",16);
 		#print(lower_bound," ",val," ",upper_bound)
 		if val>lower_bound and val<upper_bound:
-			return True
+			return True;
 		else:
-			return False
+			return False;
 	def get_tcb_from_address(self,addr):
 		addr_value = gdb.Value(addr)
 		tcb_ptr = addr_value.cast(gdb.lookup_type('struct tcb_s').pointer())
 		return tcb_ptr.dereference()
-
+	
 	def resolve_file_line_func(self,addr,stack_percentage):
 		gdb.write(str(round(stack_percentage,2))+":")
 		str_to_eval = "info line *"+hex(addr)
@@ -671,7 +670,7 @@ class NX_my_bt(gdb.Command):
 			if str(func) == "None":
 				func = block.superblock.function
 			return words[3].strip('"'), line, func
-
+		
 	def invoke(self,args,sth):
 		try:
 			addr_dec = parse_int(args)   # Trying to interpret the input as TCB address
@@ -688,9 +687,9 @@ class NX_my_bt(gdb.Command):
 		curr_sp = parse_int(_tcb['xcp']['regs'][0]) #curr stack pointer
 		other_sp = parse_int(_tcb['xcp']['regs'][8]) # other stack pointer
 		stacksize = parse_int(_tcb['adj_stack_size']) # other stack pointer
-
+		
 		print("tasks current SP = ",hex(curr_sp),"stack max ptr is at ",hex(up_stack))
-
+		
 		item = 0
 		for sp in range(other_sp if curr_sp == up_stack else curr_sp, up_stack, 4):
 			mem = self.readmem(sp)
@@ -701,5 +700,5 @@ class NX_my_bt(gdb.Command):
 				filename,line,func = self.resolve_file_line_func(mem, stack_percentage)
 				print('#%-2d ' % item, '0x%08x in ' % mem, func, ' at ', filename, ':', line, sep='')
 				item += 1
-
+		
 NX_my_bt()
@@ -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

@@ -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
@@ -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
+
@@ -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
@@ -0,0 +1,260 @@
+#!/bin/bash
+#
+# 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.
+#
+# Requirements: ARM GDB with Python support
+#
+
+set -e
+root=$(dirname $0)/..
+
+function die()
+{
+    echo "$@"
+    exit 1
+}
+
+function usage()
+{
+    echo "Invalid usage. Supported options:"
+    cat $0 | sed -n 's/^\s*--\([^)\*]*\).*/\1/p' # Don't try this at home.
+    exit 1
+}
+
+which flamegraph.pl > /dev/null || die "Install flamegraph.pl first"
+
+#
+# Parsing the arguments. Read this section for usage info.
+#
+nsamples=0
+sleeptime=0.1    # Doctors recommend 7-8 hours a day
+taskname=
+elf=$root/Build/px4fmu-v2_default.build/firmware.elf
+append=0
+fgfontsize=10
+fgwidth=1900
+
+for i in "$@"
+do
+    case $i in
+        --nsamples=*)
+            nsamples="${i#*=}"
+            ;;
+        --sleeptime=*)
+            sleeptime="${i#*=}"
+            ;;
+        --taskname=*)
+            taskname="${i#*=}"
+            ;;
+        --elf=*)
+            elf="${i#*=}"
+            ;;
+        --append)
+            append=1
+            ;;
+        --fgfontsize=*)
+            fgfontsize="${i#*=}"
+            ;;
+        --fgwidth=*)
+            fgwidth="${i#*=}"
+            ;;
+        *)
+            usage
+            ;;
+    esac
+    shift
+done
+
+#
+# Temporary files
+#
+stacksfile=/tmp/pmpn-stacks.log
+foldfile=/tmp/pmpn-folded.txt
+graphfile=/tmp/pmpn-flamegraph.svg
+gdberrfile=/tmp/pmpn-gdberr.log
+
+#
+# Sampling if requested. Note that if $append is true, the stack file will not be rewritten.
+#
+cd $root
+
+if [[ $nsamples > 0 ]]
+then
+    [[ $append = 0 ]] && (rm -f $stacksfile; echo "Old stacks removed")
+
+    echo "Sampling the task '$taskname'..."
+
+    for x in $(seq 1 $nsamples)
+    do
+        if [[ "$taskname" = "" ]]
+        then
+            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 --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' \
+                >> $stacksfile
+        fi
+        echo -e '\n\n' >> $stacksfile
+        echo -ne "\r$x/$nsamples"
+        sleep $sleeptime
+    done
+
+    echo
+    echo "Stacks saved to $stacksfile"
+else
+    echo "Sampling skipped - set 'nsamples' to re-sample."
+fi
+
+#
+# Folding the stacks.
+#
+[ -f $stacksfile ] || die "Where are the stack samples?"
+
+cat << 'EOF' > /tmp/pmpn-folder.py
+#
+# This stack folder correctly handles C++ types.
+#
+from __future__ import print_function, division
+import fileinput, collections, os, sys
+
+def enforce(x, msg='Invalid input'):
+    if not x:
+        raise Exception(msg)
+
+def split_first_part_with_parens(line):
+    LBRACES = {'(':'()', '<':'<>', '[':'[]', '{':'{}'}
+    RBRACES = {')':'()', '>':'<>', ']':'[]', '}':'{}'}
+    QUOTES = set(['"', "'"])
+    quotes = collections.defaultdict(bool)
+    braces = collections.defaultdict(int)
+    out = ''
+    for ch in line:
+        out += ch
+        # escape character cancels further processing
+        if ch == '\\':
+            continue
+        # special cases
+        if out.endswith('operator>') or out.endswith('operator>>') or out.endswith('operator->'):  # gotta love c++
+            braces['<>'] += 1
+        if out.endswith('operator<') or out.endswith('operator<<'):
+            braces['<>'] -= 1
+        # switching quotes
+        if ch in QUOTES:
+            quotes[ch] = not quotes[ch]
+        # counting parens only when outside quotes
+        if sum(quotes.values()) == 0:
+            if ch in LBRACES.keys():
+                braces[LBRACES[ch]] += 1
+            if ch in RBRACES.keys():
+                braces[RBRACES[ch]] -= 1
+        # sanity check
+        for v in braces.values():
+            enforce(v >= 0, 'Unaligned braces: ' + str(dict(braces)))
+        # termination condition
+        if ch == ' ' and sum(braces.values()) == 0:
+            break
+    out = out.strip()
+    return out, line[len(out):]
+
+def parse(line):
+    def take_path(line, output):
+        line = line.strip()
+        if line.startswith('at '):
+            line = line[3:].strip()
+        if line:
+            output['file_full_path'] = line.rsplit(':', 1)[0].strip()
+            output['file_base_name'] = os.path.basename(output['file_full_path'])
+            output['line'] = int(line.rsplit(':', 1)[1])
+        return output
+
+    def take_args(line, output):
+        line = line.lstrip()
+        if line[0] == '(':
+            output['args'], line = split_first_part_with_parens(line)
+        return take_path(line.lstrip(), output)
+
+    def take_function(line, output):
+        output['function'], line = split_first_part_with_parens(line.lstrip())
+        return take_args(line.lstrip(), output)
+
+    def take_mem_loc(line, output):
+        line = line.lstrip()
+        if line.startswith('0x'):
+            end = line.find(' ')
+            num = line[:end]
+            output['memloc'] = int(num, 16)
+            line = line[end:].lstrip()
+            end = line.find(' ')
+            enforce(line[:end] == 'in')
+            line = line[end:].lstrip()
+        return take_function(line, output)
+
+    def take_frame_num(line, output):
+        line = line.lstrip()
+        enforce(line[0] == '#')
+        end = line.find(' ')
+        num = line[1:end]
+        output['frame_num'] = int(num)
+        return take_mem_loc(line[end:], output)
+
+    return take_frame_num(line, {})
+
+stacks = collections.defaultdict(int)
+current = ''
+
+stack_tops = collections.defaultdict(int)
+num_stack_frames = 0
+
+for idx,line in enumerate(fileinput.input()):
+    try:
+        line = line.strip()
+        if line:
+            inf = parse(line)
+            fun = inf['function']
+            current = (fun + ';' + current) if current else fun
+
+            if inf['frame_num'] == 0:
+                num_stack_frames += 1
+                stack_tops[fun] += 1
+        elif current:
+            stacks[current] += 1
+            current = ''
+    except Exception, ex:
+        print('ERROR (line %d):' % (idx + 1), ex, file=sys.stderr)
+
+for s, f in sorted(stacks.items(), key=lambda (s, f): s):
+    print(s, f)
+
+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)[:10]:
+    print('% 5.1f%%   ' % (100 * num / num_stack_frames), name, file=sys.stderr)
+EOF
+
+cat $stacksfile | python /tmp/pmpn-folder.py > $foldfile
+
+echo "Folded stacks saved to $foldfile"
+
+#
+# Graphing.
+#
+cat $foldfile | flamegraph.pl --fontsize=$fgfontsize --width=$fgwidth > $graphfile
+echo "FlameGraph saved to $graphfile"
+
+# On KDE, xdg-open prefers Gwenview by default, which doesn't handle interactive SVGs, so we need a browser.
+# The current implementation is hackish and stupid. Somebody, please do something about it.
+opener=xdg-open
+which firefox       > /dev/null && opener=firefox
+which google-chrome > /dev/null && opener=google-chrome
+
+$opener $graphfile
@@ -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
+
@@ -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
@@ -1,29 +0,0 @@
-#
-# PX4 development environment
-#
-
-FROM ubuntu:20.04
-LABEL maintainer="Daniel Agar <daniel@agar.ca>"
-
-COPY Tools/setup/ubuntu.sh /tmp/ubuntu.sh
-COPY Tools/setup/requirements.txt /tmp/requirements.txt
-RUN DEBIAN_FRONTEND=noninteractive /tmp/ubuntu.sh --no-sim-tools \
-	&& apt-get -y autoremove \
-	&& apt-get clean autoclean \
-	&& rm -rf /var/lib/apt/lists/{apt,dpkg,cache,log} /tmp/* /var/tmp/*
-
-# create user with id 1001 (jenkins docker workflow default)
-RUN useradd --shell /bin/bash -u 1001 -c "" -m user && usermod -a -G dialout user
-
-ENV CCACHE_UMASK=000
-ENV PATH="/usr/lib/ccache:$PATH"
-
-# SITL UDP PORTS
-EXPOSE 14556/udp
-EXPOSE 14557/udp
-
-# create and start as LOCAL_USER_ID
-COPY Tools/setup/entrypoint.sh /usr/local/bin/entrypoint.sh
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-
-CMD ["/bin/bash"]
@@ -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/
+
@@ -0,0 +1,3 @@
+#!/bin/sh
+rm -rf html
+doxygen
@@ -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
@@ -0,0 +1,2 @@
+#!/bin/sh
+git log --pretty=format:"Last change: commit %h - %aN, %ar : %s" -1 $1 || echo no git
@@ -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
 		},
 		{
@@ -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
+}
@@ -0,0 +1,12 @@
+{
+    "board_id": 65,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the Intel Aero FC board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AEROFCv1",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,12 @@
+{
+    "board_id": 33,
+    "magic": "PX4FWv1",
+    "description": "Firmware for the AUAV X2.1 board",
+    "image": "",
+    "build_time": 0,
+    "summary": "AUAV X2.1",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -0,0 +1,12 @@
+{
+    "board_id": 12, 
+    "magic": "Crazyflie", 
+    "description": "Firmware for the Crazyflie 2.0", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "CRAZYFLIE",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -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
+}
@@ -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
+}
@@ -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
+}
@@ -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
+}
@@ -0,0 +1,12 @@
+{
+    "board_id": 9, 
+    "magic": "PX4FWv1", 
+    "description": "Firmware for the PX4FMUv3 board", 
+    "image": "", 
+    "build_time": 0, 
+    "summary": "PX4FMUv3",
+    "version": "0.1",
+    "image_size": 0,
+    "git_identity": "",
+    "board_revision": 0
+}
@@ -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
+}
@@ -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
+}
@@ -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
+}
@@ -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
+}
@@ -0,0 +1,12 @@
+{
+    "board_id": 64,
+    "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
+}
@@ -1,380 +0,0 @@
-#!/usr/bin/env groovy
-
-pipeline {
-  agent none
-  stages {
-
-    stage('Analysis') {
-      when {
-        anyOf {
-          branch 'master'
-          branch 'pr-jenkins' // for testing
-        }
-      }
-      parallel {
-        // stage('Catkin build on ROS workspace') {
-        //   agent {
-        //     docker {
-        //       image 'px4io/px4-dev-ros-melodic:2021-04-29'
-        //       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;
-        //       git -C ${WORKSPACE}/catkin_ws/src/Firmware fetch --tags;
-        //       source /opt/ros/melodic/setup.bash;
-        //       export PYTHONPATH=/opt/ros/$ROS_DISTRO/lib/python2.7/dist-packages:/usr/lib/python2.7/dist-packages:/usr/local/lib/python2.7/dist-packages;
-        //       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'
-        //     }
-        //     failure {
-        //       archiveArtifacts(allowEmptyArchive: false, artifacts: '.ros/**/*.xml, .ros/**/*.log')
-        //     }
-        //   }
-        //   options {
-        //     checkoutToSubdirectory('catkin_ws/src/Firmware')
-        //   }
-        // }
-
-        stage('Colcon build on ROS2 workspace') {
-          agent {
-            docker {
-              image 'px4io/px4-dev-ros2-foxy:2021-04-29'
-              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 -C ${WORKSPACE}/colcon_ws/src/Firmware fetch --tags;
-              source /opt/ros/foxy/setup.sh;
-              colcon build --event-handlers console_direct+ --symlink-install;
-            '''
-          }
-          post {
-            always {
-              sh 'rm -rf colcon_ws'
-            }
-          }
-          options {
-            checkoutToSubdirectory('colcon_ws/src/Firmware')
-          }
-        }
-
-        stage('Airframe') {
-          agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'git fetch --all --tags'
-            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 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'git fetch --all --tags'
-            sh 'make parameters_metadata'
-            dir('build/px4_sitl_default/docs') {
-              archiveArtifacts(artifacts: 'parameters.md, parameters.xml, parameters.json.xz')
-              stash includes: 'parameters.md, parameters.xml, parameters.json.xz', name: 'metadata_parameters'
-            }
-          }
-          post {
-            always {
-              sh 'make distclean'
-            }
-          }
-        }
-
-        stage('Module') {
-          agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          steps {
-            sh 'make distclean'
-            sh 'git fetch --all --tags'
-            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-focal:2021-04-29'
-              args '-e CCACHE_BASEDIR=$WORKSPACE -v ${CCACHE_DIR}:${CCACHE_DIR}:rw'
-            }
-          }
-          steps {
-            sh 'export'
-            sh 'make distclean'
-            sh 'git fetch --all --tags'
-            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('Userguide') {
-          agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          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/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('cp -R modules/*.md px4_user_guide/en/modules/')
-              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 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          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('microRTPS agent') {
-          agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          steps {
-            sh('export')
-            sh('git fetch --all --tags')
-            sh('make distclean')
-            sh('make px4_sitl_rtps')
-            withCredentials([usernamePassword(credentialsId: 'px4buildbot_github_personal_token', passwordVariable: 'GIT_PASS', usernameVariable: 'GIT_USER')]) {
-              sh("git clone https://${GIT_USER}:${GIT_PASS}@github.com/PX4/micrortps_agent.git -b ${BRANCH_NAME}")
-              sh("rm -rf micrortps_agent/src micrortps_agent/idl")
-              sh('cp -R build/px4_sitl_rtps/src/modules/micrortps_bridge/micrortps_agent/* micrortps_agent')
-              sh('cd micrortps_agent; git status; git add src; git commit -a -m "Update microRTPS agent source code `date`" || true')
-              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
-              sh('cd micrortps_agent; git status; git add idl; git commit -a -m "Update IDL definitions `date`" || true')
-              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
-              sh('cd micrortps_agent; git status; git add CMakeLists.txt; git commit -a -m "Update CMakeLists.txt `date`" || true')
-              sh('cd micrortps_agent; git push origin ${BRANCH_NAME} || true')
-              sh('rm -rf micrortps_agent')
-            }
-          }
-          when {
-            anyOf {
-              branch 'master'
-              branch 'pr-jenkins' // for testing
-            }
-          }
-        }
-
-        stage('PX4 ROS msgs') {
-          agent {
-            docker { image 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          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('./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('./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 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          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('./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')
-              // deploy templates
-              sh('cp msg/templates/urtps/microRTPS_agent.cpp.em px4_ros_com/templates/microRTPS_agent.cpp.em')
-              sh('cp msg/templates/urtps/microRTPS_timesync.cpp.em px4_ros_com/templates/microRTPS_timesync.cpp.em')
-              sh('cp msg/templates/urtps/microRTPS_timesync.h.em px4_ros_com/templates/microRTPS_timesync.h.em')
-              sh('cp msg/templates/urtps/microRTPS_transport.cpp px4_ros_com/templates/microRTPS_transport.cpp')
-              sh('cp msg/templates/urtps/microRTPS_transport.h px4_ros_com/templates/microRTPS_transport.h')
-              sh('cp msg/templates/urtps/Publisher.cpp.em px4_ros_com/templates/Publisher.cpp.em')
-              sh('cp msg/templates/urtps/Publisher.h.em px4_ros_com/templates/Publisher.h.em')
-              sh('cp msg/templates/urtps/Subscriber.cpp.em px4_ros_com/templates/Subscriber.cpp.em')
-              sh('cp msg/templates/urtps/Subscriber.h.em px4_ros_com/templates/Subscriber.h.em')
-              sh('cp msg/templates/urtps/RtpsTopics.cpp.em px4_ros_com/templates/RtpsTopics.cpp.em')
-              sh('cp msg/templates/urtps/RtpsTopics.h.em px4_ros_com/templates/RtpsTopics.h.em')
-              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 'ghcr.io/px4/px4-dev:2021-05-06' }
-          }
-          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/')
-              s3Upload(acl: 'PublicRead', bucket: 'px4-travis', file: 'parameters.json.xz', 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: '10', artifactDaysToKeepStr: '20'))
-    timeout(time: 60, unit: 'MINUTES')
-  }
-}
@@ -1,29 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2012 - 2021, 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.
@@ -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.
@@ -1,6 +1,6 @@
 ############################################################################
 #
-# Copyright (c) 2015 - 2020 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 16.04, 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,23 +68,16 @@ 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 ,, )
-
-define make_list
-     $(shell cat .github/workflows/compile_${1}.yml | sed -E 's|[[:space:]]+(.*),|check_\1|g' | grep check_${2})
-endef
+#  explicity set default build target
+all: posix_sitl_default

 # Parsing
 # --------------------------------------------------------------------
@@ -73,54 +86,26 @@ endef
 # by cmake in the subdirectory
 FIRST_ARG := $(firstword $(MAKECMDGOALS))
 ARGS := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
+j ?= 4

-# Get -j or --jobs argument as suggested in:
-# https://stackoverflow.com/a/33616144/8548472
-MAKE_PID := $(shell echo $$PPID)
-j := $(shell ps T | sed -n 's|.*$(MAKE_PID).*$(MAKE).* \(-j\|--jobs\) *\([0-9][0-9]*\).*|\2|p')
-
-# Default j for clang-tidy
-j_clang_tidy := $(or $(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
+NINJA_BUILD := $(shell ninja --version 2>/dev/null)
 endif
-
 ifdef NINJA_BUILD
-	PX4_CMAKE_GENERATOR := Ninja
-	PX4_MAKE := $(NINJA_BIN)
-
-	ifdef VERBOSE
-		PX4_MAKE_ARGS := -v
-	else
-		PX4_MAKE_ARGS :=
-	endif
-
-	# Only override ninja default if -j is set.
-	ifneq ($(j),)
-		PX4_MAKE_ARGS := $(PX4_MAKE_ARGS) -j$(j)
-	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

-	# For non-ninja builds we default to -j4
-	j := $(or $(j),4)
-	PX4_MAKE = $(MAKE)
-	PX4_MAKE_ARGS = -j$(j) --no-print-directory
+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)))")

 # check if replay env variable is set & set build dir accordingly
 ifdef replay
@@ -130,85 +115,41 @@ else
 endif

 # additional config parameters passed to cmake
+CMAKE_ARGS :=
 ifdef EXTERNAL_MODULES_LOCATION
-	CMAKE_ARGS += -DEXTERNAL_MODULES_LOCATION:STRING=$(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
-
-# Pick up specific Python path if set
-ifdef PYTHON_EXECUTABLE
-	CMAKE_ARGS += -DPYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-endif
+SRC_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))

 # 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
-	@# make sure to start from scratch if ninja build file is missing
-	@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ ! -f $(BUILD_DIR)/build.ninja ]; 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)
+@$(eval BUILD_DIR = $(SRC_DIR)/build_$@$(BUILD_DIR_SUFFIX))
+@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(BUILD_DIR)/Makefile ]; then rm -rf $(BUILD_DIR); fi
+@if [ ! -e $(BUILD_DIR)/CMakeCache.txt ]; then mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake .. -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1) $(CMAKE_ARGS) || (cd .. && rm -rf $(BUILD_DIR)); fi
+@echo "PX4 CONFIG: $(BUILD_DIR)"
+@$(PX4_MAKE) -C "$(BUILD_DIR)" $(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
+@$(eval BUILD_DIR = $(SRC_DIR)/build_$@$(BUILD_DIR_SUFFIX))
+@if [ $(PX4_CMAKE_GENERATOR) = "Ninja" ] && [ -e $(BUILD_DIR)/Makefile ]; then rm -rf $(BUILD_DIR); fi
+@if [ ! -e $(BUILD_DIR)/CMakeCache.txt ]; then mkdir -p $(BUILD_DIR) && cd $(BUILD_DIR) && cmake $(2) -G$(PX4_CMAKE_GENERATOR) -DCONFIG=$(1) || (cd .. && rm -rf $(BUILD_DIR)); fi
+@$(PX4_MAKE) -C "$(BUILD_DIR)" $(PX4_MAKE_ARGS) $(ARGS)
 endef

-COLOR_BLUE = \033[0;94m
-NO_COLOR   = \033[m
-
 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)
+# Get a list of all config targets.
+ALL_CONFIG_TARGETS := $(basename $(shell find "$(SRC_DIR)/cmake/configs" ! -name '*_common*' ! -name '*_sdflight_*' -name '*.cmake' -print | sed  -e 's:^.*/::' | sort))
+# Strip off leading nuttx_
+NUTTX_CONFIG_TARGETS := $(patsubst nuttx_%,%,$(filter nuttx_%,$(ALL_CONFIG_TARGETS)))

 # ADD CONFIGS HERE
 # --------------------------------------------------------------------
@@ -216,286 +157,148 @@ ALL_CONFIG_TARGETS := $(shell find boards -maxdepth 3 -mindepth 3 ! -name '*comm

 # All targets.
 $(ALL_CONFIG_TARGETS):
-	@$(eval PX4_CONFIG = $@)
-	@$(eval CMAKE_ARGS += -DCONFIG=$(PX4_CONFIG))
-	@$(call cmake-build,$(PX4_CONFIG)$(BUILD_DIR_SUFFIX))
+	$(call cmake-build,$@)

-# 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))
+# Abbreviated config targets.

-all_config_targets: $(ALL_CONFIG_TARGETS)
-all_default_targets: $(CONFIG_TARGETS_DEFAULT)
+# nuttx_ is left off by default; provide a rule to allow that.
+$(NUTTX_CONFIG_TARGETS):
+	$(call cmake-build,nuttx_$@)

-# board reorganization deprecation warnings (2018-11-22)
-define deprecation_warning
-	$(warning $(1) has been deprecated and will be removed, please use $(2)!)
-endef
+all_nuttx_targets: $(NUTTX_CONFIG_TARGETS)

-# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
-.PHONY: all px4_sitl_default all_config_targets all_default_targets
+posix: posix_sitl_default
+broadcast: posix_sitl_broadcast

 # Multi- config targets.
-eagle_default: atlflight_eagle_default atlflight_eagle_qurt
-eagle_rtps: atlflight_eagle_rtps atlflight_eagle_qurt-rtps

-excelsior_default: atlflight_excelsior_default atlflight_excelsior_qurt
-excelsior_rtps: atlflight_excelsior_rtps atlflight_excelsior_qurt-rtps
+eagle_default: posix_eagle_default qurt_eagle_default
+eagle_legacy_default: posix_eagle_legacy_driver_default qurt_eagle_legacy_driver_default
+excelsior_default: posix_excelsior_default qurt_excelsior_default

-.PHONY: eagle_default eagle_rtps
-.PHONY: excelsior_default excelsior_rtps
+# Deprecated config targets.
+
+ros_sitl_default:
+	@echo "This target is deprecated. Use make 'posix_sitl_default gazebo' instead."
+
+_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
+
+# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
+.PHONY: all posix broadcast eagle_default eagle_legacy_default excelsior_default run_sitl_quad run_sitl_plane run_sitl_ros all_nuttx_targets

 # Other targets
 # --------------------------------------------------------------------

-.PHONY: qgc_firmware px4fmu_firmware misc_qgc_extra_firmware check_rtps
+.PHONY: uavcan_firmware check check_format format unittest tests qgc_firmware package_firmware clean submodulesclean distclean
+.NOTPARALLEL:

-# QGroundControl flashable NuttX firmware
-qgc_firmware: px4fmu_firmware misc_qgc_extra_firmware
+# All targets with just dependencies but no recipe must either be marked as phony (or have the special @: as recipe).
+.PHONY: checks_defaults checks_bootloaders checks_tests checks_alts checks_uavcan checks_sitls checks_last quick_check tests extra_firmware

-# 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 \
-	check_px4_fmu-v5x_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_nxp_fmurt1062-v1_default \
-	check_mro_x21_default \
-	check_bitcraze_crazyflie_default \
-	check_bitcraze_crazyflie21_default \
-	check_airmind_mindpx-v2_default \
-	check_px4_fmu-v2_lpe \
-	sizes
+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

-# 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
+# All default targets that don't require a special build environment (currently built on semaphore-ci)
+check: 	check_px4fmu-v1_default \
+	check_px4fmu-v2_default \
+	check_px4fmu-v2_test \
+	check_px4fmu-v4_default_and_uavcan \
+	check_mindpx-v2_default \
+	check_posix_sitl_default \
+	check_tap-v1_default \
+	check_aerofc-v1_default \
+	check_px4-stm32f4discovery_default \
+	check_crazyflie_default \
+	check_tests \
+	check_format

-.PHONY: sizes check quick_check check_rtps uorb_graphs
+# quick_check builds a single nuttx and posix target, runs testing, and checks the style
+quick_check: check_posix_sitl_default check_px4fmu-v4_default check_tests check_format

-sizes:
-	@-find build -name *.elf -type f | xargs size 2> /dev/null || :
+check_format:
+	$(call colorecho,"Checking formatting with astyle")
+	@./Tools/check_code_style_all.sh
+	@git diff --check

-# All default targets that don't require a special build environment
-check: check_px4_sitl_default px4fmu_firmware misc_qgc_extra_firmware tests check_format
-
-# quick_check builds a single nuttx and SITL target, runs testing, and checks the style
-quick_check: check_px4_sitl_test check_px4_fmu-v5_default tests check_format
+format:
+	$(call colorecho,"Formatting with astyle")
+	@./Tools/check_code_style_all.sh --fix

 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.py --src-path src --exclude-path src/examples --exclude-path src/lib --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
+unittest: posix_sitl_default
+	$(call cmake-build-other,unittest, ../unittests)
+	@(cd build_unittest && ctest -j2 --output-on-failure)

+run_tests_posix: posix_sitl_default
+	@(cd build_posix_sitl_default/ && ctest -V)

-.PHONY: coverity_scan
+tests: check_unittest run_tests_posix

-coverity_scan: px4_sitl_default
+# QGroundControl flashable firmware (currently built by travis-ci)
+qgc_firmware: \
+	check_px4fmu-v1_default \
+	check_px4fmu-v2_default \
+	check_px4fmu-v3_default \
+	check_px4fmu-v4_default_and_uavcan \
+	check_mindpx-v2_default \
+	check_tap-v1_default \
+	check_format

-# Documentation
-# --------------------------------------------------------------------
-.PHONY: parameters_metadata airframe_metadata module_documentation px4_metadata doxygen
-
-parameters_metadata:
-	@$(MAKE) --no-print-directory px4_sitl_default metadata_parameters ver_gen
-
-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 tests PX4_CMAKE_BUILD_TYPE=Coverage
-	@mkdir -p coverage
-	@lcov --directory build/px4_sitl_test --base-directory build/px4_sitl_test --gcov-tool gcov --capture -o coverage/lcov.info
-
-
-rostest: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
-
-tests_integration: px4_sitl_default
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
-	@$(MAKE) --no-print-directory px4_sitl_default mavsdk_tests
-	@"$(SRC_DIR)"/test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 test/mavsdk_tests/configs/sitl.json
-
-tests_integration_coverage:
-	@$(MAKE) clean
-	@$(MAKE) --no-print-directory px4_sitl_default PX4_CMAKE_BUILD_TYPE=Coverage
-	@$(MAKE) --no-print-directory px4_sitl_default sitl_gazebo
-	@$(MAKE) --no-print-directory px4_sitl_default mavsdk_tests
-	@"$(SRC_DIR)"/test/mavsdk_tests/mavsdk_test_runner.py --speed-factor 20 test/mavsdk_tests/configs/sitl.json
-	@mkdir -p coverage
-	@lcov --directory build/px4_sitl_default --base-directory build/px4_sitl_default --gcov-tool gcov --capture -o coverage/lcov.info
-
-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
-	@"$(SRC_DIR)"/test/rostest_px4_run.sh mavros_posix_tests_offboard_rpyrt_ctl.test
-
-tests_avoidance: rostest
-	@"$(SRC_DIR)"/test/rostest_avoidance_run.sh mavros_posix_test_avoidance.test
-	@"$(SRC_DIR)"/test/rostest_avoidance_run.sh mavros_posix_test_safe_landing.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_clang_tidy) -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_clang_tidy) -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_clang_tidy) -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++14 --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
-	@git submodule foreach git clean -df
+	@rm -rf build_*/
+	-@$(MAKE) -C NuttX/nuttx 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
-
-gazeboclean:
-	@rm -rf ~/.gazebo/*
-
-distclean: gazeboclean
-	@git submodule deinit -f .
-	@git clean -ff -x -d -e ".cproject" -e ".idea" -e ".project" -e ".settings" -e ".vscode"
-
-# Help / Error
-# --------------------------------------------------------------------
+distclean: submodulesclean clean
+	@git clean -ff -x -d -e ".project" -e ".cproject" -e ".idea"

 # All other targets are handled by PX4_MAKE. Add a rule here to avoid printing an error.
 %:
 	$(if $(filter $(FIRST_ARG),$@), \
-		$(error "Make target $@ not found. It either does not exist or $@ cannot be the first argument. Use '$(MAKE) help|list_config_targets' to get a list of all possible [configuration] targets."),@#)
+		$(error "$@ cannot be the first argument. Use '$(MAKE) help|list_config_targets' to get a list of all possible [configuration] targets."),@#)
+
+.PHONY: clean
+
+CONFIGS:=$(shell ls cmake/configs | sed -e "s~.*/~~" | sed -e "s~\..*~~")
+
+#help:
+#	@echo
+#	@echo "Type 'make ' and hit the tab key twice to see a list of the available"
+#	@echo "build configurations."
+#	@echo
+
+empty :=
+space := $(empty) $(empty)

 # Print a list of non-config targets (based on http://stackoverflow.com/a/26339924/1487069)
 help:
@@ -503,23 +306,12 @@ help:
 	@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)'
+		egrep -v -e '^[^[:alnum:]]' -e '^($(subst $(space),|,$(ALL_CONFIG_TARGETS) $(NUTTX_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
+	@for targ in $(patsubst nuttx_%,[nuttx_]%,$(ALL_CONFIG_TARGETS)); do echo $$targ; done

-check_nuttx : $(call make_list,nuttx) \
-	sizes
-
-check_linux : $(call make_list,linux) \
-	sizes
-
-check_px4: $(call make_list,nuttx,"px4") \
-	sizes
-
-check_nxp: $(call make_list,nuttx,"nxp") \
-	sizes
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lorenz Meier	00334ad76d	Navigator: Increase headroom in stack	2017-01-25 08:53:28 +01:00
Lorenz Meier	40402fe31f	Release v1.5.4	2017-01-15 01:40:23 +01:00
Lorenz Meier	f7f47fe6b2	MPU6K: Make stop routine safe to call from any location in the startup code	2016-12-18 13:06:19 +01:00
Daniel Agar	d7b7799faa	geofence fix combined simple and polygon logic - require being inside both fences, not either	2016-12-14 08:54:13 +01:00
Paul Riseborough	85983a1681	Commander: Fix pre-flight EKF check errors	2016-12-09 19:07:26 +01:00
Michael Schaeuble	26aa0f70b5	Disable LPE in px4fmu-v2_default With GCC 4.9 the binary is to large for the flash memory. This is why we disabled LPE on that platform.	2016-12-09 19:06:06 +01:00
Michael Schaeuble	3af7b1e801	Fix incorrect MPU9250 device ID We propagate the bus parameters from the bus interface to the sensor devices. Thus, the device ID of the sensor driver is set to the correct bus id and address. Otherwise it would be zero, which is an issue if several MPU9250s are running at the same time.	2016-12-09 19:06:00 +01:00