Better TCP support - display the port on the OLED

Author: PaulZC

Firmware/RTK_mosaic-T_Firmware/Begin.ino

@@ -176,11 +176,13 @@ void beginBoard()
     }
 }
 
-void beginConsole(bool allowAlt)
+void beginConsole(uint32_t baud, bool allowAlt)
 {
+    // Don't try to print here. serialConsole may not have been initialized
+
     if ((!allowAlt) || (!settings.enableTCPServer))
     {
-        serialConsole.begin(115200, SERIAL_8N1, pin_serial0RX, pin_serial0TX);
+        serialConsole.begin(baud, SERIAL_8N1, pin_serial0RX, pin_serial0TX);
     }
     else
     {
@@ -190,7 +192,7 @@ void beginConsole(bool allowAlt)
         }
         else
         {
-            serialConsole.begin(115200, SERIAL_8N1, pin_serial0RX_Alt, pin_serial0TX_Alt);
+            serialConsole.begin(baud, SERIAL_8N1, pin_serial0RX_Alt, pin_serial0TX_Alt);
         }
     }
 

Firmware/RTK_mosaic-T_Firmware/Display.ino

@@ -125,8 +125,16 @@ void updateDisplay()
             oled->print(textLine);
             yPos += 8;
 
-            snprintf(textLine, sizeof(textLine), "IP    %s",
-                    gnssIP.toString().c_str());
+            if ((settings.enableTCPServer) && ((gnssSecond % 4) > 1)) // Print TCP Port for two seconds
+            {
+                snprintf(textLine, sizeof(textLine), "IP    TCP Port %d",
+                        settings.tcpServerPort);
+            }
+            else
+            {
+                snprintf(textLine, sizeof(textLine), "IP    %s",
+                        gnssIP.toString().c_str());
+            }
             oled->setCursor(0, yPos);
             oled->print(textLine);
             yPos += 8;

Firmware/RTK_mosaic-T_Firmware/RTK_mosaic-T_Firmware.ino

@@ -11,6 +11,14 @@
   Set the board to "ESP32 Wrover Module"
 
   Settings are pulled from ESP32's file system LittleFS.
+
+  Version history:
+  1.0: Initial release
+  1.1: Add TCP support
+       The console can be accessed via TCP (COM3 is daisy chained to IPS1)
+       On the v1.0 PCB, link:
+       mosaic COM3 TX (TX3) to ESP32 GPIO 34
+       mosaic COM3 RX (RX3) to ESP32 GPIO 23
 */
 
 // This is passed in from compiler extra flags
@@ -318,7 +326,7 @@ void setup()
 {
     initializeGlobals(); // Initialize any global variables that can't be given default values
 
-    beginConsole(false); // UART0 for programming and debugging. Don't allow Alt pins to be used yet
+    beginConsole(115200, false); // UART0 for programming and debugging. Don't allow Alt pins to be used yet
     systemPrintln();
     systemPrintln();
 
@@ -382,8 +390,10 @@ void setup()
 
     systemPrintf("Boot time: %d\r\n", millis());
 
-    serialConsole.flush(); // Complete any previous prints
-    beginConsole(true); // Swap to Alt pins if TCP is enabled
+    if (settings.enableTCPServer)
+        systemPrintf("TCP Server is enabled. Please connect on port %d to view the console\r\n", settings.tcpServerPort);
+
+    beginConsole(115200, true); // Swap to Alt pins if TCP is enabled
 }
 
 void loop()
@@ -413,22 +423,30 @@ void loop()
 // Once we have a fix, sync system clock to GNSS
 void updateRTC()
 {
+    static uint16_t syncAge = 0;
+
     static bool firstTime = true;
     if (firstTime)
     {
         gnssTimeUpdated[0] = false; // This ensures gnssTimeUpdated[0] isn't stale
         firstTime = false;
     }
 
-    if (online.rtc == false) // Only do this if the rtc has not been sync'd previously
+    if (online.gnss == true) // Only do this if the GNSS is online
     {
-        if (online.gnss == true) // Only do this if the GNSS is online
+        if (gnssTimeUpdated[0]) // Only do this if we have fresh time
         {
-            if (gnssTimeUpdated[0])
-            {
-                gnssTimeUpdated[0] = false;
+            gnssTimeUpdated[0] = false;
 
-                if (gnssWNSet && gnssToWSet && gnssFineTime)
+            syncAge++; // Update syncAge every second
+            if (syncAge == 3600) // Wrap every hour
+                syncAge = 0;
+
+            if (gnssWNSet && gnssToWSet && gnssFineTime) // Only do this if FineTime is set
+            {
+                // Only do this if the rtc has not been sync'd previously
+                // or if it is an hour since the last sync
+                if ((online.rtc == false) || (syncAge == 0))
                 {
                     // To perform the time zone adjustment correctly, it's easiest if we convert the GNSS time and date
                     // into Unix epoch first and then correct for the arrival time
@@ -443,11 +461,14 @@ void updateRTC()
 
                     online.rtc = true;
 
-                    systemPrint("System time set to: ");
-                    systemPrintln(rtc.getDateTime(true));
+                    if (settings.enablePrintRtcSync)
+                    {
+                        systemPrint("System time set to: ");
+                        systemPrintln(rtc.getDateTime(true));
+                    }
                 }
             }
-        }         // End online.gnss
-    }             // End online.rtc
+        }
+    }
 }
 

Firmware/RTK_mosaic-T_Firmware/System.ino

@@ -14,7 +14,7 @@ void reportHeap()
 {
     if (settings.enableHeapReport == true)
     {
-        if (millis() - lastHeapReport > 1000)
+        if (millis() - lastHeapReport >= settings.periodicPrintInterval_ms)
         {
             reportHeapNow(false);
         }

Firmware/RTK_mosaic-T_Firmware/Tasks.ino

@@ -115,7 +115,14 @@ void gnssReadTask(void *e)
     while (true)
     {
         if ((settings.enableTaskReports == true) && !inMainMenu)
-            systemPrintf("SerialReadTask High watermark: %d\r\n", uxTaskGetStackHighWaterMark(nullptr));
+        {
+            static unsigned long lastPrint = 0;
+            if (millis() > (lastPrint + settings.periodicPrintInterval_ms))
+            {
+                systemPrintf("SerialReadTask High watermark: %d\r\n", uxTaskGetStackHighWaterMark(nullptr));
+                lastPrint = millis();
+            }
+        }
 
         while (serialGNSS.available())
         {
@@ -710,11 +717,11 @@ void ButtonCheckTask(void *e)
             {
                 setupBtn->read();
 
-                if (setupBtn->isPressed()) // Switch is set to base mode
+                if (setupBtn->isPressed())
                 {
                     // Do stuff... Maybe change the display?
                 }
-                else if (setupBtn->wasReleased()) // Switch is set to Rover
+                else if (setupBtn->wasReleased())
                 {
                     // Do stuff... Maybe change the display?
                 }

Firmware/RTK_mosaic-T_Firmware/menuMain.ino

@@ -93,6 +93,11 @@ void menuMain()
 
     configureGNSSTCPServer(); // Configure TCP
 
+    if (settings.enableTCPServer)
+        systemPrintf("TCP Server is enabled. Please connect on port %d to view the console\r\n", settings.tcpServerPort);
+        
+    beginConsole(115200, true); // Swap to Alt pins if TCP is enabled
+
     recordSystemSettings(); // Once all menus have exited, record the new settings to LittleFS and config file
 
     clearBuffer();           // Empty buffer of any newline chars

Firmware/Utils/ESP32_FLASH_ERASE.bat

@@ -0,0 +1,20 @@
+@echo off
+
+if [%1]==[] goto findPort
+
+set COMPORT=%1
+goto erase
+
+:findPort
+
+for /f "tokens=2 delims=(" %%a in ('wmic path win32_pnpentity get caption /format:list ^| find "COM" ^| find "CH340"') do (
+    for /f "tokens=1 delims=)" %%b in ("%%a") do (
+        set COMPORT=%%b
+    )
+)
+
+:erase
+
+set ESPTOOL="esptool.exe"
+
+call %ESPTOOL% --chip esp32 -p %COMPORT% -b 460800 erase_flash