rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1777 Changed some encoding. Changed parameter names to be meaningful.

Browse Source
This commit is contained in:
m_thread 2015-03-11 21:03:32 +01:00
parent a3f9d42146
commit 779a1823e2
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
View File

@ -33,12 +33,14 @@
#include <QCheckBox>
#include <QDebug>
#include <QMessageBox>
#include <attitudesettings.h>
#include <uavobjectutil/devicedescriptorstruct.h>
#include <uavobjectutil/uavobjectutilmanager.h>
#include <coreplugin/generalsettings.h>
#include "version_info/version_info.h"
#include "coreplugin/icore.h"
#include "qmainwindow.h"
#include "manualcontrolsettings.h"
UsageTrackerPlugin::UsageTrackerPlugin() :
m_telemetryManager(NULL)
@ -135,8 +137,10 @@ void UsageTrackerPlugin::trackUsage()
QMapIterator<QString, QString> iter(parameters);
while (iter.hasNext()) {
iter.next();
query.addQueryItem(iter.key(), QUrl::toPercentEncoding(iter.value()));
query.addQueryItem(iter.key(), iter.value());
}
qDebug() << "Parameters unencoded:" << query.toString();
qDebug() << "Parameters encoded:" << query.toString(QUrl::FullyEncoded);
QUrl url("https://www.openpilot.org/opver?" + query.toString(QUrl::FullyEncoded));
qDebug() << "Sending usage tracking as:" << url.toEncoded(QUrl::FullyEncoded);
networkAccessManager->get(QNetworkRequest(QUrl(url.toEncoded(QUrl::FullyEncoded))));
@ -150,16 +154,19 @@ void UsageTrackerPlugin::collectUsageParameters(QMap<QString, QString> &paramete
QByteArray description = utilMngr->getBoardDescription();
deviceDescriptorStruct devDesc;
if (UAVObjectUtilManager::descriptionToStructure(description, devDesc)) {
parameters["hi0"] = "0x" + QString::number(utilMngr->getBoardModel(), 16).toLower();
parameters["hi1"] = utilMngr->getBoardCPUSerial().toHex();
parameters["bi0"] = QString::number(utilMngr->getBootloaderRevision());
parameters["fi0"] = devDesc.gitTag;
parameters["fi1"] = devDesc.gitHash;
parameters["oi0"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
parameters["si0"] = VersionInfo::revision();
parameters["ti0"] = QDateTime::currentDateTime().toString(Qt::ISODate);
parameters["board_type"] = "0x" + QString::number(utilMngr->getBoardModel(), 16).toLower();
parameters["board_serial"] = utilMngr->getBoardCPUSerial().toHex();
parameters["bl_version"] = QString::number(utilMngr->getBootloaderRevision());
parameters["fw_tag"] = devDesc.gitTag;
parameters["fw_hash"] = devDesc.gitHash;
parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
parameters["gcs_version"] = VersionInfo::revision();
parameters["localtime"] = QDateTime::currentDateTime().toString(Qt::ISODate);
// Configuration parameters
//parameters["ci0"] = ;
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
UAVObjectManager *objManager = pm->getObject<UAVObjectManager>();
ManualControlSettings * controlSettings = ManualControlSettings::GetInstance(objManager);
parameters["conf_receiver"] = controlSettings->getField("ChannelGroups")->getValue(ManualControlSettings::CHANNELGROUPS_THROTTLE).toString();
}
}