From 42aa336b8affd3b0394c1fd89d138e53ccc9e9e6 Mon Sep 17 00:00:00 2001 From: Jacob Walser Date: Wed, 3 May 2017 12:15:42 -0400 Subject: [PATCH] (APM Sub) Fix fence alt parameter in safety page --- src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml | 10 +++++----- src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml index b9b741127..e72e6c562 100644 --- a/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml +++ b/src/AutoPilotPlugins/APM/APMSafetyComponentSub.qml @@ -34,15 +34,15 @@ SetupPage { QGCPalette { id: ggcPal; colorGroupEnabled: true } - property Fact _failsafeGCSEnable: controller.getParameterFact(-1, "FS_GCS_ENABLE") - property Fact _failsafeLeakEnable: controller.getParameterFact(-1, "FS_LEAK_ENABLE") + property Fact _failsafeGCSEnable: controller.getParameterFact(-1, "FS_GCS_ENABLE") + property Fact _failsafeLeakEnable: controller.getParameterFact(-1, "FS_LEAK_ENABLE") property Fact _failsafePressureEnable: controller.getParameterFact(-1, "FS_PRESS_ENABLE") property Fact _failsafePressureValue: controller.getParameterFact(-1, "FS_PRESS_MAX") - property Fact _failsafeTempEnable: controller.getParameterFact(-1, "FS_TEMP_ENABLE") - property Fact _failsafeTempValue: controller.getParameterFact(-1, "FS_TEMP_MAX") + property Fact _failsafeTempEnable: controller.getParameterFact(-1, "FS_TEMP_ENABLE") + property Fact _failsafeTempValue: controller.getParameterFact(-1, "FS_TEMP_MAX") property Fact _fenceAction: controller.getParameterFact(-1, "FENCE_ACTION") - property Fact _fenceAltMax: controller.getParameterFact(-1, "FENCE_ALT_MAX") + property Fact _fenceAltMax: controller.getParameterFact(-1, "r.FENCE_ALT_MIN") property Fact _fenceEnable: controller.getParameterFact(-1, "FENCE_ENABLE") property Fact _fenceMargin: controller.getParameterFact(-1, "FENCE_MARGIN") property Fact _fenceType: controller.getParameterFact(-1, "FENCE_TYPE") diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc index 1dfa4fdf5..d71b7aebf 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc @@ -62,6 +62,8 @@ ArduSubFirmwarePlugin::ArduSubFirmwarePlugin(void) remapV3_5["SERVO13_FUNCTION"] = QStringLiteral("RC13_FUNCTION"); remapV3_5["SERVO14_FUNCTION"] = QStringLiteral("RC14_FUNCTION"); + remapV3_5["FENCE_ALT_MIN"] = QStringLiteral("FENCE_DEPTH_MAX"); + _remapParamNameIntialized = true; } } -- 2.22.0