Browse Source

Stick Verbose Functions : Edit other FlightTasks using checkAndUpdateStickInputs() functions and correct Throttle returned value inverse issue

v1.13.0-BW
Junwoo Hwang 3 years ago committed by Matthias Grob
parent
commit
f78465428c
  1. 2
      src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp
  2. 2
      src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.cpp
  3. 2
      src/modules/flight_mode_manager/tasks/Utility/Sticks.hpp

2
src/modules/flight_mode_manager/tasks/Auto/FlightTaskAuto.cpp

@ -245,7 +245,7 @@ void FlightTaskAuto::_prepareLandSetpoints() @@ -245,7 +245,7 @@ void FlightTaskAuto::_prepareLandSetpoints()
}
// User input assisted landing
if (_param_mpc_land_rc_help.get() && _sticks.checkAndSetStickInputs()) {
if (_param_mpc_land_rc_help.get() && _sticks.checkAndUpdateStickInputs()) {
// Stick full up -1 -> stop, stick full down 1 -> double the speed
vertical_speed *= (1 + _sticks.getPositionExpo()(2));

2
src/modules/flight_mode_manager/tasks/ManualAltitude/FlightTaskManualAltitude.cpp

@ -50,7 +50,7 @@ bool FlightTaskManualAltitude::updateInitialize() @@ -50,7 +50,7 @@ bool FlightTaskManualAltitude::updateInitialize()
{
bool ret = FlightTask::updateInitialize();
_sticks.checkAndSetStickInputs();
_sticks.checkAndUpdateStickInputs();
if (_sticks_data_required) {
ret = ret && _sticks.isAvailable();

2
src/modules/flight_mode_manager/tasks/Utility/Sticks.hpp

@ -65,7 +65,7 @@ public: @@ -65,7 +65,7 @@ public:
// Helper functions to get stick values more intuitively
float getPitch() { return _positions(0); }
float getRoll() { return _positions(1); }
float getThrottle() { return _positions(2); }
float getThrottle() { return -_positions(2); } // Convert Z-axis(down) command to Up-axis frame
float getYaw() { return _positions(3); }
/**

Loading…
Cancel
Save