From b69402b7ab828e48bd64c36ec0706841e5b2b38e Mon Sep 17 00:00:00 2001
From: zedamota <josembarros@hotmail.com>
Date: Mon, 23 May 2011 11:55:09 +0100
Subject: [PATCH] This should fix the upload CLI tool.

---
 .../src/experimental/USB_UPLOAD_TOOL/main.cpp             | 8 --------
 .../src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp           | 4 +++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
index e846cbea6..c9c687986 100644
--- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
+++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/main.cpp
@@ -324,13 +324,5 @@ int main(int argc, char *argv[])
 
         return 0;
     }
-//    OP_DFU dfu(true);
-//    //dfu.findDevices();
-//    dfu.enterDFU(1);
-//    dfu.UploadFirmware("c:/ahrs.bin",true,1);
-//    // dfu.UploadDescription("josemanuel");
-//    //  QString str=dfu.DownloadDescription(12);
-    // dfu.JumpToApp();
-    // qDebug()<<"Description="<<str;
     return a.exec();
 }
diff --git a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
index 8ea3d705c..363cb17b4 100644
--- a/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
+++ b/ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL/op_dfu.cpp
@@ -56,7 +56,9 @@ OP_DFU::OP_DFU(bool _debug,bool _use_serial,QString portname,bool umodereset): d
         {
             cout<<".";
             delay::msleep(500);
-            numDevices = hidHandle.open(1,0x20a0,0x4117,0,0); //0xff9c,0x0001);
+            numDevices = hidHandle.open(1,0x20a0,0x415A,0,0); //0xff9c,0x0001);
+            if(numDevices==0)
+                numDevices = hidHandle.open(1,0x20a0,0x415B,0,0); //0xff9c,0x0001);
             if(++count==10)
             {
                 cout<<"\r";