From 54b76f930b231a44bf4af6ed193bc37be0ce12de Mon Sep 17 00:00:00 2001 From: dogmaphobic Date: Mon, 16 Feb 2015 20:48:26 -0500 Subject: [PATCH] Changing from NAV_DLL_N to COM_DL_LOSS_T for determining data link loss (telemetry). --- src/AutoPilotPlugins/PX4/SafetyComponent.cc | 28 ++++++++++---------- src/AutoPilotPlugins/PX4/SafetyComponent.qml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.cc b/src/AutoPilotPlugins/PX4/SafetyComponent.cc index f12d37e40..8267b8bac 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.cc +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.cc @@ -1,24 +1,24 @@ /*===================================================================== - + QGroundControl Open Source Ground Control Station - + (c) 2009 - 2014 QGROUNDCONTROL PROJECT - + This file is part of the QGROUNDCONTROL project - + QGROUNDCONTROL is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + QGROUNDCONTROL is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with QGROUNDCONTROL. If not, see . - + ======================================================================*/ /// @file @@ -67,7 +67,7 @@ bool SafetyComponent::setupComplete(void) const QString SafetyComponent::setupStateDescription(void) const { const char* stateDescription; - + if (requiresSetup()) { stateDescription = "Requires setup"; } else { @@ -84,7 +84,7 @@ const char** SafetyComponent::setupCompleteChangedTriggerList(void) const QStringList SafetyComponent::paramFilterList(void) const { QStringList list; - + return list; } @@ -92,11 +92,11 @@ QWidget* SafetyComponent::setupWidget(void) const { QGCQmlWidgetHolder* holder = new QGCQmlWidgetHolder(); Q_CHECK_PTR(holder); - + holder->setAutoPilot(_autopilot); - + holder->setSource(QUrl::fromUserInput("qrc:/qml/SafetyComponent.qml")); - + return holder; } @@ -109,10 +109,10 @@ QString SafetyComponent::prerequisiteSetup(void) const { PX4AutoPilotPlugin* plugin = dynamic_cast(_autopilot); Q_ASSERT(plugin); - + if (!plugin->airframeComponent()->setupComplete()) { return plugin->airframeComponent()->name(); } - + return QString(); } diff --git a/src/AutoPilotPlugins/PX4/SafetyComponent.qml b/src/AutoPilotPlugins/PX4/SafetyComponent.qml index 43dc47bc7..8bb5b4e3b 100644 --- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml +++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml @@ -47,7 +47,7 @@ Rectangle { } FactTextField { id: telemetryLossField - fact: autopilot.parameters["NAV_DLL_N"]; + fact: autopilot.parameters["COM_DL_LOSS_T"]; showUnits: true } } -- 2.22.0