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

OP-35 Further cleanup of Uploader gadget, better debug messages, more reliable.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2169 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
edouard 2010-11-27 13:44:16 +00:00 committed by edouard
parent a9cd9ac329
commit 02366bf368
2 changed files with 25 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/uploader/devicewidget.cpp
View File

@ -224,6 +224,7 @@ void deviceWidget::downloadFirmware()
void deviceWidget::downloadFinished()
{
disconnect(m_dfu, SIGNAL(downloadFinished()), this, SLOT(downloadFinished()));
disconnect(m_dfu, SIGNAL(progressUpdated(int)), this, SLOT(setProgress(int)));
status("Download successful");
// Now save the result (use the utility function from OP_DFU)
m_dfu->SaveByteArrayToFile(filename, downloadedFirmware);
@ -236,6 +237,8 @@ void deviceWidget::downloadFinished()
void deviceWidget::uploadFinished(OP_DFU::Status retstatus)
{
disconnect(m_dfu, SIGNAL(uploadFinished(OP_DFU::Status)), this, SLOT(uploadFinished(OP_DFU::Status)));
disconnect(m_dfu, SIGNAL(progressUpdated(int)), this, SLOT(setProgress(int)));
disconnect(m_dfu, SIGNAL(operationProgress(QString)), this, SLOT(status(QString)));
if(retstatus != OP_DFU::Last_operation_Success) {
status(QString("Upload failed with code: ") + m_dfu->StatusToString(retstatus).toLatin1().data());
return;
@ -253,7 +256,6 @@ void deviceWidget::uploadFinished(OP_DFU::Status retstatus)
}
/**
Slot to update the progress bar
*/
@ -274,7 +276,7 @@ QString deviceWidget::setOpenFileName()
QString fileName = QFileDialog::getOpenFileName(this,
tr("Select firmware file"),
"",
tr("All Files (*);;Firmware Files (*.bin)"),
tr("Firmware Files (*.bin)"),
&selectedFilter,
options);
return fileName;

53
ground/src/plugins/uploader/op_dfu.cpp
View File

@ -210,11 +210,11 @@ OP_DFU::Status DFUObject::UploadDescription(QString description)
{
return OP_DFU::abort;
}
int ret=StatusRequest();
OP_DFU::Status ret = StatusRequest();
if(debug)
qDebug()<<"Upload description Status="<<ret;
return (OP_DFU::Status)ret;
qDebug() << "Upload description Status=" << StatusToString(ret);
return ret;
}
@ -315,6 +315,7 @@ bool DFUObject::StartDownloadT(QByteArray *fw, qint32 const & numberOfBytes, Tra
// Now get those packets:
for(qint32 x=0;x<numberOfPackets;++x)
{
int size;
percentage=(float)(x+1)/numberOfPackets*100;
if(laspercentage!=(int)percentage)
printProgBar((int)percentage,"DOWNLOADING");
@ -323,7 +324,6 @@ bool DFUObject::StartDownloadT(QByteArray *fw, qint32 const & numberOfBytes, Tra
result = hidHandle.receive(0,buf,BUF_LEN,5000);
if(debug)
qDebug() << result << " bytes received"<<" Count="<<x<<"-"<<(int)buf[2]<<";"<<(int)buf[3]<<";"<<(int)buf[4]<<";"<<(int)buf[5]<<" Data="<<(int)buf[6]<<";"<<(int)buf[7]<<";"<<(int)buf[8]<<";"<<(int)buf[9];
int size;
if(x==numberOfPackets-1)
size=lastPacketCount*4;
else
@ -589,13 +589,13 @@ OP_DFU::Status DFUObject::UploadFirmwareT(const QString &sfile, const bool &veri
if( !StartUpload(arr.length(), OP_DFU::FW, crc))
{
ret = StatusRequest();
if(debug)
{
qDebug() << "StartUpload failed";
OP_DFU::Status ret = StatusRequest();
qDebug() << "StartUpload returned:" << StatusToString(ret);
}
return OP_DFU::abort;
return ret;
}
emit operationProgress(QString("Erasing memory, please wait..."));
@ -606,62 +606,50 @@ OP_DFU::Status DFUObject::UploadFirmwareT(const QString &sfile, const bool &veri
// TODO: why is there a loop there? The "if" statement
// will cause a break or return anyway!!
for (int x = 0; x < 3; ++x) {
OP_DFU::Status ret = StatusRequest();
ret = StatusRequest();
if (debug) qDebug() << "Erase returned: " << StatusToString(ret);
if (ret == OP_DFU::uploading)
break;
else
return OP_DFU::abort;
return ret;
}
emit operationProgress(QString("Uploading firmware"));
if( !UploadData(arr.length(),arr))
{
ret = StatusRequest();
if(debug)
{
qDebug()<<"Upload failed (upload data)";
OP_DFU::Status ret=StatusRequest();
qDebug()<<"StartUpload returned:"<<StatusToString(ret);
qDebug()<<"UploadData returned:"<<StatusToString(ret);
}
return OP_DFU::abort;
return ret;
}
if(!EndOperation())
{
ret = StatusRequest();
if(debug)
{
qDebug()<<"Upload failed (end operation)";
OP_DFU::Status ret=StatusRequest();
qDebug()<<"StartUpload returned:"<<StatusToString(ret);
qDebug()<<"EndOperation returned:"<<StatusToString(ret);
}
return OP_DFU::abort;
}
ret=StatusRequest();
if(ret==OP_DFU::Last_operation_Success)
{
}
else
{
return ret;
}
if(verify)
{
ret = StatusRequest();
if(ret != OP_DFU::Last_operation_Success)
return ret;
if(verify) {
emit operationProgress(QString("Verifying firmware"));
cout<<"Starting code verification\n";
QByteArray arr2;
StartDownloadT(&arr2, arr.length(),OP_DFU::FW);
if (arr == arr2 )
cout<<"Verify:PASSED\n";
else
{
if (arr != arr2 ) {
cout<<"Verify:FAILED\n";
return OP_DFU::abort;
}
}
else
{
return ret;
}
if(debug)
qDebug()<<"Status="<<ret;
cout<<"Firmware Uploading succeeded\n";
@ -793,6 +781,7 @@ void DFUObject::printProgBar( int const & percent,QString const& label){
std::cout<< percent << "% " << std::flush;
}
}
quint32 DFUObject::CRC32WideFast(quint32 Crc, quint32 Size, quint32 *Buffer)
{
//Size = Size >> 2; // /4 Size passed in as a byte count, assumed to be a multiple of 4