diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-05 09:34:22 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-05 09:34:22 +0100 |
commit | 92135d155d36096fad5c215f119cca166f6ac611 (patch) | |
tree | da687cb8af77cec3fe09edb2373c22c038369413 /makefiles/config_px4fmu-v2_default.mk | |
parent | 0f1a7e7b5b699601886adec5215bf818b050a758 (diff) | |
parent | 6bd586c8373607faeb0e6eeb1135c9623ce9954e (diff) | |
download | px4-firmware-92135d155d36096fad5c215f119cca166f6ac611.tar.gz px4-firmware-92135d155d36096fad5c215f119cca166f6ac611.tar.bz2 px4-firmware-92135d155d36096fad5c215f119cca166f6ac611.zip |
Merge remote-tracking branch 'upstream/master' into ROS_shared_lib_base_class
Diffstat (limited to 'makefiles/config_px4fmu-v2_default.mk')
-rw-r--r-- | makefiles/config_px4fmu-v2_default.mk | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/makefiles/config_px4fmu-v2_default.mk b/makefiles/config_px4fmu-v2_default.mk index d17dff5bb..df6b6d0c5 100644 --- a/makefiles/config_px4fmu-v2_default.mk +++ b/makefiles/config_px4fmu-v2_default.mk @@ -27,27 +27,22 @@ MODULES += drivers/l3gd20 MODULES += drivers/hmc5883 MODULES += drivers/ms5611 MODULES += drivers/mb12xx -MODULES += drivers/sf0x +# MODULES += drivers/sf0x MODULES += drivers/ll40ls +# MODULES += drivers/trone MODULES += drivers/gps MODULES += drivers/hil MODULES += drivers/hott/hott_telemetry MODULES += drivers/hott/hott_sensors -MODULES += drivers/blinkm +# MODULES += drivers/blinkm MODULES += drivers/airspeed MODULES += drivers/ets_airspeed MODULES += drivers/meas_airspeed MODULES += drivers/frsky_telemetry MODULES += modules/sensors MODULES += drivers/mkblctrl -MODULES += drivers/pca8574 MODULES += drivers/px4flow - -# Needs to be burned to the ground and re-written; for now, -# just don't build it. -#MODULES += drivers/mkblctrl - # # System commands # @@ -61,7 +56,6 @@ MODULES += systemcmds/pwm MODULES += systemcmds/esc_calib MODULES += systemcmds/reboot MODULES += systemcmds/top -MODULES += systemcmds/tests MODULES += systemcmds/config MODULES += systemcmds/nshterm MODULES += systemcmds/mtd @@ -81,10 +75,8 @@ MODULES += modules/uavcan # Estimation modules (EKF/ SO3 / other filters) # MODULES += modules/attitude_estimator_ekf -MODULES += modules/attitude_estimator_so3 MODULES += modules/ekf_att_pos_estimator MODULES += modules/position_estimator_inav -MODULES += examples/flow_position_estimator # # Vehicle Control @@ -101,12 +93,6 @@ MODULES += modules/mc_pos_control MODULES += modules/sdlog2 # -# Unit tests -# -#MODULES += modules/unit_test -#MODULES += modules/commander/commander_tests - -# # Library modules # MODULES += modules/systemlib @@ -139,7 +125,7 @@ MODULES += modules/bottle_drop #MODULES += examples/math_demo # Tutorial code from # https://pixhawk.ethz.ch/px4/dev/hello_sky -MODULES += examples/px4_simple_app +#MODULES += examples/px4_simple_app # Tutorial code from # https://pixhawk.ethz.ch/px4/dev/daemon @@ -156,6 +142,9 @@ MODULES += examples/px4_simple_app # Hardware test #MODULES += examples/hwtest +# Generate parameter XML file +GEN_PARAM_XML = 1 + # # Transitional support - add commands from the NuttX export archive. # |