diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-02-16 17:07:02 +0100 |
commit | 8016032a40aaab55fc1d48d1a092cb00d5da92d0 (patch) | |
tree | 09b8a96ebf6e8c6ca3d66a04ae85a92ebbcba139 /makefiles | |
parent | 30612eb32d1acd3139e28254bb0b7e793826a343 (diff) | |
parent | 5bb004a7113484a5461c07af31d51b3579a8596e (diff) | |
download | px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.gz px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.tar.bz2 px4-firmware-8016032a40aaab55fc1d48d1a092cb00d5da92d0.zip |
Merged beta into paul_estimator
Diffstat (limited to 'makefiles')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 10 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 6 | ||||
-rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 5 |
3 files changed, 13 insertions, 8 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 305cc567f..c47b773af 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -21,7 +21,6 @@ MODULES += drivers/px4fmu MODULES += drivers/boards/px4fmu-v1 MODULES += drivers/ardrone_interface MODULES += drivers/l3gd20 -#MODULES += drivers/bma180 MODULES += drivers/mpu6000 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 @@ -44,7 +43,6 @@ MODULES += modules/sensors # MODULES += systemcmds/mtd MODULES += systemcmds/bl_update -MODULES += systemcmds/boardinfo MODULES += systemcmds/i2c MODULES += systemcmds/mixer MODULES += systemcmds/param @@ -65,14 +63,12 @@ MODULES += systemcmds/hw_ver MODULES += modules/commander MODULES += modules/navigator MODULES += modules/mavlink -MODULES += modules/mavlink_onboard MODULES += modules/gpio_led # # Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/attitude_estimator_so3 MODULES += modules/fw_att_pos_estimator MODULES += modules/position_estimator_inav #MODULES += examples/flow_position_estimator @@ -82,8 +78,8 @@ MODULES += modules/position_estimator_inav # MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control -MODULES += modules/multirotor_att_control -MODULES += modules/multirotor_pos_control +MODULES += modules/mc_att_control +MODULES += modules/mc_pos_control #MODULES += examples/flow_position_control #MODULES += examples/flow_speed_control @@ -105,6 +101,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries @@ -116,6 +113,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index 2ba279831..b246befdb 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -87,8 +87,8 @@ MODULES += examples/flow_position_estimator #MODULES += modules/segway # XXX Needs GCC 4.7 fix MODULES += modules/fw_pos_control_l1 MODULES += modules/fw_att_control -MODULES += modules/multirotor_att_control -MODULES += modules/multirotor_pos_control +MODULES += modules/mc_att_control +MODULES += modules/mc_pos_control # # Logging @@ -108,6 +108,7 @@ MODULES += modules/systemlib MODULES += modules/systemlib/mixer MODULES += modules/controllib MODULES += modules/uORB +MODULES += modules/dataman # # Libraries @@ -119,6 +120,7 @@ MODULES += lib/ecl MODULES += lib/external_lgpl MODULES += lib/geo MODULES += lib/conversion +MODULES += lib/launchdetection # # Demo apps diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 4f997e96b..79922374d 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -42,6 +42,11 @@ MODULES += lib/mathlib MODULES += lib/mathlib/math/filter # +# Libraries +# +LIBRARIES += lib/mathlib/CMSIS + +# # Transitional support - add commands from the NuttX export archive. # # In general, these should move to modules over time. |