diff options
author | Julian Oes <julian@oes.ch> | 2013-09-03 09:34:25 +0200 |
---|---|---|
committer | Julian Oes <julian@oes.ch> | 2013-09-03 09:34:25 +0200 |
commit | 96e7f42844abbd2a3ef36e207e639c0dffe75e66 (patch) | |
tree | 4ef89b11ababd57c5d16a1d531918127fbc722d4 /makefiles/config_px4fmu-v1_default.mk | |
parent | 1fed9ef1b1ec2d0bf7c2cba7d60be77e37faaf40 (diff) | |
parent | 2457013bbba3e15e3fbfcc45f07428f006d56dcd (diff) | |
download | px4-firmware-96e7f42844abbd2a3ef36e207e639c0dffe75e66.tar.gz px4-firmware-96e7f42844abbd2a3ef36e207e639c0dffe75e66.tar.bz2 px4-firmware-96e7f42844abbd2a3ef36e207e639c0dffe75e66.zip |
Merge branch 'master' into python3_compat
Diffstat (limited to 'makefiles/config_px4fmu-v1_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 40eebcb52..3e94c3534 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -6,6 +6,7 @@ # Use the configuration's ROMFS. # ROMFS_ROOT = $(PX4_BASE)/ROMFS/px4fmu_common +ROMFS_OPTIONAL_FILES = $(PX4_BASE)/Images/px4io-v1_default.bin # # Board support modules @@ -17,7 +18,7 @@ MODULES += drivers/stm32/tone_alarm MODULES += drivers/led MODULES += drivers/px4io MODULES += drivers/px4fmu -MODULES += drivers/boards/px4fmu +MODULES += drivers/boards/px4fmu-v1 MODULES += drivers/ardrone_interface MODULES += drivers/l3gd20 MODULES += drivers/bma180 @@ -30,6 +31,7 @@ MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm +MODULES += drivers/rgbled MODULES += drivers/mkblctrl MODULES += drivers/md25 MODULES += drivers/airspeed @@ -50,10 +52,12 @@ MODULES += systemcmds/param MODULES += systemcmds/perf MODULES += systemcmds/preflight_check MODULES += systemcmds/pwm +MODULES += systemcmds/esc_calib MODULES += systemcmds/reboot MODULES += systemcmds/top MODULES += systemcmds/tests MODULES += systemcmds/config +MODULES += systemcmds/nshterm # # General system control @@ -67,18 +71,16 @@ MODULES += modules/gpio_led # Estimation modules (EKF / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/attitude_estimator_so3_comp -MODULES += modules/position_estimator MODULES += modules/att_pos_estimator_ekf +MODULES += modules/position_estimator_inav MODULES += examples/flow_position_estimator # # Vehicle Control # -MODULES += modules/segway -MODULES += modules/fixedwing_backside -MODULES += modules/fixedwing_att_control -MODULES += modules/fixedwing_pos_control +#MODULES += modules/segway # XXX needs state machine update +#MODULES += modules/fw_pos_control_l1 +#MODULES += modules/fw_att_control MODULES += modules/multirotor_att_control MODULES += modules/multirotor_pos_control MODULES += examples/flow_position_control @@ -90,19 +92,27 @@ MODULES += examples/flow_speed_control MODULES += modules/sdlog2 # +# Unit tests +# +#MODULES += modules/unit_test +#MODULES += modules/commander/commander_tests + +# # Library modules # MODULES += modules/systemlib MODULES += modules/systemlib/mixer -MODULES += modules/mathlib -MODULES += modules/mathlib/math/filter MODULES += modules/controllib MODULES += modules/uORB # # Libraries # -LIBRARIES += modules/mathlib/CMSIS +LIBRARIES += lib/mathlib/CMSIS +MODULES += lib/mathlib +MODULES += lib/mathlib/math/filter +#MODULES += lib/ecl +MODULES += lib/geo # # Demo apps |