Skip to content

Commit 78d149e

Browse files
Jaeyoung-LimJaeyoung-Lim
authored
Merge pull request #33 from ethz-asl/pr-upstream-merge-211021
upstream merge 211021
2 parents 3008f64 + 023e613 commit 78d149e

File tree

1,564 files changed

+40218
-33622
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,564 files changed

+40218
-33622
lines changed

‎.ci/Jenkinsfile-compile‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ pipeline {
99
script {
1010
def build_nodes = [:]
1111
def docker_images = [
12-
armhf: "px4io/px4-dev-armhf:2021-05-04",
13-
arm64: "px4io/px4-dev-aarch64:2021-05-04",
14-
base: "px4io/px4-dev-base-bionic:2021-05-04",
15-
nuttx: "px4io/px4-dev-nuttx-focal:2021-05-04",
12+
armhf: "px4io/px4-dev-armhf:2021-09-08",
13+
arm64: "px4io/px4-dev-aarch64:2021-09-08",
14+
base: "px4io/px4-dev-base-bionic:2021-09-08",
15+
nuttx: "px4io/px4-dev-nuttx-focal:2021-09-08",
1616
]
1717

1818
def armhf_builds = [
@@ -38,6 +38,10 @@ pipeline {
3838
"airmind_mindpx-v2_default",
3939
"ark_can-flow_canbootloader",
4040
"ark_can-flow_default",
41+
"ark_can-gps_canbootloader",
42+
"ark_can-gps_default",
43+
"ark_can-rtk-gps_canbootloader",
44+
"ark_can-rtk-gps_default",
4145
"atl_mantis-edu_default",
4246
"av_x-v1_default",
4347
"bitcraze_crazyflie_default",
@@ -80,16 +84,10 @@ pipeline {
8084
"px4_fmu-v2_multicopter",
8185
"px4_fmu-v2_rover",
8286
"px4_fmu-v3_default",
83-
"px4_fmu-v4_cannode",
8487
"px4_fmu-v4_default",
8588
"px4_fmu-v4pro_default",
86-
"px4_fmu-v5_ctrlalloc",
8789
"px4_fmu-v5_debug",
8890
"px4_fmu-v5_default",
89-
"px4_fmu-v5_fixedwing",
90-
"px4_fmu-v5_multicopter",
91-
"px4_fmu-v5_optimized",
92-
"px4_fmu-v5_rover",
9391
"px4_fmu-v5_rtps",
9492
"px4_fmu-v5_stackcheck",
9593
"px4_fmu-v5_uavcanv0periph",
@@ -127,7 +125,7 @@ pipeline {
127125
// TODO: actually upload artifacts to S3
128126
// stage('S3 Upload') {
129127
// agent {
130-
// docker { image 'px4io/px4-dev-base-focal:2021-05-04' }
128+
// docker { image 'px4io/px4-dev-base-focal:2021-09-08' }
131129
// }
132130
// options {
133131
// skipDefaultCheckout()

‎.ci/Jenkinsfile-hardware‎

Lines changed: 280 additions & 319 deletions
Large diffs are not rendered by default.

‎.clang-tidy‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,15 @@ Checks: '*,
7474
-modernize-deprecated-headers,
7575
-modernize-loop-convert,
7676
-modernize-pass-by-value,
77+
-modernize-raw-string-literal,
7778
-modernize-return-braced-init-list,
7879
-modernize-use-auto,
7980
-modernize-use-bool-literals,
8081
-modernize-use-default-member-init,
8182
-modernize-use-equals-default,
8283
-modernize-use-equals-delete,
8384
-modernize-use-override,
85+
-modernize-use-trailing-return-type,
8486
-modernize-use-using,
8587
-performance-inefficient-string-concatenation,
8688
-readability-avoid-const-params-in-decls,

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/cpp
33
{
44
"name": "px4-dev-nuttx",
5-
"image": "px4io/px4-dev-nuttx-focal:2021-05-04",
5+
"image": "px4io/px4-dev-nuttx-focal:2021-09-08",
66

77
"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
88

‎.github/workflows/checks.yml‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,13 @@ jobs:
2929
"parameters_metadata",
3030
]
3131
container:
32-
image: px4io/px4-dev-nuttx-focal:2021-05-04
32+
image: px4io/px4-dev-nuttx-focal:2021-09-08
3333
options: --privileged --ulimit core=-1 --security-opt seccomp=unconfined
3434
steps:
3535
- uses: actions/checkout@v1
3636
with:
3737
token: ${{ secrets.ACCESS_TOKEN }}
3838

39-
- name: Prepare ccache timestamp
40-
id: ccache_cache_timestamp
41-
shell: cmake -P {0}
42-
run: |
43-
string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
44-
message("::set-output name=timestamp::${current_date}")
45-
- name: ccache cache files
46-
uses: actions/cache@v2
47-
with:
48-
path: ~/.ccache
49-
key: tests_${{matrix.ubuntu_release}}-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
50-
restore-keys: tests_${{matrix.ubuntu_release}}-ccache-
51-
- name: setup ccache
52-
run: |
53-
mkdir -p ~/.ccache
54-
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
55-
echo "compression = true" >> ~/.ccache/ccache.conf
56-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
57-
echo "max_size = 100M" >> ~/.ccache/ccache.conf
58-
ccache -s
59-
ccache -z
6039
- name: check environment
6140
run: |
6241
export

‎.github/workflows/clang-tidy.yml‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,11 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14-
container: px4io/px4-dev-clang:2021-05-04
14+
container: px4io/px4-dev-clang:2021-09-08
1515
steps:
1616
- uses: actions/checkout@v1
1717
with:
1818
token: ${{secrets.ACCESS_TOKEN}}
1919

20-
- name: Prepare ccache timestamp
21-
id: ccache_cache_timestamp
22-
shell: cmake -P {0}
23-
run: |
24-
string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
25-
message("::set-output name=timestamp::${current_date}")
26-
- name: ccache cache files
27-
uses: actions/cache@v2
28-
with:
29-
path: ~/.ccache
30-
key: clang-tidy-ccache-${{steps.ccache_cache_timestamp.outputs.timestamp}}
31-
restore-keys: clang-tidy-ccache-
32-
- name: setup ccache
33-
run: |
34-
mkdir -p ~/.ccache
35-
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
36-
echo "compression = true" >> ~/.ccache/ccache.conf
37-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
38-
echo "max_size = 100M" >> ~/.ccache/ccache.conf
39-
ccache -s
40-
ccache -z
41-
4220
- name: make clang-tidy-quiet
43-
run: |
44-
ccache -z
45-
make clang-tidy-quiet
46-
ccache -s
21+
run: make clang-tidy-quiet

‎.github/workflows/compile_linux.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14-
container: px4io/px4-dev-armhf:2021-05-04
14+
container: px4io/px4-dev-armhf:2021-09-08
1515
strategy:
1616
matrix:
1717
config: [
@@ -42,8 +42,9 @@ jobs:
4242
mkdir -p ~/.ccache
4343
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
4444
echo "compression = true" >> ~/.ccache/ccache.conf
45-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
45+
echo "compression_level = 6" >> ~/.ccache/ccache.conf
4646
echo "max_size = 100M" >> ~/.ccache/ccache.conf
47+
echo "hash_dir = false" >> ~/.ccache/ccache.conf
4748
ccache -s
4849
ccache -z
4950

‎.github/workflows/compile_linux_arm64.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14-
container: px4io/px4-dev-aarch64:2021-05-04
14+
container: px4io/px4-dev-aarch64:2021-09-08
1515
strategy:
1616
matrix:
1717
config: [
@@ -39,8 +39,9 @@ jobs:
3939
mkdir -p ~/.ccache
4040
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
4141
echo "compression = true" >> ~/.ccache/ccache.conf
42-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
42+
echo "compression_level = 6" >> ~/.ccache/ccache.conf
4343
echo "max_size = 100M" >> ~/.ccache/ccache.conf
44+
echo "hash_dir = false" >> ~/.ccache/ccache.conf
4445
ccache -s
4546
ccache -z
4647

‎.github/workflows/compile_macos.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ jobs:
4343
mkdir -p ~/.ccache
4444
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
4545
echo "compression = true" >> ~/.ccache/ccache.conf
46-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
47-
echo "max_size = 100M" >> ~/.ccache/ccache.conf
46+
echo "compression_level = 6" >> ~/.ccache/ccache.conf
47+
echo "max_size = 40M" >> ~/.ccache/ccache.conf
48+
echo "hash_dir = false" >> ~/.ccache/ccache.conf
4849
ccache -s
4950
ccache -z
5051

‎.github/workflows/compile_nuttx.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ on:
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
14-
container: px4io/px4-dev-nuttx-focal:2021-05-04
14+
container: px4io/px4-dev-nuttx-focal:2021-09-08
1515
strategy:
16+
fail-fast: false
1617
matrix:
1718
config: [
1819
airmind_mindpx-v2,
1920
ark_can-flow,
2021
ark_can-gps,
22+
ark_can-rtk-gps,
2123
atl_mantis-edu,
2224
av_x-v1,
2325
bitcraze_crazyflie,
@@ -79,13 +81,15 @@ jobs:
7981
mkdir -p ~/.ccache
8082
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
8183
echo "compression = true" >> ~/.ccache/ccache.conf
82-
echo "compression_level = 5" >> ~/.ccache/ccache.conf
84+
echo "compression_level = 6" >> ~/.ccache/ccache.conf
8385
echo "max_size = 100M" >> ~/.ccache/ccache.conf
86+
echo "hash_dir = false" >> ~/.ccache/ccache.conf
8487
ccache -s
8588
ccache -z
8689
8790
- name: make all_variants_${{matrix.config}}
8891
run: make all_variants_${{matrix.config}}
92+
timeout-minutes: 45
8993
- name: make ${{matrix.config}} bloaty_compileunits
9094
run: make ${{matrix.config}} bloaty_compileunits || true
9195
- name: make ${{matrix.config}} bloaty_inlines
@@ -107,4 +111,6 @@ jobs:
107111
uses: actions/upload-artifact@v2
108112
with:
109113
name: px4_package_${{matrix.config}}
110-
path: build/**/*.px4
114+
path: |
115+
build/**/*.px4
116+
build/**/*.bin

0 commit comments

Comments
 (0)