mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-04-14 10:07:39 +08:00
FlightTaskManual/Orbit: make sure we are not required stick input data during orbit
This commit is contained in:
parent
e5d237088c
commit
6ec9ff64d1
@ -90,7 +90,14 @@ bool FlightTaskManual::initializeSubscriptions(SubscriptionArray &subscription_a
|
||||
|
||||
bool FlightTaskManual::updateInitialize()
|
||||
{
|
||||
return FlightTask::updateInitialize() && _evaluateSticks();
|
||||
bool ret = FlightTask::updateInitialize();
|
||||
const bool sticks_available = _evaluateSticks();
|
||||
|
||||
if (_sticks_data_required) {
|
||||
ret = ret && sticks_available;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool FlightTaskManual::update()
|
||||
|
||||
@ -63,6 +63,7 @@ public:
|
||||
protected:
|
||||
matrix::Vector<float, 4> _sticks;
|
||||
bool _evaluateSticks();
|
||||
bool _sticks_data_required = true; /**< let sibling task define if it depends on stick data */
|
||||
|
||||
float get_input_frame_yaw() { return _yaw; }
|
||||
|
||||
|
||||
@ -47,7 +47,9 @@ using namespace matrix;
|
||||
|
||||
FlightTaskOrbit::FlightTaskOrbit(control::SuperBlock *parent, const char *name) :
|
||||
FlightTaskManual(parent, name)
|
||||
{}
|
||||
{
|
||||
_sticks_data_required = false;
|
||||
}
|
||||
|
||||
bool FlightTaskOrbit::activate()
|
||||
{
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user