From dd86e7f9c4b7011b400cfe630872ccc7e8a4f792 Mon Sep 17 00:00:00 2001
From: Stefan Karlsson <stefan.karlsson@gmail.com>
Date: Mon, 15 Sep 2014 23:30:17 +0200
Subject: [PATCH] OP-1493 Update BOARD_REVISION for discoveryf4bare and fix
 AutoUpdate

---
 Makefile                                                       | 2 +-
 flight/targets/boards/discoveryf4bare/board-info.mk            | 2 +-
 ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp      | 3 +++
 .../openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 89a7d1cd6..e70060614 100644
--- a/Makefile
+++ b/Makefile
@@ -698,7 +698,7 @@ endif
 ##############################
 
 # Firmware files to package
-PACKAGE_FW_TARGETS  := $(filter-out fw_simposix fw_discoveryf4bare, $(FW_TARGETS))
+PACKAGE_FW_TARGETS  := $(filter-out fw_simposix, $(FW_TARGETS))
 PACKAGE_ELF_TARGETS := $(filter     fw_simposix, $(FW_TARGETS))
 
 # Rules to generate GCS resources used to embed firmware binaries into the GCS.
diff --git a/flight/targets/boards/discoveryf4bare/board-info.mk b/flight/targets/boards/discoveryf4bare/board-info.mk
index 4e7f7e2ed..52921c61d 100644
--- a/flight/targets/boards/discoveryf4bare/board-info.mk
+++ b/flight/targets/boards/discoveryf4bare/board-info.mk
@@ -1,5 +1,5 @@
 BOARD_TYPE          := 0x09
-BOARD_REVISION      := 0x03
+BOARD_REVISION      := 0x04
 BOOTLOADER_VERSION  := 0x06
 HW_TYPE             := 0x00
 
diff --git a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
index 4c5d09842..451f63a12 100644
--- a/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
@@ -102,6 +102,9 @@ void DeviceWidget::populate()
     case 0x0903:
         devicePic.load(":/uploader/images/gcs-board-revo.png");
         break;
+    case 0x0904:
+        devicePic.load(":/uploader/images/gcs-board-revo.png");
+        break;
     default:
         // Clear
         devicePic.load("");
diff --git a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
index 0d9c112a8..2fa0a4ddd 100644
--- a/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
+++ b/ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
@@ -667,6 +667,9 @@ bool UploaderGadgetWidget::autoUpdate()
     case 0x903:
         filename = "fw_revolution";
         break;
+    case 0x904:
+        filename = "fw_discoveryf4bare";
+        break;
     default:
         emit autoUpdateSignal(FAILURE, QVariant());
         return false;