From c754ef865e2e4dd857d74088ba21fe5e65c039bb Mon Sep 17 00:00:00 2001
From: zedamota <zedamota>
Date: Thu, 26 Aug 2010 20:19:40 +0000
Subject: [PATCH] OP-21/Flight Bootloader - Test App, fixes wrong file being
 uploaded to HW. It was the PC app itself that was being uploaded. Is anyone
 feeling an ugly monkey pointing his finger??

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1421 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/experimental/USB_UPLOAD_TOOL/main.cpp   | 6 +++---
 ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp | 3 ++-
 ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
index 542c14ff1..7cee37dc3 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
@@ -7,10 +7,10 @@ int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
     QString filename;
-    if(argc < 1)
-        filename = QString("C:\\OpenPilot.bin");
+    if(argc < 2)
+        filename = QString("C:/OpenPilot.bin");
     else
-        filename = QString(argv[0]);
+        filename = QString(argv[1]);
 
     OP_DFU dfu;
 //    dfu.enterDFU(1);
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
index 7b6d57bdd..1bc2b7696 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
@@ -236,7 +236,7 @@ void OP_DFU::EndOperation()
     hidHandle.receive(0,buf,BUF_LEN,5000);
     qDebug() << result << " bytes sent";
 }
-void OP_DFU::UploadFirmware(QString sfile)
+void OP_DFU::UploadFirmware(const QString &sfile)
 {
     enterDFU(1);
     QFile file(sfile);
@@ -247,6 +247,7 @@ void OP_DFU::UploadFirmware(QString sfile)
              return;
                  }
     QByteArray arr=file.readAll();
+    qDebug()<<"Bytes Loaded="<<arr.length();
     if(arr.length()%4!=0)
     {
     int pad=arr.length()/4;
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
index 20428f09d..d8a44ffb6 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
@@ -51,7 +51,7 @@ public:
     void StartUpload(qint32 numberOfBytes, TransferTypes type);
     void UploadData(qint32 numberOfPackets,QByteArray data);
     void UploadDescription(int devNumber, QString description);
-    void UploadFirmware(QString sfile);
+    void UploadFirmware(const QString &sfile);
     int StatusRequest();
     void EndOperation();
     QString DownloadDescription(int devNumber,int numberOfChars);