From 44a3dad9126e67e1f01c6c5118635d6a506d7f1f Mon Sep 17 00:00:00 2001 From: Laura Sebesta Date: Wed, 25 Jul 2012 01:34:38 +0200 Subject: [PATCH] Fixed incorrect UAVO field in PFD. Made scope gadget widget non-existent field message more helpful. --- ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp | 2 +- ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp index c2b9227c4..14b241860 100644 --- a/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp @@ -326,7 +326,7 @@ void PFDGadgetWidget::updateGroundspeed(UAVObject *object) { \brief Called by updates to @BaroAirspeed */ void PFDGadgetWidget::updateAirspeed(UAVObject *object) { - UAVObjectField* airspeedField = object->getField("Airspeed"); + UAVObjectField* airspeedField = object->getField("CalibratedAirspeed"); if (airspeedField) { airspeedTarget = airspeedField->getDouble(); diff --git a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp index 7b53a060f..21b5b21c4 100644 --- a/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/scope/scopegadgetwidget.cpp @@ -422,7 +422,7 @@ void ScopeGadgetWidget::addCurvePlot(QString uavObject, QString uavFieldSubField } UAVObjectField* field = obj->getField(plotData->uavField); if(!field) { - qDebug() << "Field " << plotData->uavField << " of object " << plotData->uavObject << " is missing"; + qDebug() << "In scope gadget, in fields loaded from GCS config file, field" << plotData->uavField << " of object " << plotData->uavObject << " is missing"; return; } QString units = field->getUnits();