Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
Firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Ruiz Garcia
Firmware
Commits
5d064643
Commit
5d064643
authored
7 years ago
by
Dennis Mannhart
Committed by
Beat Küng
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
FlightTaskManualPosition: rename updateXYsetpoints to updateXYlock
parent
efc2721a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp
+2
-2
2 additions, 2 deletions
src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp
src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp
+1
-3
1 addition, 3 deletions
src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp
with
3 additions
and
5 deletions
src/lib/FlightTasks/tasks/FlightTaskManualPosition.cpp
+
2
−
2
View file @
5d064643
...
...
@@ -80,7 +80,7 @@ void FlightTaskManualPosition::_scaleSticks()
_vel_sp_xy
=
matrix
::
Vector2f
(
vel_sp
(
0
),
vel_sp
(
1
));
}
void
FlightTaskManualPosition
::
_updateXY
setpoints
()
void
FlightTaskManualPosition
::
_updateXY
lock
()
{
/* If position lock is not active, position setpoint is set to NAN.*/
const
float
vel_xy_norm
=
Vector2f
(
&
_velocity
(
0
)).
length
();
...
...
@@ -98,7 +98,7 @@ void FlightTaskManualPosition::_updateXYsetpoints()
void
FlightTaskManualPosition
::
_updateSetpoints
()
{
FlightTaskManualAltitude
::
_updateSetpoints
();
// get yaw and z setpoints
_updateXY
setpoints
();
// get xy setpoints
_updateXY
lock
();
// check for position lock
}
bool
FlightTaskManualPosition
::
update
()
...
...
This diff is collapsed.
Click to expand it.
src/lib/FlightTasks/tasks/FlightTaskManualPosition.hpp
+
1
−
3
View file @
5d064643
...
...
@@ -61,9 +61,7 @@ protected:
control
::
BlockParamFloat
_acc_xy_max
;
/**< Maximum acceleration horizontally. Only used to compute lock time. */
control
::
BlockParamFloat
_vel_xy_dz
;
/**< velocity threshold/deadzone to switch into horizontal position hold */
void
_updateXYlock
();
/**< Applies positon lock based on stick and velocity */
void
_updateSetpoints
()
override
;
void
_scaleSticks
()
override
;
private
:
void
_updateXYsetpoints
();
};
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment