fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 01:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

FlightTask Manual: Gear react only on switch changes and not states

Browse Source
This commit is contained in:
Simone Guscetti
2018-12-10 16:17:23 +01:00
committed by Dennis Mannhart
parent f4fc0cd291
commit 9ee3d79a96
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Manual/FlightTaskManual.cpp
+3 -6
View File
@@ -91,15 +91,12 @@ bool FlightTaskManual::_evaluateSticks()
// until he toggles the switch to avoid retracting the gear immediately on takeoff. // until he toggles the switch to avoid retracting the gear immediately on takeoff.
int8_t gear_switch = _sub_manual_control_setpoint->get().gear_switch; int8_t gear_switch = _sub_manual_control_setpoint->get().gear_switch;
if (!_gear.landing_gear) { if (_gear_switch_old != gear_switch) {
if (gear_switch == manual_control_setpoint_s::SWITCH_POS_OFF) {
_applyGearSwitch(gear_switch);
}
} else {
_applyGearSwitch(gear_switch); _applyGearSwitch(gear_switch);
} }
_gear_switch_old = gear_switch;
// valid stick inputs are required // valid stick inputs are required
const bool valid_sticks = PX4_ISFINITE(_sticks(0)) const bool valid_sticks = PX4_ISFINITE(_sticks(0))
&& PX4_ISFINITE(_sticks(1)) && PX4_ISFINITE(_sticks(1))
src/lib/FlightTasks/tasks/Manual/FlightTaskManual.hpp
+1
View File
@@ -59,6 +59,7 @@ protected:
bool _sticks_data_required = true; /**< let inherited task-class define if it depends on stick data */ bool _sticks_data_required = true; /**< let inherited task-class define if it depends on stick data */
matrix::Vector<float, 4> _sticks; /**< unmodified manual stick inputs */ matrix::Vector<float, 4> _sticks; /**< unmodified manual stick inputs */
matrix::Vector<float, 4> _sticks_expo; /**< modified manual sticks using expo function*/ matrix::Vector<float, 4> _sticks_expo; /**< modified manual sticks using expo function*/
int _gear_switch_old = manual_control_setpoint_s::SWITCH_POS_NONE; /**< old switch state*/
float stickDeadzone() const { return _stick_dz.get(); } float stickDeadzone() const { return _stick_dz.get(); }