diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:38:27 +0200 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-09-30 15:38:27 +0200 |
| commit | cc05f0f18587b35452fe5e27a55769cefe18c4e5 (patch) | |
| tree | ef787183da27b6a4fdf6de16ae843aed6985ff9b /makefiles | |
| parent | 15eee418a035a0109bc0a33fa5889352aa3a1799 (diff) | |
| parent | ab400089bc2a42f1f0ace569d8f0ee58f4338e1d (diff) | |
| download | px4-firmware-cc05f0f18587b35452fe5e27a55769cefe18c4e5.tar.gz px4-firmware-cc05f0f18587b35452fe5e27a55769cefe18c4e5.tar.bz2 px4-firmware-cc05f0f18587b35452fe5e27a55769cefe18c4e5.zip | |
Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang
Conflicts:
src/lib/external_lgpl/tecs/tecs.cpp
src/modules/commander/commander_params.c
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/navigator/navigator_main.cpp
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 3 | ||||
| -rw-r--r-- | makefiles/config_px4fmu-v2_test.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index 99c0eb8c1..ffb9391d2 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -27,8 +27,6 @@ MODULES += drivers/ms5611 MODULES += drivers/mb12xx MODULES += drivers/gps MODULES += drivers/hil -MODULES += drivers/hott/hott_telemetry -MODULES += drivers/hott/hott_sensors MODULES += drivers/blinkm MODULES += drivers/rgbled MODULES += drivers/mkblctrl @@ -42,7 +40,6 @@ MODULES += modules/sensors # System commands # MODULES += systemcmds/mtd -MODULES += systemcmds/bl_update MODULES += systemcmds/mixer MODULES += systemcmds/param MODULES += systemcmds/perf diff --git a/makefiles/config_px4fmu-v2_test.mk b/makefiles/config_px4fmu-v2_test.mk index 932f92261..a41670a77 100644 --- a/makefiles/config_px4fmu-v2_test.mk +++ b/makefiles/config_px4fmu-v2_test.mk @@ -54,6 +54,9 @@ MODULES += lib/conversion # LIBRARIES += lib/mathlib/CMSIS +MODULES += modules/unit_test +MODULES += modules/mavlink/mavlink_tests + # # Transitional support - add commands from the NuttX export archive. # |