diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 14:42:12 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2013-04-27 14:42:12 +0200 |
commit | 7ca82801bd4d4b9d6f4a0ac515e5cfcdc28f2e05 (patch) | |
tree | 8168592010ae6fac2cdc9ce26d224566a3ce0702 /makefiles | |
parent | 988bf1eb0a3d36532883734a416f9c9e1e6ba125 (diff) | |
download | px4-firmware-7ca82801bd4d4b9d6f4a0ac515e5cfcdc28f2e05.tar.gz px4-firmware-7ca82801bd4d4b9d6f4a0ac515e5cfcdc28f2e05.tar.bz2 px4-firmware-7ca82801bd4d4b9d6f4a0ac515e5cfcdc28f2e05.zip |
Moved multirotor controllers
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu_default.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/makefiles/config_px4fmu_default.mk b/makefiles/config_px4fmu_default.mk index 6fd7da461..fea9a814d 100644 --- a/makefiles/config_px4fmu_default.mk +++ b/makefiles/config_px4fmu_default.mk @@ -54,6 +54,7 @@ MODULES += modules/mavlink_onboard # MODULES += modules/attitude_estimator_ekf MODULES += modules/position_estimator_mc +MODULES += modules/position_estimator MODULES += modules/att_pos_estimator_ekf # @@ -62,6 +63,8 @@ MODULES += modules/att_pos_estimator_ekf MODULES += modules/fixedwing_backside MODULES += modules/fixedwing_att_control MODULES += modules/fixedwing_pos_control +MODULES += modules/multirotor_att_control +MODULES += modules/multirotor_pos_control # # Logging @@ -83,12 +86,7 @@ endef # command priority stack entrypoint BUILTIN_COMMANDS := \ $(call _B, adc, , 2048, adc_main ) \ - $(call _B, control_demo, , 2048, control_demo_main ) \ - $(call _B, fixedwing_att_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_att_control_main ) \ - $(call _B, fixedwing_pos_control, SCHED_PRIORITY_MAX-30, 2048, fixedwing_pos_control_main ) \ $(call _B, math_demo, , 8192, math_demo_main ) \ - $(call _B, multirotor_att_control, SCHED_PRIORITY_MAX-15, 2048, multirotor_att_control_main) \ - $(call _B, multirotor_pos_control, SCHED_PRIORITY_MAX-25, 2048, multirotor_pos_control_main) \ $(call _B, sercon, , 2048, sercon_main ) \ $(call _B, serdis, , 2048, serdis_main ) \ $(call _B, tone_alarm, , 2048, tone_alarm_main ) \ |