Change Eth Config entry/exit displays

Author: nseidle

Firmware/RTK_Everywhere/Display.ino

@@ -2943,22 +2943,44 @@ void displayNTPFail(uint16_t displayTime)
     }
 }
 
-void displayConfigViaEthNotStarted(uint16_t displayTime)
+void displayConfigViaEthStarting(uint16_t displayTime)
 {
     if (online.display == true)
     {
         oled->erase();
 
-        uint8_t fontHeight = 8;
+        uint8_t fontHeight = 12;
+        uint8_t yPos = fontHeight;
+
+        printTextCenter("Configure", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
+        yPos += fontHeight;
+        printTextCenter("Via", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
+        yPos += fontHeight;
+        printTextCenter("Ethernet", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
+        yPos += fontHeight;
+        printTextCenter("Starting", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
+
+        oled->display();
+
+        delay(displayTime);
+    }
+}
+void displayConfigViaEthExiting(uint16_t displayTime)
+{
+    if (online.display == true)
+    {
+        oled->erase();
+
+        uint8_t fontHeight = 12;
         uint8_t yPos = fontHeight;
 
-        printTextCenter("Configure", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Configure", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Via", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Via", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Ethernet", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Ethernet", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Restart", yPos, QW_FONT_5X7, 1, true); // text, y, font type, kerning, inverted
+        printTextCenter("Exiting", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
 
         oled->display();
 
@@ -2972,16 +2994,16 @@ void displayConfigViaEthStarted(uint16_t displayTime)
     {
         oled->erase();
 
-        uint8_t fontHeight = 8;
+        uint8_t fontHeight = 12;
         uint8_t yPos = fontHeight;
 
-        printTextCenter("Configure", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Configure", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Via", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Via", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Ethernet", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Ethernet", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
         yPos += fontHeight;
-        printTextCenter("Started", yPos, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("Started", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
 
         oled->display();
 

Firmware/RTK_Everywhere/States.ino

@@ -856,7 +856,7 @@ void stateUpdate()
         break;
 
         case (STATE_CONFIG_VIA_ETH_NOT_STARTED): {
-            displayConfigViaEthNotStarted(1500);
+            displayConfigViaEthStarting(1500);
 
             settings.updateGNSSSettings = false; // On the next boot, no need to update the GNSS on this profile
             settings.lastState = STATE_CONFIG_VIA_ETH_STARTED; // Record the _next_ state for POR
@@ -876,7 +876,7 @@ void stateUpdate()
             // ints).
             if (!configureViaEthernet)
             {
-                displayConfigViaEthNotStarted(1500);
+                displayConfigViaEthStarting(1500);
                 settings.lastState = STATE_CONFIG_VIA_ETH_STARTED; // Re-record this state for POR
                 recordSystemSettings();
 
@@ -949,7 +949,7 @@ void stateUpdate()
         break;
 
         case (STATE_CONFIG_VIA_ETH_RESTART_BASE): {
-            displayConfigViaEthNotStarted(1000);
+            displayConfigViaEthExiting(1000);
 
             ethernetWebServerStopESP32W5500();
 

Firmware/RTK_Everywhere/menuMain.ino

@@ -147,7 +147,7 @@ void menuMain()
 
             if (incoming == 'r')
             {
-                displayConfigViaEthNotStarted(1000);
+                displayConfigViaEthStarting(1000);
 
                 ethernetWebServerStopESP32W5500();