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
27dc60a4
Commit
27dc60a4
authored
6 years ago
by
baumanta
Committed by
Beat Küng
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Improve comments
parent
ce7dc854
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/CollisionAvoidance/CollisionAvoidance.cpp
+1
-1
1 addition, 1 deletion
src/lib/CollisionAvoidance/CollisionAvoidance.cpp
src/modules/mc_pos_control/mc_pos_control_params.c
+3
-3
3 additions, 3 deletions
src/modules/mc_pos_control/mc_pos_control_params.c
with
4 additions
and
4 deletions
src/lib/CollisionAvoidance/CollisionAvoidance.cpp
+
1
−
1
View file @
27dc60a4
...
...
@@ -165,7 +165,7 @@ void CollisionAvoidance::modifySetpoint(Vector2f &original_setpoint, const float
||
new_setpoint
(
1
)
>
1.05
f
*
original_setpoint
(
1
));
if
(
currently_interfering
&&
(
currently_interfering
!=
_interfering
))
{
mavlink_log_critical
(
&
_mavlink_log_pub
,
"Collision
Avoidance starts interfer
ing"
);
mavlink_log_critical
(
&
_mavlink_log_pub
,
"Collision
Warn
ing"
);
}
_interfering
=
currently_interfering
;
...
...
This diff is collapsed.
Click to expand it.
src/modules/mc_pos_control/mc_pos_control_params.c
+
3
−
3
View file @
27dc60a4
...
...
@@ -739,16 +739,16 @@ PARAM_DEFINE_INT32(MPC_OBS_AVOID, 0);
PARAM_DEFINE_INT32
(
MPC_YAW_MODE
,
0
);
/**
* Flag to enable the use of a range sensor for collision avoidance.
* Flag to enable the use of a
MAVLink
range sensor for collision avoidance.
*
* @boolean
* @group Multicopter Position Control
*/
PARAM_DEFINE_INT32
(
MPC_COL_AVOID
,
0
);
/**
* Minimum
Obstacle Distance at which the vehicle should not get closer
* Minimum
distance the vehicle should keep to all obstacles
*
* Only
relevant if
in Position
control and the range sensor is active
* Only
used
in Position
mode when collision avoidance is active (see MPC_COL_AVOID).
*
* @min 0
* @max 15
...
...
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