diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-07 16:00:59 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-01-07 16:00:59 +0100 |
| commit | fe279d340dccdd40ebfade4c53893e8f7a77b45e (patch) | |
| tree | 6ca7e8517507e097097a45cca384c51d343b5fc7 /src/lib/ecl/module.mk | |
| parent | 417a82c699c2512ca3b8998c91c9d77f5d826edb (diff) | |
| parent | 6ed2f77ca5c713e537c8fd4a9aacd7adc7887f53 (diff) | |
| download | px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.tar.gz px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.tar.bz2 px4-firmware-fe279d340dccdd40ebfade4c53893e8f7a77b45e.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
Conflicts:
Makefile
Diffstat (limited to 'src/lib/ecl/module.mk')
| -rw-r--r-- | src/lib/ecl/module.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/ecl/module.mk b/src/lib/ecl/module.mk index 93a5b511f..03974c950 100644 --- a/src/lib/ecl/module.mk +++ b/src/lib/ecl/module.mk @@ -35,7 +35,8 @@ # Estimation and Control Library # -SRCS = attitude_fw/ecl_pitch_controller.cpp \ +SRCS = attitude_fw/ecl_controller.cpp \ + attitude_fw/ecl_pitch_controller.cpp \ attitude_fw/ecl_roll_controller.cpp \ attitude_fw/ecl_yaw_controller.cpp \ l1/ecl_l1_pos_controller.cpp |