fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-17 20:17:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

flight_mode_manager: merge with flight_tasks

Browse Source
This commit is contained in:
Daniel Agar
2021-01-04 10:21:47 -05:00
committed by Lorenz Meier
parent b1e442b830
commit 4d7b875ee2
79 changed files with 353 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mc_pos_control/MulticopterPositionControl.hpp
+2 -1
View File
@@ -40,7 +40,6 @@
#include <commander/px4_custom_mode.h>
#include <drivers/drv_hrt.h>
#include <lib/controllib/blocks.hpp>
#include <lib/flight_tasks/FlightTasks.hpp>
#include <lib/hysteresis/hysteresis.h>
#include <lib/perf/perf_counter.h>
#include <lib/systemlib/mavlink_log.h>
@@ -64,6 +63,8 @@
#include "PositionControl/PositionControl.hpp"
using namespace time_literals;
class MulticopterPositionControl : public ModuleBase<MulticopterPositionControl>, public control::SuperBlock,
public ModuleParams, public px4::WorkItem
{