Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 04:06:33 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

AutoLineSmoothVel - change function contrain_one_side(..) from snake_case to camelCase

Browse Source
This commit is contained in:
bresch
2019-03-13 11:19:23 +01:00
committed by Daniel Agar
parent 94cab1f9a9
commit 0813f30723
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.cpp
+3 -3
View File
@@ -109,7 +109,7 @@ bool FlightTaskAutoLineSmoothVel::_generateHeadingAlongTraj()
* Example: - if the constrain is -5, the value will be constrained between -5 and 0 * Example: - if the constrain is -5, the value will be constrained between -5 and 0
* - if the constrain is 5, the value will be constrained between 0 and 5 * - if the constrain is 5, the value will be constrained between 0 and 5
*/ */
inline float FlightTaskAutoLineSmoothVel::constrain_one_side(float val, float constrain) inline float FlightTaskAutoLineSmoothVel::_constrainOneSide(float val, float constrain)
{ {
const float min = (constrain < FLT_EPSILON) ? constrain : 0.f; const float min = (constrain < FLT_EPSILON) ? constrain : 0.f;
const float max = (constrain > FLT_EPSILON) ? constrain : 0.f; const float max = (constrain > FLT_EPSILON) ? constrain : 0.f;
@@ -153,7 +153,7 @@ void FlightTaskAutoLineSmoothVel::_prepareSetpoints()
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
// If available, constrain the velocity using _velocity_setpoint(.) // If available, constrain the velocity using _velocity_setpoint(.)
if (PX4_ISFINITE(_velocity_setpoint(i))) { if (PX4_ISFINITE(_velocity_setpoint(i))) {
_velocity_setpoint(i) = constrain_one_side(vel_sp_xy(i), _velocity_setpoint(i)); _velocity_setpoint(i) = _constrainOneSide(vel_sp_xy(i), _velocity_setpoint(i));
} else { } else {
_velocity_setpoint(i) = vel_sp_xy(i); _velocity_setpoint(i) = vel_sp_xy(i);
@@ -171,7 +171,7 @@ void FlightTaskAutoLineSmoothVel::_prepareSetpoints()
// If available, constrain the velocity using _velocity_setpoint(.) // If available, constrain the velocity using _velocity_setpoint(.)
if (PX4_ISFINITE(_velocity_setpoint(2))) { if (PX4_ISFINITE(_velocity_setpoint(2))) {
_velocity_setpoint(2) = constrain_one_side(vel_sp_z, _velocity_setpoint(2)); _velocity_setpoint(2) = _constrainOneSide(vel_sp_z, _velocity_setpoint(2));
} else { } else {
_velocity_setpoint(2) = vel_sp_z; _velocity_setpoint(2) = vel_sp_z;
src/lib/FlightTasks/tasks/AutoLineSmoothVel/FlightTaskAutoLineSmoothVel.hpp
+1 -1
View File
@@ -68,7 +68,7 @@ protected:
void _generateSetpoints() override; /**< Generate setpoints along line. */ void _generateSetpoints() override; /**< Generate setpoints along line. */
void _setDefaultConstraints() override; void _setDefaultConstraints() override;
inline float constrain_one_side(float val, float constrain); inline float _constrainOneSide(float val, float constrain);
void _generateHeading(); void _generateHeading();
bool _generateHeadingAlongTraj(); /**< Generates heading along trajectory. */ bool _generateHeadingAlongTraj(); /**< Generates heading along trajectory. */
void _updateTrajConstraints(); void _updateTrajConstraints();