Skip to content

Commit 47d799a

Browse files
committed
Firmware v1.3 - enable Ethernet by default
1 parent 5425c06 commit 47d799a

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/build-for-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
env:
77
FILENAME_PREFIX: GNSSDO_Firmware
88
FIRMWARE_VERSION_MAJOR: 1
9-
FIRMWARE_VERSION_MINOR: 2
9+
FIRMWARE_VERSION_MINOR: 3
1010
CORE_VERSION: 3.0.7
1111

1212
jobs:

Firmware/GNSSDO_Firmware/GNSS.ino

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ bool gnssHardReset()
147147
}
148148

149149
// Initialize GNSS
150-
// Disable PPS. Set clock sync threshold. Set output messages. Copy config file.
150+
// Disable PPS. Set clock sync threshold. Set output messages. Enable Ethernet. Copy config file.
151151
// This only needs to be done once.
152152
bool initializeGNSS()
153153
{
@@ -161,7 +161,9 @@ bool initializeGNSS()
161161

162162
int retries = 3; // GNSS is already begun. We shouldn't need to retry.
163163

164-
while (!sendWithResponse("eccf, RxDefault, Current\n\r", "CopyConfigFile") && (retries > 0)) // Restore defaults
164+
// Restore default configuration
165+
// Note: the IP settings set by the setIPSettings and setIPPortSettings commands keep their value
166+
while (!sendWithResponse("eccf, RxDefault, Current\n\r", "CopyConfigFile") && (retries > 0))
165167
{
166168
systemPrintln("No response from mosaic. Retrying - with escape sequence...");
167169
sendWithResponse("SSSSSSSSSSSSSSSSSSSS\n\r", "COM4>"); // Send escape sequence
@@ -211,6 +213,13 @@ bool initializeGNSS()
211213
return false;
212214
}
213215

216+
if (!sendWithResponse("seth, on\n\r", "EthernetMode"))
217+
{
218+
systemPrintln("GNSS FAIL (EthernetMode)");
219+
return false;
220+
}
221+
222+
// Copy current configuration into boot
214223
if (!sendWithResponse("eccf, Current, Boot\n\r", "CopyConfigFile"))
215224
{
216225
systemPrintln("GNSS FAIL (CopyConfigFile)");

0 commit comments

Comments
 (0)