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
013a2655
Commit
013a2655
authored
6 years ago
by
Matthias Grob
Committed by
Beat Küng
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mc_pos_control: fix comments and spacing inconsistencies
parent
8cb446c2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/modules/mc_pos_control/mc_pos_control_main.cpp
+7
-7
7 additions, 7 deletions
src/modules/mc_pos_control/mc_pos_control_main.cpp
with
7 additions
and
7 deletions
src/modules/mc_pos_control/mc_pos_control_main.cpp
+
7
−
7
View file @
013a2655
...
...
@@ -140,7 +140,7 @@ private:
(
ParamFloat
<
px4
::
params
::
MPC_Z_VEL_MAX_DN
>
)
_vel_max_down
,
(
ParamFloat
<
px4
::
params
::
MPC_LAND_SPEED
>
)
_land_speed
,
(
ParamFloat
<
px4
::
params
::
MPC_TKO_SPEED
>
)
_tko_speed
,
(
ParamFloat
<
px4
::
params
::
MPC_LAND_ALT2
>
)
MPC_LAND_ALT2
,
/
/ altitude at which speed limit downwards reached minimum speed
(
ParamFloat
<
px4
::
params
::
MPC_LAND_ALT2
>
)
MPC_LAND_ALT2
,
/
**< downwards speed limited below this altitude */
(
ParamInt
<
px4
::
params
::
MPC_POS_MODE
>
)
MPC_POS_MODE
,
(
ParamInt
<
px4
::
params
::
MPC_AUTO_MODE
>
)
MPC_AUTO_MODE
,
(
ParamInt
<
px4
::
params
::
MPC_ALT_MODE
>
)
MPC_ALT_MODE
,
...
...
@@ -153,15 +153,15 @@ private:
control
::
BlockDerivative
_vel_y_deriv
;
/**< velocity derivative in y */
control
::
BlockDerivative
_vel_z_deriv
;
/**< velocity derivative in z */
FlightTasks
_flight_tasks
;
/**< class
that
generat
es
position controller
tracking
setpoints*/
PositionControl
_control
;
/**< class
that handles the
core PID position control
ler
*/
PositionControlStates
_states
{};
/**< structure
that
contain
s required
state information for position control */
FlightTasks
_flight_tasks
;
/**< class generat
ing
position controller setpoints
depending on vehicle task
*/
PositionControl
_control
;
/**< class
for
core PID position control */
PositionControlStates
_states
{};
/**< structure contain
ing vehicle
state information for position control */
hrt_abstime
_last_warn
=
0
;
/**< timer when the last warn message was sent out */
bool
_in_failsafe
=
false
;
/**< true if failsafe was entered within current cycle */
/** Timeout in us for trajectory data to get considered invalid */
/**
<
Timeout in us for trajectory data to get considered invalid */
static
constexpr
uint64_t
TRAJECTORY_STREAM_TIMEOUT_US
=
500000
;
/**< number of tries before switching to a failsafe flight task */
static
constexpr
int
NUM_FAILURE_TRIES
=
10
;
...
...
@@ -187,12 +187,12 @@ private:
* Parameter update can be forced when argument is true.
* @param force forces parameter update.
*/
int
parameters_update
(
bool
force
);
int
parameters_update
(
bool
force
);
/**
* Check for changes in subscribed topics.
*/
void
poll_subscriptions
();
void
poll_subscriptions
();
/**
* Check for validity of positon/velocity states.
...
...
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