Firmware v1.3 - enable Ethernet by default

sparkfun · Jan 6, 2025 · 47d799a · 47d799a
1 parent 5425c06
commit 47d799a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.github/workflows/build-for-release.yml b/.github/workflows/build-for-release.yml
@@ -6,7 +6,7 @@ on:
 env:
   FILENAME_PREFIX: GNSSDO_Firmware
   FIRMWARE_VERSION_MAJOR: 1
-  FIRMWARE_VERSION_MINOR: 2
+  FIRMWARE_VERSION_MINOR: 3
   CORE_VERSION: 3.0.7
 
 jobs:

diff --git a/Firmware/GNSSDO_Firmware/GNSS.ino b/Firmware/GNSSDO_Firmware/GNSS.ino
@@ -147,7 +147,7 @@ bool gnssHardReset()
 }
 
 // Initialize GNSS
-// Disable PPS. Set clock sync threshold. Set output messages. Copy config file.
+// Disable PPS. Set clock sync threshold. Set output messages. Enable Ethernet. Copy config file.
 // This only needs to be done once.
 bool initializeGNSS()
 {
@@ -161,7 +161,9 @@ bool initializeGNSS()
 
     int retries = 3; // GNSS is already begun. We shouldn't need to retry.
 
-    while (!sendWithResponse("eccf, RxDefault, Current\n\r", "CopyConfigFile") && (retries > 0)) // Restore defaults
+    // Restore default configuration
+    // Note: the IP settings set by the setIPSettings and setIPPortSettings commands keep their value
+    while (!sendWithResponse("eccf, RxDefault, Current\n\r", "CopyConfigFile") && (retries > 0))
     {
         systemPrintln("No response from mosaic. Retrying - with escape sequence...");
         sendWithResponse("SSSSSSSSSSSSSSSSSSSS\n\r", "COM4>"); // Send escape sequence
@@ -211,6 +213,13 @@ bool initializeGNSS()
         return false;
     }
 
+    if (!sendWithResponse("seth, on\n\r", "EthernetMode"))
+    {
+        systemPrintln("GNSS FAIL (EthernetMode)");
+        return false;
+    }
+
+    // Copy current configuration into boot
     if (!sendWithResponse("eccf, Current, Boot\n\r", "CopyConfigFile"))
     {
         systemPrintln("GNSS FAIL (CopyConfigFile)");