Diff: main.cpp

Revision:

8:26e49e6955bd

Parent:

7:f0e645cf73a2

--- a/main.cpp	Fri Jul 28 15:53:40 2017 +0000
+++ b/main.cpp	Mon Jul 31 15:37:57 2017 +0000
@@ -39,7 +39,7 @@
 #include "USBHostGCUtilities.h"
 
 
-#define BUILD_DATE "28 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
+#define BUILD_DATE "31 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
                                   // *** MUST update for each 'delivered' build, MUST correspond with date on 'delivered' binary file ***
                                   //     This should be updated first thing every morning, and immediately after every 'delivery'
                                   //     (to e.g. "dd mmm yyyy #2"), so that it is ready for the next one.
@@ -162,7 +162,11 @@
 
 #define USE_QSPI_BITMAPS
 #ifdef USE_QSPI_BITMAPS
+
 QSPIBitmaps qspiBitmaps;
+
+#define USE_QSPI_BACKGROUND_BITMAPS
+
 #endif // USE_QSPI_BITMAPS
 
 //#define WANT_STATUS_RECTANGLE_ON_COLUMN_AUTO_CALIB_PAGE
@@ -590,7 +594,11 @@
 */
 void DrawBackgroundBitmapWithLogo(void)
 {
+#ifdef USE_QSPI_BACKGROUND_BITMAPS
+    qspiBitmaps.DisplayBootScreenBitmap();
+#else
     DrawSpecifiedBackgroundBitmap(GuiStruct_Bitmap_BootScreen);
+#endif // USE_QSPI_BACKGROUND_BITMAPS
 }
 
 /*
@@ -2206,6 +2214,11 @@
     DrawHeatOnOffButton();
 #endif
     
+#ifdef USE_QSPI_BITMAPS
+    // Before we display the first page - needs BootScreen
+    qspiBitmaps.SetupArray();
+#endif
+    
     GuiDisplay_Lock();
     
     GuiLib_Init();
@@ -2213,10 +2226,6 @@
     DisplayEasyGuiStructure(initialEasyGUIPage, NULL, NULL);
   
     GuiDisplay_Unlock();
-    
-#ifdef USE_QSPI_BITMAPS
-    qspiBitmaps.SetupArray();
-#endif
 }
 
 void InitialiseLPC4088(DMBoard* board, void **frameBufferAddress1, void **frameBufferAddress2)