diff options
| author | Julian Oes <julian@oes.ch> | 2013-08-15 14:04:46 +0200 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-08-15 14:04:46 +0200 |
| commit | 56575eb068879beb68b3730ca6d3bb3755d6960a (patch) | |
| tree | 1b7b4c028c2b936db81310e82a8ef84adc125e3d /makefiles | |
| parent | 50cf1c01b701fced6437dfe574fd09cd312b9f15 (diff) | |
| parent | 561ec495b7df5b3ff4536d16d1389d1f02affd06 (diff) | |
| download | px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.tar.gz px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.tar.bz2 px4-firmware-56575eb068879beb68b3730ca6d3bb3755d6960a.zip | |
Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
src/drivers/blinkm/blinkm.cpp
src/drivers/px4io/px4io.cpp
src/modules/commander/state_machine_helper.c
src/modules/px4iofirmware/protocol.h
src/modules/px4iofirmware/registers.c
src/modules/systemlib/systemlib.h
src/systemcmds/reboot/reboot.c
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/config_px4fmu-v1_default.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/makefiles/config_px4fmu-v1_default.mk b/makefiles/config_px4fmu-v1_default.mk index db13cc197..d7d9a1ecb 100644 --- a/makefiles/config_px4fmu-v1_default.mk +++ b/makefiles/config_px4fmu-v1_default.mk @@ -50,6 +50,7 @@ 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 @@ -75,7 +76,7 @@ MODULES += examples/flow_position_estimator # # Vehicle Control # -MODULES += modules/segway +#MODULES += modules/segway # XXX needs state machine update MODULES += modules/fixedwing_backside MODULES += modules/fixedwing_att_control MODULES += modules/fixedwing_pos_control |