rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-410 misc log silencing

Browse Source
This commit is contained in:
Philippe Renon 2016-09-20 09:04:21 +02:00
parent 7e99441005
commit 8931cd48f5
10 changed files with 47 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/gcs/src/plugins/antennatrack/antennatrackgadget.cpp
View File

@ -89,7 +89,7 @@ void AntennaTrackGadget::loadConfiguration(IUAVGadgetConfiguration *config)
}
}
m_widget->dataStreamGroupBox->setHidden(false);
qDebug() << "Using Telemetry parser";
parser = new TelemetryParser();
connect(parser, SIGNAL(position(double, double, double)), m_widget, SLOT(setPosition(double, double, double)));

2
ground/gcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
View File

@ -874,7 +874,7 @@ void ConfigMultiRotorWidget::reverseMultirotorMotor()
void ConfigMultiRotorWidget::updateAirframe(QString frameType)
{
qDebug() << "ConfigMultiRotorWidget::updateAirframe - frame type" << frameType;
// qDebug() << "ConfigMultiRotorWidget::updateAirframe - frame type" << frameType;
QString elementId;
if (frameType == "Tri" || frameType == "Tricopter Y") {

5
ground/gcs/src/plugins/coreplugin/connectionmanager.cpp
View File

@ -441,7 +441,7 @@ void ConnectionManager::devChanged(IConnection *connection)
updateConnectionDropdown();
qDebug() << "# devices " << m_devList.count();
qDebug() << "ConnectionManager::devChanged - device count:" << m_devList.count();
emit availableDevicesChanged(m_devList);
@ -464,9 +464,8 @@ void ConnectionManager::updateConnectionDropdown()
m_availableDevList->setCurrentIndex(m_availableDevList->count() - 1);
}
if (m_mainWindow->generalSettings()->autoConnect() && polling) {
qDebug() << "Automatically opening device";
qDebug() << "ConnectionManager::updateConnectionDropdown - auto-connecting USB device";
connectDevice(d);
qDebug() << "ConnectionManager::updateConnectionDropdown autoconnected USB device";
}
}
}

9
ground/gcs/src/plugins/coreplugin/uavgadgetinstancemanager.cpp
View File

@ -41,7 +41,6 @@
#include <QtCore/QDebug>
#include <QMessageBox>
using namespace Core;
static const UAVConfigVersion m_versionUAVGadgetConfigurations = UAVConfigVersion("1.2.0");
@ -116,7 +115,7 @@ void UAVGadgetInstanceManager::readConfigs_1_2_0(QSettings *qs)
configs = qs->childGroups();
foreach(QString configName, configs) {
qDebug() << "Loading config: " << classId << "," << configName;
// qDebug() << "Loading config: " << classId << "," << configName;
qs->beginGroup(configName);
configInfo.read(qs);
configInfo.setNameOfConfigurable(classId + "-" + configName);
@ -166,7 +165,7 @@ void UAVGadgetInstanceManager::readConfigs_1_1_0(QSettings *qs)
configs = qs->childGroups();
foreach(QString configName, configs) {
qDebug().nospace() << "Loading config: " << classId << ", " << configName;
// qDebug().nospace() << "Loading config: " << classId << ", " << configName;
qs->beginGroup(configName);
bool locked = qs->value("config.locked").toBool();
configInfo.setNameOfConfigurable(classId + "-" + configName);
@ -250,8 +249,8 @@ void UAVGadgetInstanceManager::createOptionsPages()
m_pm->addObject(page);
} else {
qWarning()
<< "UAVGadgetInstanceManager::createOptionsPages - failed to create options page for configuration "
+ config->classId() + ":" + config->name() + ", configuration will be removed.";
<< "UAVGadgetInstanceManager::createOptionsPages - failed to create options page for configuration"
<< (config->classId() + ":" + config->name()) << ", configuration will be removed.";
// The m_optionsPages list and m_configurations list must be in synch otherwise nasty issues happen later
// so if we fail to create an options page we must remove the associated configuration
ite.remove();

1
ground/gcs/src/plugins/gpsdisplay/gpsdisplaygadget.cpp
View File

@ -91,7 +91,6 @@ void GpsDisplayGadget::loadConfiguration(IUAVGadgetConfiguration *config)
}
m_widget->dataStreamGroupBox->setHidden(false);
} else if (gpsDisplayConfig->connectionMode() == "Telemetry") {
qDebug() << "Using Telemetry parser";
parser = new TelemetryParser();
m_widget->disconnectButton->setHidden(true);
m_widget->connectButton->setHidden(true);

49
ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
View File

@ -67,7 +67,7 @@ QList<QQmlError> PfdQmlGadgetWidget::errors() const
void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
{
qDebug() << "PfdQmlGadgetWidget::loadConfiguration" << config->name();
// qDebug() << "PfdQmlGadgetWidget::loadConfiguration" << config->name();
if (!m_quickWidgetProxy) {
m_quickWidgetProxy = new QuickWidgetProxy(this);
@ -85,7 +85,7 @@ void PfdQmlGadgetWidget::loadConfiguration(PfdQmlGadgetConfiguration *config)
layout()->addWidget(m_quickWidgetProxy->widget());
}
setQmlFile("");
clear();
m_pfdQmlContext->loadConfiguration(config);
@ -110,28 +110,35 @@ void PfdQmlGadgetWidget::setQmlFile(QString fn)
m_qmlFileName = fn;
if (fn.isEmpty()) {
setSource(QUrl());
engine()->removeImageProvider("svg");
engine()->rootContext()->setContextProperty("svgRenderer", NULL);
// calling clearComponentCache() causes crashes (see https://bugreports.qt-project.org/browse/QTBUG-41465)
// but not doing it causes almost systematic crashes when switching PFD gadget to "Model View (Without Terrain)" configuration
engine()->clearComponentCache();
} else {
SvgImageProvider *svgProvider = new SvgImageProvider(fn);
engine()->addImageProvider("svg", svgProvider);
// it's necessary to allow qml side to query svg element position
engine()->rootContext()->setContextProperty("svgRenderer", svgProvider);
QUrl url = QUrl::fromLocalFile(fn);
engine()->setBaseUrl(url);
setSource(url);
clear();
return;
}
SvgImageProvider *svgProvider = new SvgImageProvider(fn);
engine()->addImageProvider("svg", svgProvider);
// it's necessary to allow qml side to query svg element position
engine()->rootContext()->setContextProperty("svgRenderer", svgProvider);
QUrl url = QUrl::fromLocalFile(fn);
engine()->setBaseUrl(url);
setSource(url);
foreach(const QQmlError &error, errors()) {
qDebug() << "PfdQmlGadgetWidget - " << error.description();
}
}
void PfdQmlGadgetWidget::clear()
{
// qDebug() << "PfdQmlGadgetWidget::clear";
setSource(QUrl());
engine()->removeImageProvider("svg");
engine()->rootContext()->setContextProperty("svgRenderer", NULL);
// calling clearComponentCache() causes crashes (see https://bugreports.qt-project.org/browse/QTBUG-41465)
// but not doing it causes almost systematic crashes when switching PFD gadget to "Model View (Without Terrain)" configuration
engine()->clearComponentCache();
}

10
ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.h
View File

@ -50,16 +50,18 @@ public:
void restoreState(QSettings *);
private:
QuickWidgetProxy *m_quickWidgetProxy;
PfdQmlContext *m_pfdQmlContext;
QString m_qmlFileName;
void setQmlFile(QString);
void clear();
void setSource(const QUrl &url);
QQmlEngine *engine() const;
QList<QQmlError> errors() const;
QuickWidgetProxy *m_quickWidgetProxy;
PfdQmlContext *m_pfdQmlContext;
QString m_qmlFileName;
};
#endif /* PFDQMLGADGETWIDGET_H_ */

2
ground/gcs/src/plugins/serialconnection/serialpluginconfiguration.cpp
View File

@ -73,12 +73,12 @@ void SerialPluginConfiguration::restoresettings()
{
settings->beginGroup(QLatin1String("SerialConnection"));
QString str = (settings->value(QLatin1String("speed"), tr("")).toString());
qDebug() << "SerialPluginConfiguration::restoresettings - speed" << str;
if (str.isEmpty()) {
m_speed = "57600";
} else {
m_speed = str;
}
// qDebug() << "SerialPluginConfiguration::restoresettings - speed" << str;
settings->endGroup();
}

4
ground/gcs/src/plugins/uavtalk/uavtalk.cpp
View File

@ -59,7 +59,9 @@ UAVTalk::UAVTalk(QIODevice *iodev, UAVObjectManager *objMngr) : io(iodev), objMn
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
Core::Internal::GeneralSettings *settings = pm->getObject<Core::Internal::GeneralSettings>();
useUDPMirror = settings->useUDPMirror();
qDebug() << "USE UDP:::::::::::." << useUDPMirror;
if (useUDPMirror) {
qDebug() << "UAVTalk::UAVTalk -*** UDP mirror is enabled ***";
}
if (useUDPMirror) {
udpSocketTx = new QUdpSocket(this);
udpSocketRx = new QUdpSocket(this);

2
ground/gcs/src/plugins/uploader/runningdevicewidget.cpp
View File

@ -66,7 +66,7 @@ void RunningDeviceWidget::populate()
myDevice->lblDeviceID->setText(QString("Device ID: ") + QString::number(id, 16));
myDevice->lblBoardName->setText(deviceDescriptorStruct::idToBoardName(id));
myDevice->lblHWRev->setText(QString(tr("HW Revision: ")) + QString::number(id & 0x00FF, 16));
qDebug() << "CRC" << utilMngr->getFirmwareCRC();
// qDebug() << "CRC" << utilMngr->getFirmwareCRC();
myDevice->lblCRC->setText(QString(tr("Firmware CRC: ")) + QVariant(utilMngr->getFirmwareCRC()).toString());
// DeviceID tells us what sort of HW we have detected:
// display a nice icon: