From 0e09e34faa01c127779c31592f88c59b43e622b4 Mon Sep 17 00:00:00 2001
From: Nathan Seidle <nathan@sparkfun.com>
Date: Fri, 10 May 2024 15:38:53 -0600
Subject: [PATCH] Move logo display after power on check

Fix #762
---
 Firmware/RTK_Surveyor/Begin.ino   |  2 ++
 Firmware/RTK_Surveyor/Display.ino | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/Firmware/RTK_Surveyor/Begin.ino b/Firmware/RTK_Surveyor/Begin.ino
index fca01687d..070a5761b 100644
--- a/Firmware/RTK_Surveyor/Begin.ino
+++ b/Firmware/RTK_Surveyor/Begin.ino
@@ -283,6 +283,8 @@ void beginBoard()
         settings.enablePrintBatteryMessages = false; // No pesky battery messages
     }
 
+    displaySfeFlame();
+
     char versionString[21];
     getFirmwareVersion(versionString, sizeof(versionString), true);
     systemPrintf("SparkFun RTK %s %s\r\n", platformPrefix, versionString);
diff --git a/Firmware/RTK_Surveyor/Display.ino b/Firmware/RTK_Surveyor/Display.ino
index d77e28bbb..ab8dc6979 100644
--- a/Firmware/RTK_Surveyor/Display.ino
+++ b/Firmware/RTK_Surveyor/Display.ino
@@ -116,11 +116,7 @@ void beginDisplay()
 
             systemPrintln("Display started");
 
-            // Display the SparkFun LOGO
             oled.erase();
-            displayBitmap(0, 0, logoSparkFun_Width, logoSparkFun_Height, logoSparkFun);
-            oled.display();
-            splashStart = millis();
             return;
         }
 
@@ -130,6 +126,18 @@ void beginDisplay()
     systemPrintln("Display not detected");
 }
 
+// Display the SparkFun logo
+void displaySfeFlame()
+{
+    if (online.display == true)
+    {
+        oled.erase();
+        displayBitmap(0, 0, logoSparkFun_Width, logoSparkFun_Height, logoSparkFun);
+        oled.display();
+        splashStart = millis();
+    }
+}
+
 // Avoid code repetition
 void displayBatteryVsEthernet()
 {
@@ -1885,17 +1893,17 @@ void displayNoWiFi(uint16_t displayTime)
 
 void displayNoSSIDs(uint16_t displayTime)
 {
-  displayMessage("No SSIDs", displayTime);
+    displayMessage("No SSIDs", displayTime);
 }
 
 void displayAccountExpired(uint16_t displayTime)
 {
-  displayMessage("Account Expired", displayTime);
+    displayMessage("Account Expired", displayTime);
 }
 
 void displayNotListed(uint16_t displayTime)
 {
-  displayMessage("Not Listed", displayTime);
+    displayMessage("Not Listed", displayTime);
 }
 
 void displayRoverStart(uint16_t displayTime)
@@ -2042,11 +2050,11 @@ void displayWiFiConfig()
         snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
     else
     {
-        if(WiFi.getMode() == WIFI_STA)
+        if (WiFi.getMode() == WIFI_STA)
             snprintf(mySSID, sizeof(mySSID), "%s", WiFi.SSID().c_str());
 
-        //If we failed to connect to a friendly WiFi, and then fell back to AP mode, still display RTK Config
-        else if(WiFi.getMode() == WIFI_AP)
+        // If we failed to connect to a friendly WiFi, and then fell back to AP mode, still display RTK Config
+        else if (WiFi.getMode() == WIFI_AP)
             snprintf(mySSID, sizeof(mySSID), "%s", "RTK Config");
 
         else
@@ -2444,7 +2452,7 @@ void paintSystemTest()
                 else
                     oled.print("FAIL");
             } // End display 0
-        }     // End Facet L-Band testing
+        } // End Facet L-Band testing
     }
 }