Skip to content

Commit 3bfbd0c

Browse files
committed
Add support for enableUART2UBXIn
1 parent 090dd26 commit 3bfbd0c

File tree

7 files changed

+1687
-1637
lines changed

7 files changed

+1687
-1637
lines changed

Firmware/RTK_Surveyor/AP-Config/index.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1204,6 +1204,16 @@
12041204
</span>
12051205
</div>
12061206
</div>
1207+
1208+
<div class="form-check mt-3">
1209+
<label class="form-check-label" for="enableUART2UBXIn">Enable UBX Input On
1210+
GNSS UART2</label>
1211+
<input class="form-check-input" type="checkbox" value="" id="enableUART2UBXIn">
1212+
<span class="tt" data-bs-placement="right"
1213+
title="Enable UBX input on GNSS UART2 - e.g. correction data from an external NEO-D9C. Default: False">
1214+
<span class="icon-info-circle text-primary ms-2"></span>
1215+
</span>
1216+
</div>
12071217
</div>
12081218
</div>
12091219

Firmware/RTK_Surveyor/Form.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@ void createSettingsString(char *newSettings)
661661
stringRecord(newSettings, "autoIMUmountAlignment", settings.autoIMUmountAlignment);
662662

663663
// System Config
664+
stringRecord(newSettings, "enableUART2UBXIn", settings.enableUART2UBXIn);
664665
stringRecord(newSettings, "enableLogging", settings.enableLogging);
665666
stringRecord(newSettings, "enableARPLogging", settings.enableARPLogging);
666667
stringRecord(newSettings, "ARPLoggingInterval", settings.ARPLoggingInterval_s);
@@ -1097,6 +1098,8 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
10971098
settings.dataPortBaud = settingValue;
10981099
else if (strcmp(settingName, "radioPortBaud") == 0)
10991100
settings.radioPortBaud = settingValue;
1101+
else if (strcmp(settingName, "enableUART2UBXIn") == 0)
1102+
settings.enableUART2UBXIn = settingValueBool;
11001103
else if (strcmp(settingName, "enableLogging") == 0)
11011104
settings.enableLogging = settingValueBool;
11021105
else if (strcmp(settingName, "enableARPLogging") == 0)

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ void recordSystemSettingsToFile(File *settingsFile)
293293
settingsFile->printf("%s=%d\r\n", "enablePrintPosition", settings.enablePrintPosition);
294294
settingsFile->printf("%s=%d\r\n", "enablePrintIdleTime", settings.enablePrintIdleTime);
295295
settingsFile->printf("%s=%d\r\n", "enableMarksFile", settings.enableMarksFile);
296+
settingsFile->printf("%s=%d\r\n", "enableUART2UBXIn", settings.enableUART2UBXIn);
296297
settingsFile->printf("%s=%d\r\n", "enablePrintBatteryMessages", settings.enablePrintBatteryMessages);
297298
settingsFile->printf("%s=%d\r\n", "enablePrintRoverAccuracy", settings.enablePrintRoverAccuracy);
298299
settingsFile->printf("%s=%d\r\n", "enablePrintBadMessages", settings.enablePrintBadMessages);
@@ -898,6 +899,8 @@ bool parseLine(char *str, Settings *settings)
898899
settings->enableMarksFile = d;
899900
else if (strcmp(settingName, "enableNTPFile") == 0)
900901
settings->enableNTPFile = d;
902+
else if (strcmp(settingName, "enableUART2UBXIn") == 0)
903+
settings->enableUART2UBXIn = d;
901904
else if (strcmp(settingName, "sppRxQueueSize") == 0)
902905
settings->sppRxQueueSize = d;
903906
else if (strcmp(settingName, "sppTxQueueSize") == 0)

Firmware/RTK_Surveyor/System.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ bool configureUbloxModule()
118118
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2OUTPROT_NMEA, 0);
119119
if (commandSupported(UBLOX_CFG_UART2OUTPROT_RTCM3X) == true)
120120
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2OUTPROT_RTCM3X, 1);
121-
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2INPROT_UBX, 0);
121+
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2INPROT_UBX, settings.enableUART2UBXIn);
122122
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2INPROT_NMEA, 0);
123123
response &= theGNSS.addCfgValset(UBLOX_CFG_UART2INPROT_RTCM3X, 1);
124124
if (commandSupported(UBLOX_CFG_UART2INPROT_SPARTN) == true)

0 commit comments

Comments
 (0)