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

OP-21/Flight Test App Changed packet size to 64byte

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1399 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
zedamota 2010-08-24 18:27:32 +00:00 committed by zedamota
parent 6da48dcc1a
commit 8526589dfb
3 changed files with 66 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
View File

@ -22,7 +22,7 @@ int main(int argc, char *argv[])
//dfu.UploadDescription(1,"jose manuel"); //dfu.UploadDescription(1,"jose manuel");
//QString str=dfu.DownloadDescription(1,12); //QString str=dfu.DownloadDescription(1,12);
// dfu.JumpToApp(); // dfu.JumpToApp();
dfu.UploadFirmware("C:/OpenPilot.bin"); dfu.UploadFirmware("C:/OpenPilot.bin");
//qDebug()<<"Description="<<str; //qDebug()<<"Description="<<str;
return a.exec(); return a.exec();
} }

78
ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
View File

@ -28,8 +28,20 @@ void OP_DFU::enterDFU(int devNumber)
qDebug() << result << " bytes sent"; qDebug() << result << " bytes sent";
} }
void OP_DFU::StartUpload(qint32 numberOfPackets, TransferTypes type) void OP_DFU::StartUpload(qint32 numberOfBytes, TransferTypes type)
{ {
int lastPacketCount;
qint32 numberOfPackets=numberOfBytes/4/14;
int pad=(numberOfBytes-numberOfPackets*4*14)/4;
if(pad==0)
{
lastPacketCount=14;
}
else
{
++numberOfPackets;
lastPacketCount=pad;
}
char buf[BUF_LEN]; char buf[BUF_LEN];
buf[0] =0x02;//reportID buf[0] =0x02;//reportID
buf[1] = setStartBit(OP_DFU::Upload);//DFU Command buf[1] = setStartBit(OP_DFU::Upload);//DFU Command
@ -38,7 +50,7 @@ void OP_DFU::StartUpload(qint32 numberOfPackets, TransferTypes type)
buf[4] = numberOfPackets>>8;//DFU Count buf[4] = numberOfPackets>>8;//DFU Count
buf[5] = numberOfPackets;//DFU Count buf[5] = numberOfPackets;//DFU Count
buf[6] = (int)type;//DFU Data0 buf[6] = (int)type;//DFU Data0
buf[7] = 1;//DFU Data1 buf[7] = lastPacketCount;//DFU Data1
buf[8] = 1;//DFU Data2 buf[8] = 1;//DFU Data2
buf[9] = 1;//DFU Data3 buf[9] = 1;//DFU Data3
@ -46,26 +58,49 @@ void OP_DFU::StartUpload(qint32 numberOfPackets, TransferTypes type)
qDebug() << result << " bytes sent"; qDebug() << result << " bytes sent";
} }
void OP_DFU::UploadData(qint32 numberOfPackets, QByteArray data) void OP_DFU::UploadData(qint32 numberOfBytes, QByteArray data)
{ {
int lastPacketCount;
qint32 numberOfPackets=numberOfBytes/4/14;
int pad=(numberOfBytes-numberOfPackets*4*14)/4;
if(pad==0)
{
lastPacketCount=14;
}
else
{
++numberOfPackets;
lastPacketCount=pad;
}
qDebug()<<"Start Uploading:"<<numberOfPackets<<"4Bytes"; qDebug()<<"Start Uploading:"<<numberOfPackets<<"4Bytes";
char buf[BUF_LEN]; char buf[BUF_LEN];
buf[0] =0x02;//reportID buf[0] =0x02;//reportID
buf[1] = OP_DFU::Upload;//DFU Command buf[1] = OP_DFU::Upload;//DFU Command
int packetsize;
for(qint32 packetcount=0;packetcount<numberOfPackets;++packetcount) for(qint32 packetcount=0;packetcount<numberOfPackets;++packetcount)
{ {
if(packetcount==numberOfPackets)
packetsize=lastPacketCount;
else
packetsize=14;
buf[2] = packetcount>>24;//DFU Count buf[2] = packetcount>>24;//DFU Count
buf[3] = packetcount>>16;//DFU Count buf[3] = packetcount>>16;//DFU Count
buf[4] = packetcount>>8;//DFU Count buf[4] = packetcount>>8;//DFU Count
buf[5] = packetcount;//DFU Count buf[5] = packetcount;//DFU Count
buf[6] = data[packetcount*4+3];//DFU Data0 char *pointer=data.data();
buf[7] = data[packetcount*4+2];//DFU Data1 pointer=pointer+4*14*packetcount;
buf[8] = data[packetcount*4+1];//DFU Data2 // qDebug()<<"Packet Number="<<packetcount<<"Data0="<<(int)data[0]<<" Data1="<<(int)data[1]<<" Data0="<<(int)data[2]<<" Data0="<<(int)data[3]<<" buf6="<<(int)buf[6]<<" buf7="<<(int)buf[7]<<" buf8="<<(int)buf[8]<<" buf9="<<(int)buf[9];
buf[9] = data[packetcount*4];//DFU Data3 CopyWords(pointer,buf+6,packetsize*4);
// for (int y=0;y<packetsize*4;++y)
// {
// qDebug()<<y<<":"<<(int)data[packetcount*14*4+y]<<"---"<<(int)buf[6+y];
// }
// qDebug()<<" Data0="<<(int)data[0]<<" Data0="<<(int)data[1]<<" Data0="<<(int)data[2]<<" Data0="<<(int)data[3]<<" buf6="<<(int)buf[6]<<" buf7="<<(int)buf[7]<<" buf8="<<(int)buf[8]<<" buf9="<<(int)buf[9];
int result = hidHandle.send(0,buf, BUF_LEN, 5000); int result = hidHandle.send(0,buf, BUF_LEN, 5000);
qDebug()<<packetcount;
// qDebug() << "UPLOAD:"<<"Data="<<(int)buf[6]<<(int)buf[7]<<(int)buf[8]<<(int)buf[9]<<";"<<result << " bytes sent"; // qDebug() << "UPLOAD:"<<"Data="<<(int)buf[6]<<(int)buf[7]<<(int)buf[8]<<(int)buf[9]<<";"<<result << " bytes sent";
} }
} }
@ -117,7 +152,7 @@ QByteArray OP_DFU::StartDownload(qint32 numberOfPackets, TransferTypes type)
qDebug() << "StartDownload:"<<result << " bytes sent"; qDebug() << "StartDownload:"<<result << " bytes sent";
for(qint32 x=0;x<numberOfPackets;++x) for(qint32 x=0;x<numberOfPackets;++x)
{ {
result = hidHandle.receive(0,buf,10,5000); result = hidHandle.receive(0,buf,BUF_LEN,5000);
qDebug() << result << " bytes received"<<" Count="<<(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]; qDebug() << result << " bytes received"<<" Count="<<(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];
ret.append(buf+6,4); ret.append(buf+6,4);
} }
@ -170,9 +205,9 @@ int OP_DFU::StatusRequest()
buf[9] = 0; buf[9] = 0;
int result = hidHandle.send(0,buf, BUF_LEN, 500); int result = hidHandle.send(0,buf, BUF_LEN, 500);
hidHandle.receive(0,buf,10,500); hidHandle.receive(0,buf,BUF_LEN,500);
qDebug() << result << " bytes sent"; qDebug() << result << " bytes sent";
result = hidHandle.receive(0,buf,10,500); result = hidHandle.receive(0,buf,BUF_LEN,500);
qDebug() << result << " bytes received"; qDebug() << result << " bytes received";
if(buf[1]==OP_DFU::Status_Rep) if(buf[1]==OP_DFU::Status_Rep)
{ {
@ -197,8 +232,8 @@ void OP_DFU::EndOperation()
buf[8] = 0; buf[8] = 0;
buf[9] = 0; buf[9] = 0;
int result = hidHandle.send(0,buf, BUF_LEN, 500); int result = hidHandle.send(0,buf, BUF_LEN, 5000);
hidHandle.receive(0,buf,10,500); hidHandle.receive(0,buf,BUF_LEN,5000);
qDebug() << result << " bytes sent"; qDebug() << result << " bytes sent";
} }
void OP_DFU::UploadFirmware(QString sfile) void OP_DFU::UploadFirmware(QString sfile)
@ -220,10 +255,21 @@ void OP_DFU::UploadFirmware(QString sfile)
pad=pad-arr.length(); pad=pad-arr.length();
arr.append(QByteArray(pad,255)); arr.append(QByteArray(pad,255));
} }
StartUpload(arr.length()/4,FW); StartUpload(arr.length(),FW);
UploadData(arr.length()/4,arr); UploadData(arr.length(),arr);
EndOperation(); EndOperation();
int ret=StatusRequest(); int ret=StatusRequest();
qDebug()<<"Status="<<ret; qDebug()<<"Status="<<ret;
} }
void OP_DFU::CopyWords(char *source, char *destination, int count)
{
for (int x=0;x<count;x=x+4)
{
//qDebug()<<(int)source[x*4+3]<<"xxx="<<4*x;
*(destination+x)=source[x+3];
*(destination+x+1)=source[x+2];
*(destination+x+2)=source[x+1];
*(destination+x+3)=source[x+0];
}
}

5
ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
View File

@ -5,7 +5,7 @@
#include <../../plugins/rawhid/pjrc_rawhid.h> #include <../../plugins/rawhid/pjrc_rawhid.h>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#define BUF_LEN 10 #define BUF_LEN 64
class OP_DFU class OP_DFU
{ {
public: public:
@ -48,7 +48,7 @@ public:
void JumpToApp(); void JumpToApp();
void ResetDevice(void); void ResetDevice(void);
void enterDFU(int devNumber); void enterDFU(int devNumber);
void StartUpload(qint32 numberOfPackets, TransferTypes type); void StartUpload(qint32 numberOfBytes, TransferTypes type);
void UploadData(qint32 numberOfPackets,QByteArray data); void UploadData(qint32 numberOfPackets,QByteArray data);
void UploadDescription(int devNumber, QString description); void UploadDescription(int devNumber, QString description);
void UploadFirmware(QString sfile); void UploadFirmware(QString sfile);
@ -56,6 +56,7 @@ public:
void EndOperation(); void EndOperation();
QString DownloadDescription(int devNumber,int numberOfChars); QString DownloadDescription(int devNumber,int numberOfChars);
QByteArray StartDownload(qint32 numberOfPackets, TransferTypes type); QByteArray StartDownload(qint32 numberOfPackets, TransferTypes type);
void CopyWords(char * source, char* destination, int count);
// QByteArray DownloadData(int devNumber,int numberOfPackets); // QByteArray DownloadData(int devNumber,int numberOfPackets);
OP_DFU(); OP_DFU();
private: private: