fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add flight_mode_manager to all targets with mc_pos_control

Browse Source
This commit is contained in:
Matthias Grob 2020-10-24 17:09:25 +02:00 committed by Daniel Agar
parent fa7170bc4f
commit 7545249215
80 changed files with 90 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boards/aerotenna/ocpoc/default.cmake
View File

@ -45,6 +45,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/airmind/mindpx-v2/default.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/atlflight/eagle/default.cmake
View File

@ -64,6 +64,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/atlflight/eagle/qurt.cmake
View File

@ -56,6 +56,7 @@ px4_add_board(
attitude_estimator_q
commander
ekf2
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/atlflight/excelsior/default.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/atlflight/excelsior/qurt.cmake
View File

@ -56,6 +56,7 @@ px4_add_board(
attitude_estimator_q
commander
ekf2
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/av/x-v1/default.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/beaglebone/blue/default.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/bitcraze/crazyflie/default.cmake
View File

@ -21,6 +21,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
land_detector
landing_target_estimator
load_mon

1
boards/cuav/nora/default.cmake
View File

@ -64,6 +64,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/cuav/x7pro/default.cmake
View File

@ -67,6 +67,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/cubepilot/cubeorange/console.cmake
View File

@ -67,6 +67,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/cubepilot/cubeorange/default.cmake
View File

@ -67,6 +67,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/cubepilot/cubeyellow/console.cmake
View File

@ -66,6 +66,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/cubepilot/cubeyellow/default.cmake
View File

@ -66,6 +66,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/emlid/navio2/default.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/holybro/durandal-v1/default.cmake
View File

@ -65,6 +65,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/holybro/kakutef7/default.cmake
View File

@ -37,6 +37,7 @@ px4_add_board(
dataman
#ekf2
events
flight_mode_manager
land_detector
load_mon
#local_position_estimator

1
boards/holybro/pix32v5/default.cmake
View File

@ -70,6 +70,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/intel/aerofc-v1/default.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
land_detector

1
boards/intel/aerofc-v1/rtps.cmake
View File

@ -39,6 +39,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
land_detector

1
boards/modalai/fc-v1/default.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/mro/ctrl-zero-f7/default.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/mro/x21-777/default.cmake
View File

@ -64,6 +64,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/mro/x21/default.cmake
View File

@ -60,6 +60,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmuk66-e/default.cmake
View File

@ -60,6 +60,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmuk66-e/socketcan.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmuk66-v3/default.cmake
View File

@ -60,6 +60,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmuk66-v3/rtps.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmuk66-v3/socketcan.cmake
View File

@ -59,6 +59,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/nxp/fmurt1062-v1/default.cmake
View File

@ -57,6 +57,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
land_detector
landing_target_estimator
load_mon

1
boards/omnibus/f4sd/default.cmake
View File

@ -48,6 +48,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
land_detector

1
boards/px4/fmu-v2/default.cmake
View File

@ -76,6 +76,7 @@ px4_add_board(
ekf2
#esc_battery
#events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v2/lpe.cmake
View File

@ -64,6 +64,7 @@ px4_add_board(
dataman
#ekf2
events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
#rover_pos_control

1
boards/px4/fmu-v2/multicopter.cmake
View File

@ -41,6 +41,7 @@ px4_add_board(
commander
dataman
ekf2
flight_mode_manager
#events
land_detector
landing_target_estimator

1
boards/px4/fmu-v2/test.cmake
View File

@ -70,6 +70,7 @@ px4_add_board(
dataman
#ekf2
#events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
land_detector

1
boards/px4/fmu-v3/default.cmake
View File

@ -72,6 +72,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v3/rtps.cmake
View File

@ -69,6 +69,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v3/stackcheck.cmake
View File

@ -64,6 +64,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
rover_pos_control

1
boards/px4/fmu-v4/default.cmake
View File

@ -66,6 +66,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v4/optimized.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v4/rtps.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v4/stackcheck.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v4pro/default.cmake
View File

@ -65,6 +65,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v4pro/rtps.cmake
View File

@ -62,6 +62,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/critmonitor.cmake
View File

@ -67,6 +67,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/debug.cmake
View File

@ -71,6 +71,7 @@ px4_add_board(
ekf2
#esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/default.cmake
View File

@ -71,6 +71,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/irqmonitor.cmake
View File

@ -68,6 +68,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/multicopter.cmake
View File

@ -58,6 +58,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
land_detector
landing_target_estimator
load_mon

1
boards/px4/fmu-v5/optimized.cmake
View File

@ -63,6 +63,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/rtps.cmake
View File

@ -68,6 +68,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5/stackcheck.cmake
View File

@ -71,6 +71,7 @@ px4_add_board(
ekf2
#esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5x/base_phy_DP83848C.cmake
View File

@ -66,6 +66,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v5x/default.cmake
View File

@ -69,6 +69,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v6x/default.cmake
View File

@ -69,6 +69,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/fmu-v6x/stackcheck.cmake
View File

@ -69,6 +69,7 @@ px4_add_board(
ekf2
esc_battery
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/raspberrypi/default.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/sitl/nolockstep.cmake
View File

@ -32,6 +32,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/sitl/rtps.cmake
View File

@ -32,6 +32,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/px4/sitl/test.cmake
View File

@ -31,6 +31,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/scumaker/pilotpi/arm64.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/scumaker/pilotpi/default.cmake
View File

@ -40,6 +40,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
fw_att_control
fw_pos_control_l1
land_detector

1
boards/spracing/h7extreme/default.cmake
View File

@ -62,6 +62,7 @@ px4_add_board(
dataman
#ekf2
events
flight_mode_manager
#fw_att_control
#fw_pos_control_l1
land_detector

17
boards/spracing/h7extreme/nuttx-config/scripts/script.ld
View File

@ -35,8 +35,8 @@
*
****************************************************************************/
/* The SP Racing H7 Extreme uses an STM32H750VIT6 has 128Kb of main FLASH memory and
128 MB external NAND FLASH memory.
/* The SP Racing H7 Extreme uses an STM32H750VIT6 has 128Kb of main FLASH memory and
128 MB external NAND FLASH memory.
* The flash memory is partitioned into a User Flash memory and a System
* Flash memory. Each of these memories has two banks:
*
@ -139,7 +139,7 @@ SECTIONS
.itcm_code : {
_start_itcm = ABSOLUTE(.);
. = ALIGN(4);
*modules__mc_att_control.a:*(.text* .rodata*)
*modules__mc_rate_control.a:*(.text* .rodata*)
*modules__rc_update.a:*(.text* .rodata*)
@ -152,16 +152,17 @@ SECTIONS
*modules__attitude_estimator_q.a:*(.text* .rodata*)
*stm32_spi.o(.text* .rodata*)
*stm32_dma.o(.text* .rodata*)
_end_itcm = ABSOLUTE(.);
} > itcm AT > qspi2
_load_itcm = LOADADDR(.itcm_code);
.sram_code : {
_start_sram = ABSOLUTE(.);
. = ALIGN(4);
*drivers__dshot.a:*(.text* .rodata*)
*modules__flight_mode_manager.a:*(.text* .rodata*)
*modules__mc_pos_control.a:*(.text* .rodata*)
*modules__mc_hover_thrust_estimator.a:*(.text* .rodata*)
*modules__sensors.a:*(.text* .rodata*)
@ -179,7 +180,7 @@ SECTIONS
_end_sram = ABSOLUTE(.);
} > sram AT > qspi2
_load_sram = LOADADDR(.sram_code);
.text : {
_stext = ABSOLUTE(.);
*(.vectors)
@ -202,7 +203,7 @@ SECTIONS
*(.gnu.linkonce.r.*)
_etext = ABSOLUTE(.);
} > qspi
.ramfunc : {
_sramfuncs = ABSOLUTE(.);
. = ALIGN(4);

1
boards/uvify/core/default.cmake
View File

@ -46,6 +46,7 @@ px4_add_board(
dataman
ekf2
events
flight_mode_manager
land_detector
landing_target_estimator
load_mon

1
platforms/qurt/src/px4/common/commands_hil.c
View File

@ -54,6 +54,7 @@ const char *get_commands()
"sensors start\n"
"ekf2 start\n"
"mc_hover_thrust_estimator start\n"
"flight_mode_manager start\n"
"mc_pos_control start\n"
"mc_att_control start\n"
"mc_rate_control start\n"

3
posix-configs/SITL/init/test/test_shutdown
View File

@ -28,6 +28,7 @@ navigator start
ekf2 start
vtol_att_control start
mc_hover_thrust_estimator start
flight_mode_manager start vtol
mc_pos_control start vtol
mc_att_control start vtol
mc_rate_control start vtol
@ -57,6 +58,7 @@ rc_update stop
land_detector status
navigator status
ekf2 status
flight_mode_manager status
mc_pos_control status
mc_att_control status
mc_rate_control status
@ -73,6 +75,7 @@ pwm_out_sim stop
mc_rate_control stop
mc_att_control stop
fw_att_control stop
flight_mode_manager stop
mc_pos_control stop
fw_pos_control_l1 stop
navigator stop

1
posix-configs/bbblue/px4.config
View File

@ -69,6 +69,7 @@ ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/eagle/200qx/px4.config
View File

@ -28,6 +28,7 @@ commander start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/eagle/210qc/px4.config
View File

@ -28,6 +28,7 @@ commander start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/eagle/flight/px4.config
View File

@ -16,6 +16,7 @@ commander start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/eagle/hil/px4.config
View File

@ -18,6 +18,7 @@ commander start -hil
sensors start
ekf2 start
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/eagle/init/rcS
View File

@ -88,6 +88,7 @@ fi
qshell commander start
qshell land_detector start multicopter
qshell mc_hover_thrust_estimator start
qshell flight_mode_manager start
qshell mc_pos_control start
qshell mc_att_control start
qshell mc_rate_control start

1
posix-configs/excelsior/px4.config
View File

@ -26,6 +26,7 @@ commander start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/ocpoc/px4.config
View File

@ -36,6 +36,7 @@ dataman start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/rpi/pilotpi_mc.config
View File

@ -50,6 +50,7 @@ navigator start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/rpi/px4.config
View File

@ -39,6 +39,7 @@ navigator start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/rpi/px4_hil.config
View File

@ -29,6 +29,7 @@ navigator start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start
mc_rate_control start

1
posix-configs/rpi/px4_test.config
View File

@ -39,6 +39,7 @@ navigator start
ekf2 start
land_detector start multicopter
mc_hover_thrust_estimator start
flight_mode_manager start
mc_pos_control start
mc_att_control start