From 1c2ec934cb82bd9c819c64ddb247c2dc0382c506 Mon Sep 17 00:00:00 2001 From: Martina Rivizzigno Date: Wed, 23 Oct 2019 10:45:49 +0200 Subject: [PATCH] rename collision prevention parameters to match Firmware --- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 2 +- src/Vehicle/VehicleObjectAvoidance.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 06e977c7f..40a063029 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -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) diff --git a/src/Vehicle/VehicleObjectAvoidance.cc b/src/Vehicle/VehicleObjectAvoidance.cc index d6b9151e9..33be0d44b 100644 --- a/src/Vehicle/VehicleObjectAvoidance.cc +++ b/src/Vehicle/VehicleObjectAvoidance.cc @@ -12,7 +12,7 @@ #include "ParameterManager.h" #include -static const char* kColPrevParam = "MPC_COL_PREV_D"; +static const char* kColPrevParam = "CP_DIST"; //----------------------------------------------------------------------------- VehicleObjectAvoidance::VehicleObjectAvoidance(Vehicle *vehicle, QObject* parent) -- 2.22.0