From 5b787272f54ff3ce5b9b027ac92ae42c2db85e89 Mon Sep 17 00:00:00 2001
From: elafargue <edouard@lafargue.name>
Date: Tue, 24 May 2011 08:15:57 +0200
Subject: [PATCH] OP-504 Attempt to fix the Rescue/Boot issue, and bugfix in
 firmware version display in UPloader gadget.

---
 .../openpilotgcs/src/plugins/uploader/devicewidget.cpp | 10 ----------
 .../src/plugins/uploader/uploadergadgetwidget.cpp      |  6 +++++-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
index d892c6f7a..7aa040255 100644
--- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
@@ -268,12 +268,7 @@ void deviceWidget::uploadFirmware()
         if (firmwareBoard != board) {
             status("Error: firmware does not match board", STATUSICON_FAIL);
             return;
-        } else {
-            // Not a structured description: warn user
-            myDevice->buildDate->setText("Warning: development firmware");
-            myDevice->commitTag->setText("");
         }
-
         // Check the firmware embedded in the file:
         QByteArray firmwareHash = desc.mid(40,20);
         QByteArray fileHash = QCryptographicHash::hash(arr.left(arr.length()-100), QCryptographicHash::Sha1);
@@ -281,9 +276,6 @@ void deviceWidget::uploadFirmware()
             status("Error: firmware file corrupt", STATUSICON_FAIL);
             return;
         }
-
-
-
     } else {
         // The firmware is not packaged, just upload the text in the description field
         // if it is there.
@@ -291,8 +283,6 @@ void deviceWidget::uploadFirmware()
     }
 
 
-
-
     status("Starting firmware upload", STATUSICON_RUNNING);
     // We don't know which device was used previously, so we
     // are cautious and reenter DFU for this deviceID:
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index d9823a36c..2943bcdfd 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -291,7 +291,10 @@ void UploaderGadgetWidget::goToBootloader(UAVObject* callerObj, bool success)
         /*
         m_config->haltButton->setEnabled(false);
         m_config->resetButton->setEnabled(false);
+        */
+        // Need to re-enable in case we were not connected
         m_config->bootButton->setEnabled(true);
+        /*
         m_config->telemetryLink->setEnabled(false);
         m_config->rescueButton->setEnabled(false);
         */
@@ -359,6 +362,7 @@ void UploaderGadgetWidget::systemBoot()
         delete dfu;
         dfu = NULL;
         m_config->bootButton->setEnabled(true);
+        m_config->rescueButton->setEnabled(true); // Boot not possible, maybe Rescue OK?
         return;
     }
     log("Booting system...");
@@ -503,7 +507,7 @@ void UploaderGadgetWidget::systemRescue()
         }
         m_config->haltButton->setEnabled(false);
         m_config->resetButton->setEnabled(false);
-        //m_config->bootButton->setEnabled(true);
+        m_config->bootButton->setEnabled(true);
         m_config->rescueButton->setEnabled(false);
         currentStep = IAP_STATE_BOOTLOADER; // So that we can boot from the GUI afterwards.
     }