diff options
| author | Julian Oes <julian@oes.ch> | 2013-12-27 00:04:32 +0100 |
|---|---|---|
| committer | Julian Oes <julian@oes.ch> | 2013-12-27 00:04:32 +0100 |
| commit | 40f2d581bffacbf214edfcadac3a57756d605196 (patch) | |
| tree | e63077b8eeb2ac98a3a28772ffa9dbeb63f6f865 /src/modules/fw_pos_control_l1/module.mk | |
| parent | 9d4ba6e4f64d631c67a419518a8398debade4641 (diff) | |
| parent | d3a71d1e420c595a9a242d12264d553759dd9e2a (diff) | |
| download | px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.tar.gz px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.tar.bz2 px4-firmware-40f2d581bffacbf214edfcadac3a57756d605196.zip | |
Merge branch 'fw_autoland_att_tecs_navigator_termination_controlgroups' into bottle_drop_navigator
Conflicts:
src/drivers/px4fmu/fmu.cpp
src/modules/dataman/dataman.c
src/modules/dataman/dataman.h
src/modules/mavlink/orb_listener.c
src/modules/mavlink/waypoints.c
src/modules/navigator/navigator_main.cpp
src/modules/navigator/navigator_mission.cpp
src/modules/navigator/navigator_mission.h
src/modules/uORB/topics/mission.h
Diffstat (limited to 'src/modules/fw_pos_control_l1/module.mk')
| -rw-r--r-- | src/modules/fw_pos_control_l1/module.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/modules/fw_pos_control_l1/module.mk b/src/modules/fw_pos_control_l1/module.mk index b00b9aa5a..cf419ec7e 100644 --- a/src/modules/fw_pos_control_l1/module.mk +++ b/src/modules/fw_pos_control_l1/module.mk @@ -38,4 +38,5 @@ MODULE_COMMAND = fw_pos_control_l1 SRCS = fw_pos_control_l1_main.cpp \ - fw_pos_control_l1_params.c + fw_pos_control_l1_params.c \ + landingslope.cpp |