Skip to content

Commit 033cf37

Browse files
LeeLeahy2LeeLeahy2
committed
Add unique values for each of the NTRIP server settings
1 parent cc50096 commit 033cf37

File tree

10 files changed

+1750
-1472
lines changed

10 files changed

+1750
-1472
lines changed

‎Firmware/RTK_Surveyor/AP-Config/index.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -814,66 +814,66 @@
814814

815815
<div id="ntripServerConfig" class="collapse mb-2">
816816
<div class="form-group row">
817-
<label for="ntripServer_CasterHost"
817+
<label for="ntripServer_CasterHost_0"
818818
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
819819
Host:</label>
820820
<div class="col-sm-8 col-6">
821-
<input type="text" class="form-control" id="ntripServer_CasterHost">
821+
<input type="text" class="form-control" id="ntripServer_CasterHost_0">
822822
<p id="ntripServer_CasterHostError" class="inlineError"></p>
823823
</div>
824824
</div>
825825

826826
<div class="form-group row">
827-
<label for="ntripServer_CasterPort"
827+
<label for="ntripServerCasterPort_0"
828828
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
829829
Port:</label>
830830
<div class="col-sm-8 col-6">
831-
<input type="number" class="form-control" id="ntripServer_CasterPort">
831+
<input type="number" class="form-control" id="ntripServerCasterPort_0">
832832
<p id="ntripServer_CasterPortError" class="inlineError"></p>
833833
</div>
834834
</div>
835835

836836
<div class="form-group row">
837-
<label for="ntripServer_CasterUser"
837+
<label for="ntripServerCasterUser_0"
838838
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
839839
User:</label>
840840
<div class="col-sm-8 col-6">
841-
<input type="text" class="form-control" id="ntripServer_CasterUser">
841+
<input type="text" class="form-control" id="ntripServerCasterUser_0">
842842
<p id="ntripServer_CasterUserError" class="inlineError"></p>
843843
</div>
844844
</div>
845845

846846
<div class="form-group row">
847-
<label for="ntripServer_CasterUserPW"
847+
<label for="ntripServerCasterUserPW_0"
848848
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
849849
User PW:</label>
850850
<div class="col-sm-8 col-6">
851-
<input type="text" class="form-control" id="ntripServer_CasterUserPW">
851+
<input type="text" class="form-control" id="ntripServerCasterUserPW_0">
852852
<p id="ntripServer_CasterUserPWError" class="inlineError"></p>
853853
</div>
854854
</div>
855855

856856
<div class="form-group row">
857-
<label for="ntripServer_MountPoint" class="box-margin20 col-sm-3 col-5 col-form-label">Mount
857+
<label for="ntripServerMountPoint_0" class="box-margin20 col-sm-3 col-5 col-form-label">Mount
858858
Point:</label>
859859
<div class="col-sm-8 col-6">
860-
<input type="text" class="form-control" id="ntripServer_MountPoint">
860+
<input type="text" class="form-control" id="ntripServerMountPoint_0">
861861
<p id="ntripServer_MountPointError" class="inlineError"></p>
862862
</div>
863863
</div>
864864

865865
<div class="form-group row">
866-
<label for="ntripServer_MountPointPW"
866+
<label for="ntripServerMountPointPW_0"
867867
class="box-margin20 col-sm-4 col-6 col-form-label">Mount
868868
Point
869869
PW:</label>
870870
<div class="col-sm-7 col-5">
871-
<input type="text" class="form-control" id="ntripServer_MountPointPW">
871+
<input type="text" class="form-control" id="ntripServerMountPointPW_0">
872872
<p id="ntripServer_MountPointPWError" class="inlineError"></p>
873873
</div>
874874
</div>
875875

876-
<!-- For future expansion
876+
<!-- For future expansion
877877
<div id="allowWiFiOverEthernetServer">
878878
<div class="form-check mt-1 box-margin20">
879879
<label class="form-check-label" for="ntripUseWiFiNotEthernet">Use WiFi for NTRIP Server - not Ethernet</label>
@@ -1935,4 +1935,4 @@
19351935
</script>
19361936
</body>
19371937

1938-
</html>
1938+
</html>

‎Firmware/RTK_Surveyor/AP-Config/src/main.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -547,18 +547,20 @@ function validateFields() {
547547
}
548548

549549
if (ge("enableNtripServer").checked == true) {
550-
checkElementString("ntripServer_CasterHost", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
551-
checkElementValue("ntripServer_CasterPort", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
552-
checkElementString("ntripServer_MountPoint", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
553-
checkElementString("ntripServer_MountPointPW", 1, 30, "Must be 1 to 30 characters", "collapseBaseConfig");
550+
checkElementString("ntripServerCasterHost_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
551+
checkElementValue("ntripServerCasterPort_0", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
552+
checkElementString("ntripServerUser_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
553+
checkElementString("ntripServerUserPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
554+
checkElementString("ntripServerMountPoint_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
555+
checkElementString("ntripServerMountPointPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
554556
}
555557
else {
556-
clearElement("ntripServer_CasterHost", "rtk2go.com");
557-
clearElement("ntripServer_CasterPort", 2101);
558-
clearElement("ntripServer_CasterUser", "");
559-
clearElement("ntripServer_CasterUserPW", "");
560-
clearElement("ntripServer_MountPoint", "bldr_dwntwn2");
561-
clearElement("ntripServer_MountPointPW", "WR5wRo4H");
558+
clearElement("ntripServerCasterHost_0", "rtk2go.com");
559+
clearElement("ntripServerCasterPort_0", 2101);
560+
clearElement("ntripServerCasterUser_0", "[email protected]");
561+
clearElement("ntripServerCasterUserPW_0", "");
562+
clearElement("ntripServerMountPoint_0", "bldr_dwntwn2");
563+
clearElement("ntripServerMountPointPW_0", "WR5wRo4H");
562564
}
563565
}
564566

@@ -1980,4 +1982,4 @@ function printableInputType(coordinateInputType) {
19801982
break;
19811983
}
19821984
return ("Unknown");
1983-
}
1985+
}

‎Firmware/RTK_Surveyor/Display.ino

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1726,7 +1726,13 @@ void printTextwithKerning(const char *newText, uint8_t xPos, uint8_t yPos, uint8
17261726
void paintRTCM()
17271727
{
17281728
int yPos = 17;
1729-
if (online.ntripServer)
1729+
1730+
// Determine if the NTRIP Server is casting
1731+
bool casting = false;
1732+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1733+
casting |= online.ntripServer[serverIndex];
1734+
1735+
if (casting)
17301736
printTextCenter("Casting", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
17311737
else
17321738
printTextCenter("Xmitting", yPos, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted

‎Firmware/RTK_Surveyor/Form.ino

Lines changed: 113 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -697,12 +697,22 @@ void createSettingsString(char *newSettings)
697697
stringRecord(newSettings, "fixedAltitude", settings.fixedAltitude, 4);
698698

699699
stringRecord(newSettings, "enableNtripServer", settings.enableNtripServer);
700-
stringRecord(newSettings, "ntripServer_CasterHost", settings.ntripServer_CasterHost);
701-
stringRecord(newSettings, "ntripServer_CasterPort", settings.ntripServer_CasterPort);
702-
stringRecord(newSettings, "ntripServer_CasterUser", settings.ntripServer_CasterUser);
703-
stringRecord(newSettings, "ntripServer_CasterUserPW", settings.ntripServer_CasterUserPW);
704-
stringRecord(newSettings, "ntripServer_MountPoint", settings.ntripServer_MountPoint);
705-
stringRecord(newSettings, "ntripServer_MountPointPW", settings.ntripServer_MountPointPW);
700+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
701+
{
702+
char name[40];
703+
sprintf(name, "ntripServer%s_%d", "CasterHost", serverIndex);
704+
stringRecord(newSettings, name, settings.ntripServer_CasterHost[serverIndex][0]);
705+
sprintf(name, "ntripServer%s_%d", "CasterPort", serverIndex);
706+
stringRecord(newSettings, name, settings.ntripServer_CasterPort[serverIndex]);
707+
sprintf(name, "ntripServer%s_%d", "CasterUser", serverIndex);
708+
stringRecord(newSettings, name, settings.ntripServer_CasterUser[serverIndex][0]);
709+
sprintf(name, "ntripServer%s_%d", "CasterUserPW", serverIndex);
710+
stringRecord(newSettings, name, settings.ntripServer_CasterUserPW[serverIndex][0]);
711+
sprintf(name, "ntripServer%s_%d", "MountPoint", serverIndex);
712+
stringRecord(newSettings, name, settings.ntripServer_MountPoint[serverIndex][0]);
713+
sprintf(name, "ntripServer%s_%d", "MountPointPW", serverIndex);
714+
stringRecord(newSettings, name, settings.ntripServer_MountPointPW[serverIndex][0]);
715+
}
706716

707717
stringRecord(newSettings, "enableNtripClient", settings.enableNtripClient);
708718
stringRecord(newSettings, "ntripClient_CasterHost", settings.ntripClient_CasterHost);
@@ -1210,18 +1220,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
12101220
}
12111221
else if (strcmp(settingName, "enableNtripServer") == 0)
12121222
settings.enableNtripServer = settingValueBool;
1213-
else if (strcmp(settingName, "ntripServer_CasterHost") == 0)
1214-
strcpy(settings.ntripServer_CasterHost, settingValueStr);
1215-
else if (strcmp(settingName, "ntripServer_CasterPort") == 0)
1216-
settings.ntripServer_CasterPort = settingValue;
1217-
else if (strcmp(settingName, "ntripServer_CasterUser") == 0)
1218-
strcpy(settings.ntripServer_CasterUser, settingValueStr);
1219-
else if (strcmp(settingName, "ntripServer_CasterUserPW") == 0)
1220-
strcpy(settings.ntripServer_CasterUserPW, settingValueStr);
1221-
else if (strcmp(settingName, "ntripServer_MountPoint") == 0)
1222-
strcpy(settings.ntripServer_MountPoint, settingValueStr);
1223-
else if (strcmp(settingName, "ntripServer_MountPointPW") == 0)
1224-
strcpy(settings.ntripServer_MountPointPW, settingValueStr);
12251223

12261224
else if (strcmp(settingName, "enableNtripClient") == 0)
12271225
settings.enableNtripClient = settingValueBool;
@@ -1671,6 +1669,103 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
16711669
}
16721670
}
16731671
}
1672+
1673+
// Scan for ntripServerCasterHost
1674+
if (knownSetting == false)
1675+
{
1676+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1677+
{
1678+
char tempString[50];
1679+
snprintf(tempString, sizeof(tempString), "ntripServerCasterHost_%d", serverIndex);
1680+
if (strcmp(settingName, tempString) == 0)
1681+
{
1682+
strcpy(&settings.ntripServer_CasterHost[serverIndex][0], settingValueStr);
1683+
knownSetting = true;
1684+
break;
1685+
}
1686+
}
1687+
}
1688+
1689+
// Scan for ntripServerCasterPort
1690+
if (knownSetting == false)
1691+
{
1692+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1693+
{
1694+
char tempString[50];
1695+
snprintf(tempString, sizeof(tempString), "ntripServerCasterPort_%d", serverIndex);
1696+
if (strcmp(settingName, tempString) == 0)
1697+
{
1698+
settings.ntripServer_CasterPort[serverIndex] = settingValue;
1699+
knownSetting = true;
1700+
break;
1701+
}
1702+
}
1703+
}
1704+
1705+
// Scan for ntripServerCasterUser
1706+
if (knownSetting == false)
1707+
{
1708+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1709+
{
1710+
char tempString[50];
1711+
snprintf(tempString, sizeof(tempString), "ntripServerCasterUser_%d", serverIndex);
1712+
if (strcmp(settingName, tempString) == 0)
1713+
{
1714+
strcpy(&settings.ntripServer_CasterUser[serverIndex][0], settingValueStr);
1715+
knownSetting = true;
1716+
break;
1717+
}
1718+
}
1719+
}
1720+
1721+
// Scan for ntripServerCasterUserPW
1722+
if (knownSetting == false)
1723+
{
1724+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1725+
{
1726+
char tempString[50];
1727+
snprintf(tempString, sizeof(tempString), "ntripServerCasterUserPW_%d", serverIndex);
1728+
if (strcmp(settingName, tempString) == 0)
1729+
{
1730+
strcpy(&settings.ntripServer_CasterUserPW[serverIndex][0], settingValueStr);
1731+
knownSetting = true;
1732+
break;
1733+
}
1734+
}
1735+
}
1736+
1737+
// Scan for ntripServerMountPoint
1738+
if (knownSetting == false)
1739+
{
1740+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1741+
{
1742+
char tempString[50];
1743+
snprintf(tempString, sizeof(tempString), "ntripServerMountPoint_%d", serverIndex);
1744+
if (strcmp(settingName, tempString) == 0)
1745+
{
1746+
strcpy(&settings.ntripServer_MountPoint[serverIndex][0], settingValueStr);
1747+
knownSetting = true;
1748+
break;
1749+
}
1750+
}
1751+
}
1752+
1753+
// Scan for ntripServerMountPointPW
1754+
if (knownSetting == false)
1755+
{
1756+
for (int serverIndex = 0; serverIndex < NTRIP_SERVER_MAX; serverIndex++)
1757+
{
1758+
char tempString[50];
1759+
snprintf(tempString, sizeof(tempString), "ntripServerMountPointPW_%d", serverIndex);
1760+
if (strcmp(settingName, tempString) == 0)
1761+
{
1762+
strcpy(&settings.ntripServer_MountPointPW[serverIndex][0], settingValueStr);
1763+
knownSetting = true;
1764+
break;
1765+
}
1766+
}
1767+
}
1768+
16741769
// Last catch
16751770
if (knownSetting == false)
16761771
{

0 commit comments

Comments
 (0)