From 5542d7c99586abc4b79e02d2ca6a4894336b352f Mon Sep 17 00:00:00 2001 From: Brian Webb Date: Thu, 5 Apr 2012 18:50:47 -0700 Subject: [PATCH] Updated configvehicletypewidget.cpp with metadata mods. --- .../src/plugins/config/configvehicletypewidget.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp index 62489f54c..dfbb023e2 100644 --- a/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp @@ -110,7 +110,7 @@ ConfigVehicleTypeWidget::ConfigVehicleTypeWidget(QWidget *parent) : ConfigTaskWi //Generate list of channels QStringList channels; channels << "None"; - for (int i = 0; i < ActuatorSettings::CHANNELADDR_NUMELEM; i++) { + for (unsigned int i = 0; i < ActuatorSettings::CHANNELADDR_NUMELEM; i++) { mixerTypes << QString("Mixer%1Type").arg(i+1); mixerVectors << QString("Mixer%1Vector").arg(i+1); channels << QString("Channel%1").arg(i+1); @@ -353,7 +353,7 @@ void ConfigVehicleTypeWidget::enableFFTest() UAVDataObject* obj = dynamic_cast(getObjectManager()->getObject(QString("ManualControlCommand"))); UAVObject::Metadata mdata = obj->getMetadata(); accInitialData = mdata; - mdata.flightAccess = UAVObject::ACCESS_READONLY; + UAVObject::SetFlightAccess(mdata, UAVObject::ACCESS_READONLY); obj->setMetadata(mdata); } // Depending on phase, either move actuator or send FF settings: