Skip to content

Q
qgroundcontrol
Unverified Commit 182573fe authored by Gus Grubba's avatar Gus Grubba Committed by GitHub
Browse files
Options

Merge pull request #7944 from mrivi/cp_params 

rename collision prevention parameters to match Firmware
parents 4f3c015c 1c2ec934
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ 182573fe
...@@ -52,7 +52,7 @@ SetupPage { ...@@ -52,7 +52,7 @@ SetupPage {
property Fact _rcLossAction: controller.getParameterFact(-1, "NAV_RCL_ACT") property Fact _rcLossAction: controller.getParameterFact(-1, "NAV_RCL_ACT")
property Fact _dlLossAction: controller.getParameterFact(-1, "NAV_DLL_ACT") property Fact _dlLossAction: controller.getParameterFact(-1, "NAV_DLL_ACT")
property Fact _disarmLandDelay: controller.getParameterFact(-1, "COM_DISARM_LAND") 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 _objectAvoidance: controller.getParameterFact(-1, "COM_OBS_AVOID")
property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false) property Fact _landSpeedMC: controller.getParameterFact(-1, "MPC_LAND_SPEED", false)
property bool _hitlAvailable: controller.parameterExists(-1, hitlParam) property bool _hitlAvailable: controller.parameterExists(-1, hitlParam)
......
src/Vehicle/VehicleObjectAvoidance.cc
View file @ 182573fe
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#include "ParameterManager.h" #include "ParameterManager.h"
#include <cmath> #include <cmath>
static const char* kColPrevParam = "MPC_COL_PREV_D"; static const char* kColPrevParam = "CP_DIST";
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
VehicleObjectAvoidance::VehicleObjectAvoidance(Vehicle *vehicle, QObject* parent) VehicleObjectAvoidance::VehicleObjectAvoidance(Vehicle *vehicle, QObject* parent)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment