Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1c2ec934
Commit
1c2ec934
authored
Oct 23, 2019
by
Martina Rivizzigno
Browse files
rename collision prevention parameters to match Firmware
parent
f36047c0
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
1c2ec934
...
...
@@ -52,7 +52,7 @@ SetupPage {
property
Fact
_rcLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_RCL_ACT
"
)
property
Fact
_dlLossAction
:
controller
.
getParameterFact
(
-
1
,
"
NAV_DLL_ACT
"
)
property
Fact
_disarmLandDelay
:
controller
.
getParameterFact
(
-
1
,
"
COM_DISARM_LAND
"
)
property
Fact
_collisionPrevention
:
controller
.
getParameterFact
(
-
1
,
"
MPC_COL_PREV_D
"
)
property
Fact
_collisionPrevention
:
controller
.
getParameterFact
(
-
1
,
"
CP_DIST
"
)
property
Fact
_objectAvoidance
:
controller
.
getParameterFact
(
-
1
,
"
COM_OBS_AVOID
"
)
property
Fact
_landSpeedMC
:
controller
.
getParameterFact
(
-
1
,
"
MPC_LAND_SPEED
"
,
false
)
property
bool
_hitlAvailable
:
controller
.
parameterExists
(
-
1
,
hitlParam
)
...
...
src/Vehicle/VehicleObjectAvoidance.cc
View file @
1c2ec934
...
...
@@ -12,7 +12,7 @@
#include
"ParameterManager.h"
#include
<cmath>
static
const
char
*
kColPrevParam
=
"
MPC_COL_PREV_D
"
;
static
const
char
*
kColPrevParam
=
"
CP_DIST
"
;
//-----------------------------------------------------------------------------
VehicleObjectAvoidance
::
VehicleObjectAvoidance
(
Vehicle
*
vehicle
,
QObject
*
parent
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment