Merge branch 'master' into mavlink_spec

.dockerignore

@@ -18,12 +18,14 @@ modules
 tests
 Tools
 # autotest directories
-test.?
+test.*
 terrain
 logs
 # mavproxy stuff
 mav.*
 
 # include the setup script and completion
 !Tools/environment_install/install-prereqs-ubuntu.sh
+!Tools/environment_install/install-prereqs-arch.sh
 !Tools/completion
+autotest_result_*_junit.xml

.editorconfig

@@ -13,8 +13,9 @@ indent_style = space
 indent_size = 4
 end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = false # These are the correct rules for APM coding standards, but fixing up old files causes git spam
-insert_final_newline = false
+# These are the correct rules for APM coding standards, but fixing up old files causes git spam
+trim_trailing_whitespace = false
+insert_final_newline = true
 
 [*.mk]
 indent_style = tab

.flake8

@@ -1,12 +1,23 @@
 [flake8]
-ignore =
+extend-ignore =
     # H301: one import per line
     H301,
     # H306: imports not in alphabetical order (time, os)
     H306,
     # E226: missing whitespace around arithmetic operator
     E226,
     # E261 at least two spaces before inline comment
-    E261
+    E261,
+    # W504 line break after binary operator
+    W504,
+    # E203 whitespace before ':'
+    E203,
+    # E221 multiple spaces before operator
+    E221
+
+extend-exclude =
+    build,
+    modules,
+    .git
 
 max-line-length = 127

.git-blame-ignore-revs

@@ -0,0 +1,6 @@
+# This file allows ignoring commits in git blame view on Github.
+# For more info, see here:
+# https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
+
+# Tools: ros2: Run ament_black on all files
+85172b56467668bee9fa0e68081027b13bc18c4a

.gitattributes

@@ -3,4 +3,10 @@
 # This breaks Vagrant for some users.
 *.sh text eol=lf
 
+*.bin -diff
+*.elf -diff
+*.hex -diff
 
+*.bin binary linguist-generated
+*.elf binary linguist-generated
+*.hex binary linguist-generated

.github/CONTRIBUTING.md

@@ -25,8 +25,14 @@ Please see our [wiki article](https://ardupilot.org/dev/docs/submitting-patches-
 
 The ArduPilot project is open source and [maintained](https://github.com/ArduPilot/ardupilot#maintainers) by a team of volunteers.
 
-To contribute, you can send a pull request on Github. You can also
-join the [development discussion on Google
-Groups](https://groups.google.com/forum/?fromgroups#!forum/drones-discuss). Note
-that the Google Groups mailing lists are NOT for user tech support,
-and are moderated for new users to prevent off-topic discussion.
+To contribute, you can send a pull request on GitHub.
+
+New developers are recommended to join the `#general` channel on
+[Discord](https://ardupilot.org/discord).
+
+You can also join the
+[development discussion on Discourse](https://discuss.ardupilot.org/c/development-team),
+or [Gitter](https://gitter.im/ArduPilot/ardupilot).
+
+Note that these are NOT for user tech support, and are moderated
+for new users to prevent off-topic discussion.

.github/problem-matchers/autotestfail.json

@@ -0,0 +1,17 @@
+{
+    "__comment": "by buzz try to match common autotest warnings and errors that arent caught by gcc.json or python.json",
+    "problemMatcher": [
+        {
+            "owner": "autotest-fail-matcher",
+            "severity": "error",
+            "pattern": [
+                {
+                    "regexp": "^(.*)(TIMEOUT|Build failed|FAILED STEP):(.*)$",
+                    "column": 1,
+                    "code": 2,
+                    "message": 3
+                }
+            ]
+        }
+    ]
+}

.github/problem-matchers/autotestwarn.json

@@ -0,0 +1,17 @@
+{
+    "__comment": "by buzz try to match common autotest warnings and errors that arent caught by gcc.json or python.json",
+    "problemMatcher": [
+        {
+            "owner": "autotest-warn-matcher",
+            "severity": "warning",
+            "pattern": [
+                {
+                    "regexp": "^(.*)(WARN|WARNING):(.*)$",
+                    "column": 1,
+                    "code": 2,
+                    "message": 3
+                }
+            ]
+        }
+    ]
+}

.github/problem-matchers/gcc.json

@@ -0,0 +1,18 @@
+{
+    "__comment": "Taken from vscode-cpptools's Extension/package.json gcc rule",
+    "problemMatcher": [
+        {
+            "owner": "gcc-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^(.*):(\\d+):(\\d+):\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
+                    "file": 1,
+                    "line": 2,
+                    "column": 3,
+                    "severity": 4,
+                    "message": 5
+                }
+            ]
+        }
+    ]
+}

.github/problem-matchers/python.json

@@ -0,0 +1,22 @@
+{
+    "__comment": "inspired by https://github.com/microsoft/vscode-python/issues/3828#issuecomment-575439587",
+    "problemMatcher": [
+        {
+            "owner": "python-problem-matcher",
+            "pattern": [
+                {
+                    "regexp": "^.*File \\\"([^\\\"]|.*)\\\", line (\\d+).*",
+                    "file": 1,
+                    "line": 2
+                },
+                {
+                    "regexp": "^.*raise.*$"
+                },
+                {
+                    "regexp": "^\\s*(.*)\\s*$",
+                    "message": 1
+                }
+            ]
+        }
+    ]
+}

.github/workflows/cache_cleanup.yml

@@ -0,0 +1,39 @@
+name: cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+  workflow_dispatch:
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-22.04
+    permissions:
+      # `actions:write` permission is required to delete caches
+      #   See also: https://docs.github.com/en/rest/actions/cache?apiVersion=2022-11-28#delete-a-github-actions-cache-for-a-repository-using-a-cache-id
+      actions: write
+      contents: read
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          REPO=${{ github.repository }}
+          BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys.
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ccache.env

@@ -0,0 +1,10 @@
+# common ccache env vars for CI
+export CCACHE_SLOPPINESS=file_stat_matches
+
+mkdir -p ~/.ccache
+echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
+echo "compression = true" >> ~/.ccache/ccache.conf
+echo "compression_level = 6" >> ~/.ccache/ccache.conf
+echo "max_size = 400M" >> ~/.ccache/ccache.conf
+ccache -s
+ccache -z