rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-01 18:29:16 +01:00
Code Issues Releases Activity

GCS-Reduced UAVO hash bytes displayed from 20 to 8

Browse Source
This commit is contained in:
PT_Dreamer 2012-09-18 13:51:44 +01:00
parent fb073059ad
commit 0d30138571
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -661,24 +661,30 @@ void UploaderGadgetWidget::versionMatchCheck()
uavoHashArray.append(str.toInt(&ok,16)); uavoHashArray.append(str.toInt(&ok,16));
} }
QByteArray fwVersion; QByteArray fwVersion=boardDescription.uavoHash;
fwVersion=boardDescription.uavoHash;
if (fwVersion != uavoHashArray) { if (fwVersion != uavoHashArray) {
QString uavoHashStr;
QString fwVersionStr; QString gcsDescription = QString::fromLatin1(Core::Constants::GCS_REVISION_STR);
QString gcsGitHash = gcsDescription.mid(gcsDescription.indexOf(":")+1, 8);
gcsGitHash.remove( QRegExp("^[0]*") );
QString gcsGitDate = gcsDescription.mid(gcsDescription.indexOf(" ")+1, 14);
QString gcsUavoHashStr;
QString fwUavoHashStr;
foreach(char i, fwVersion) foreach(char i, fwVersion)
{ {
qDebug()<<i<<" "<<QString::number(i,16).right(2); fwUavoHashStr.append(QString::number(i,16).right(2));
fwVersionStr.append(QString::number(i,16).right(2));
} }
foreach(char i, uavoHashArray) foreach(char i, uavoHashArray)
{ {
qDebug()<<i<<" "<<QString::number(i,16).right(2); gcsUavoHashStr.append(QString::number(i,16).right(2));
uavoHashStr.append(QString::number(i,16).right(2));
} }
QString gcsVersion = gcsGitDate + " (" + gcsGitHash + "-"+ gcsUavoHashStr.right(8) + ")";
QString fwVersion = boardDescription.gitDate + " (" + boardDescription.gitHash + "-" + fwUavoHashStr.right(8) + ")";
QString warning = QString(tr( QString warning = QString(tr(
"GCS and firmware versions of the UAV object set do not match which can cause configuration problems. " "GCS and firmware versions of the UAV objects set do not match which can cause configuration problems. "
"GCS version: %1. Firmware version: %2.")).arg(uavoHashStr).arg(fwVersionStr); "GCS version: %1. Firmware version: %2.")).arg(gcsVersion).arg(fwVersion);
msg->showMessage(warning); msg->showMessage(warning);
} }
} }