From 9a32e637e9657f3a242d1ce3df39d6ef020cd808 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Sat, 12 May 2012 13:22:46 -0500
Subject: [PATCH] Suppress the "plug other devices in" dialog for revo
 bootloader, at least until we can have other connected devices.

---
 ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp       | 8 +++-----
 ground/openpilotgcs/src/plugins/uploader/op_dfu.h         | 6 +++---
 .../src/plugins/uploader/uploadergadgetwidget.cpp         | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
index bff5d04d5..3320565c3 100644
--- a/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
@@ -1049,7 +1049,7 @@ int DFUObject::receiveData(void * data,int size)
 #define BOARD_ID_INS    2
 #define BOARD_ID_PIP    3
 #define BOARD_ID_CC     4
-//#define BOARD_ID_PRO     ?
+#define BOARD_ID_REVO   9
 
 /**
   Gets the type of board connected
@@ -1074,11 +1074,9 @@ OP_DFU::eBoardType DFUObject::GetBoardType(int boardNum)
         case BOARD_ID_CC: // CopterControl family
             brdType = eBoardCC;
             break;
-#if 0 // Someday ;-)
-        case BOARD_ID_PRO: // Pro board
-            brdType = eBoardPro;
+        case BOARD_ID_REVO: // Revo board
+            brdType = eBoardRevo;
             break;
-#endif
     } 
     return brdType;
 }
diff --git a/ground/openpilotgcs/src/plugins/uploader/op_dfu.h b/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
index 812f3f2fb..92cbafd9c 100644
--- a/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
+++ b/ground/openpilotgcs/src/plugins/uploader/op_dfu.h
@@ -98,9 +98,9 @@ namespace OP_DFU {
         eBoardUnkwn = 0,
         eBoardMainbrd = 1,
         eBoardINS,
-        eBoardPip,
-        eBoardCC,
-        eBoardPro,
+        eBoardPip = 3,
+        eBoardCC = 4,
+        eBoardRevo = 9,
     };
 
     struct device
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index 31788eb57..61061967f 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -510,7 +510,7 @@ void UploaderGadgetWidget::systemRescue()
         m_config->rescueButton->setEnabled(true);
         return;
     }
-    if ((eBoardCC != dfu->GetBoardType(0)) && (QMessageBox::question(this,tr("OpenPilot Uploader"),tr("If you want to search for other boards connect power now and press Yes"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes))
+    if ((dfu->GetBoardType(0) != eBoardRevo) && (eBoardCC != dfu->GetBoardType(0)) && (QMessageBox::question(this,tr("OpenPilot Uploader"),tr("If you want to search for other boards connect power now and press Yes"),QMessageBox::Yes,QMessageBox::No)==QMessageBox::Yes))
     {
         log("\nWaiting...");
         QTimer::singleShot(3000, &m_eventloop, SLOT(quit()));