Skip to content

Commit 32a93d6

Browse files
Jaeyoung-LimJaeyoung-Lim
authored
Merge pull request #11 from ethz-asl/pr-upstream-merge
23/02/2021 Upstream Merge
2 parents 472e191 + e256338 commit 32a93d6

File tree

392 files changed

+13024
-8903
lines changed

Some content is hidden

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

392 files changed

+13024
-8903
lines changed

‎.ci/Jenkinsfile-compile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pipeline {
3737
def nuttx_builds_archive = [
3838
target: [
3939
"airmind_mindpx-v2_default",
40+
"ark_can-flow_canbootloader",
4041
"ark_can-flow_default",
4142
"av_x-v1_default",
4243
"bitcraze_crazyflie_default",
@@ -49,36 +50,32 @@ pipeline {
4950
"cubepilot_cubeorange_default",
5051
"cubepilot_cubeyellow_console",
5152
"cubepilot_cubeyellow_default",
53+
"holybro_can-gps-v1_canbootloader",
54+
"holybro_can-gps-v1_default",
5255
"holybro_durandal-v1_default",
5356
"holybro_kakutef7_default",
5457
"holybro_pix32v5_default",
55-
"holybro_can-gps-v1",
56-
"holybro_can-gps-v1_canbootloader",
5758
"intel_aerofc-v1_default",
5859
"modalai_fc-v1_default",
5960
"mro_ctrl-zero-f7_default",
6061
"mro_pixracerpro_default",
6162
"mro_x21-777_default",
6263
"mro_x21_default",
64+
"nxp_fmuk66-e_default",
6365
"nxp_fmuk66-v3_default",
6466
"nxp_fmuk66-v3_rtps",
6567
"nxp_fmuk66-v3_socketcan",
66-
"nxp_fmuk66-e_default",
6768
"nxp_fmurt1062-v1_default",
6869
"nxp_ucans32k146_default",
6970
"omnibus_f4sd_default",
7071
"px4_fmu-v2_default",
7172
"px4_fmu-v2_fixedwing",
72-
"px4_fmu-v2_lpe",
7373
"px4_fmu-v2_multicopter",
7474
"px4_fmu-v2_rover",
7575
"px4_fmu-v2_test",
76-
"px4_fmu-v3_ctrlalloc",
7776
"px4_fmu-v3_default",
7877
"px4_fmu-v4_cannode",
79-
"px4_fmu-v4_ctrlalloc",
8078
"px4_fmu-v4_default",
81-
"px4_fmu-v4_optimized",
8279
"px4_fmu-v4pro_default",
8380
"px4_fmu-v5_ctrlalloc",
8481
"px4_fmu-v5_debug",
@@ -89,10 +86,12 @@ pipeline {
8986
"px4_fmu-v5_rover",
9087
"px4_fmu-v5_rtps",
9188
"px4_fmu-v5_stackcheck",
89+
"px4_fmu-v5_uavcanv0periph",
90+
"px4_fmu-v5_uavcanv1",
9291
"px4_fmu-v5x_base_phy_DP83848C",
9392
"px4_fmu-v5x_default",
94-
"px4_fmu-v6x_default",
9593
"px4_fmu-v6u_default",
94+
"px4_fmu-v6x_default",
9695
"px4_io-v2_default",
9796
"spracing_h7extreme_default",
9897
"uvify_core_default"

‎.ci/Jenkinsfile-hardware‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ pipeline {
481481
// configure
482482
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"' // disable buzzer
483483
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
484-
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"' // generic vtol standard
485-
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set IMU_GYRO_RATEMAX 2000"'
484+
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"' // generic quadcopter
486485
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save"'
487486
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "px4io forceupdate 14662 /etc/extras/px4_io-v2_default.bin" || true' // force px4io update
488487
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true' // reboot to apply
@@ -635,7 +634,7 @@ pipeline {
635634
// configure
636635
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set CBRK_BUZZER 782097"' // disable buzzer
637636
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOCONFIG 2"'
638-
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 13000"' // generic vtol standard
637+
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param set SYS_AUTOSTART 4001"' // generic quadcopter
639638
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "param save"'
640639
sh './Tools/HIL/run_nsh_cmd.py --device `find /dev/serial -name *usb-*` --cmd "reboot" || true' // reboot to apply
641640
}

‎.github/workflows/checks.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
mkdir -p ~/.ccache
5353
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
5454
echo "compression = true" >> ~/.ccache/ccache.conf
55-
echo "compression_level = 6" >> ~/.ccache/ccache.conf
56-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
55+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
56+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
5757
ccache -s
5858
ccache -z
5959
- name: check environment

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
mkdir -p ~/.ccache
3535
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
3636
echo "compression = true" >> ~/.ccache/ccache.conf
37-
echo "compression_level = 6" >> ~/.ccache/ccache.conf
38-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
37+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
38+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
3939
ccache -s
4040
ccache -z
4141

‎.github/workflows/compile_linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ 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 = 6" >> ~/.ccache/ccache.conf
47-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
46+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
47+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
4848
ccache -s
4949
ccache -z
5050

‎.github/workflows/compile_linux_arm64.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ 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 = 6" >> ~/.ccache/ccache.conf
43-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
42+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
43+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
4444
ccache -s
4545
ccache -z
4646

‎.github/workflows/compile_macos.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ 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 = 6" >> ~/.ccache/ccache.conf
47-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
46+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
47+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
4848
ccache -s
4949
ccache -z
5050

‎.github/workflows/compile_nuttx.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jobs:
1919
ark_can-flow_canbootloader,
2020
ark_can-flow_default,
2121
av_x-v1_default,
22-
bitcraze_crazyflie_default,
2322
bitcraze_crazyflie21_default,
23+
bitcraze_crazyflie_default,
2424
cuav_can-gps-v1_canbootloader,
2525
cuav_can-gps-v1_default,
2626
cuav_nora_default,
@@ -49,17 +49,12 @@ jobs:
4949
omnibus_f4sd_default,
5050
px4_fmu-v2_default,
5151
px4_fmu-v2_fixedwing,
52-
px4_fmu-v2_lpe,
5352
px4_fmu-v2_multicopter,
5453
px4_fmu-v2_rover,
5554
px4_fmu-v2_test,
56-
px4_fmu-v3_ctrlalloc,
5755
px4_fmu-v3_default,
5856
px4_fmu-v4_cannode,
59-
px4_fmu-v4_ctrlalloc,
6057
px4_fmu-v4_default,
61-
px4_fmu-v4_optimized,
62-
px4_fmu-v4_uavcanv1,
6358
px4_fmu-v4pro_default,
6459
px4_fmu-v5_ctrlalloc,
6560
px4_fmu-v5_default,
@@ -68,12 +63,12 @@ jobs:
6863
px4_fmu-v5_optimized,
6964
px4_fmu-v5_rover,
7065
px4_fmu-v5_rtps,
71-
px4_fmu-v5_stackcheck,
66+
px4_fmu-v5_uavcanv0periph,
7267
px4_fmu-v5_uavcanv1,
7368
px4_fmu-v5x_base_phy_DP83848C,
7469
px4_fmu-v5x_default,
75-
px4_fmu-v6x_default,
7670
px4_fmu-v6u_default,
71+
px4_fmu-v6x_default,
7772
px4_io-v2_default,
7873
spracing_h7extreme_default,
7974
uvify_core_default
@@ -100,8 +95,8 @@ jobs:
10095
mkdir -p ~/.ccache
10196
echo "base_dir = ${GITHUB_WORKSPACE}" > ~/.ccache/ccache.conf
10297
echo "compression = true" >> ~/.ccache/ccache.conf
103-
echo "compression_level = 6" >> ~/.ccache/ccache.conf
104-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
98+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
99+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
105100
ccache -s
106101
ccache -z
107102

‎.github/workflows/compile_nuttx_cannode.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ 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 = 6" >> ~/.ccache/ccache.conf
47-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
46+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
47+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
4848
ccache -s
4949
ccache -z
5050

‎.github/workflows/mavros_avoidance_tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ 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 = 6" >> ~/.ccache/ccache.conf
47-
echo "max_size = 400M" >> ~/.ccache/ccache.conf
46+
echo "compression_level = 5" >> ~/.ccache/ccache.conf
47+
echo "max_size = 100M" >> ~/.ccache/ccache.conf
4848
ccache -s
4949
ccache -z
5050

0 commit comments

Comments
 (0)