Skip to content

Commit e402edc

Browse files
nseidlenseidle
authored
Merge pull request #344 from sparkfun/Changes_from_RTK_Firmware
Fix missing bracket in main.js. More updates to match RTK Firmware
2 parents fefce5d + 79e6cb8 commit e402edc

File tree

1 file changed

+80
-48
lines changed
  • Firmware/RTK_Everywhere/AP-Config/src

1 file changed

+80
-48
lines changed

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

Lines changed: 80 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -583,18 +583,18 @@ function validateFields() {
583583
checkElementString("ntripClientCasterHost", 1, 45, "Must be 1 to 45 characters", "collapseGNSSConfig");
584584
checkElementValue("ntripClientCasterPort", 1, 99999, "Must be 1 to 99999", "collapseGNSSConfig");
585585
checkElementString("ntripClientMountPoint", 1, 30, "Must be 1 to 30 characters", "collapseGNSSConfig");
586-
checkElementCasterUser("ntripClientCasterUser", "rtk2go.com", "User must use their email address", "collapseGNSSConfig");
587-
checkElementCasterUser("ntripClientCasterUser", "www.rtk2go.com", "User must use their email address", "collapseGNSSConfig");
588-
}
589-
else {
590-
clearElement("ntripClientCasterHost", "rtk2go.com");
591-
clearElement("ntripClientCasterPort", 2101);
592-
clearElement("ntripClientMountPoint", "bldr_SparkFun1");
593-
clearElement("ntripClientMountPointPW");
594-
clearElement("ntripClientCasterUser", "[email protected]");
595-
clearElement("ntripClientCasterUserPW", "");
596-
ge("ntripClientTransmitGGA").checked = true;
597-
}
586+
checkElementCasterUser("ntripClientCasterHost", "ntripClientCasterUser", "rtk2go.com", "User must use their email address", "collapseGNSSConfig");
587+
}
588+
// Don't overwrite with the defaults here. User may want to disable NTRIP but not lose the existing settings.
589+
// else {
590+
// clearElement("ntripClientCasterHost", "rtk2go.com");
591+
// clearElement("ntripClientCasterPort", 2101);
592+
// clearElement("ntripClientMountPoint", "bldr_SparkFun1");
593+
// clearElement("ntripClientMountPointPW");
594+
// clearElement("ntripClientCasterUser", "[email protected]");
595+
// clearElement("ntripClientCasterUserPW", "");
596+
// ge("ntripClientTransmitGGA").checked = true;
597+
// }
598598

599599
//Check all UBX message boxes
600600
//match all ids starting with ubxMessageRate_
@@ -676,35 +676,56 @@ function validateFields() {
676676
if (ge("enableNtripServer").checked == true) {
677677
checkElementString("ntripServerCasterHost_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
678678
checkElementValue("ntripServerCasterPort_0", 1, 99999, "Must be 1 to 99999", "collapseBaseConfigNTRIP");
679+
checkElementString("ntripServer_CasterUser_0", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
680+
checkElementString("ntripServer_CasterUserPW_0", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
679681
checkElementString("ntripServerMountPoint_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
680-
checkElementString("ntripServerMountPointPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfigNTRIP");
681-
}
682-
else {
683-
clearElement("ntripServerCasterHost_0", "rtk2go.com");
684-
clearElement("ntripServerCasterPort_0", 2101);
685-
clearElement("ntripServerCasterUser_0", "[email protected]");
686-
clearElement("ntripServerCasterUserPW_0", "");
687-
clearElement("ntripServerMountPoint_0", "bldr_dwntwn2");
688-
clearElement("ntripServerMountPointPW_0", "WR5wRo4H");
689-
clearElement("ntripServerCasterHost_1", "");
690-
clearElement("ntripServerCasterPort_1", 0);
691-
clearElement("ntripServerCasterUser_1", "");
692-
clearElement("ntripServerCasterUserPW_1", "");
693-
clearElement("ntripServerMountPoint_1", "");
694-
clearElement("ntripServerMountPointPW_1", "");
695-
clearElement("ntripServerCasterHost_2", "");
696-
clearElement("ntripServerCasterPort_2", 0);
697-
clearElement("ntripServerCasterUser_2", "");
698-
clearElement("ntripServerCasterUserPW_2", "");
699-
clearElement("ntripServerMountPoint_2", "");
700-
clearElement("ntripServerMountPointPW_2", "");
701-
clearElement("ntripServerCasterHost_3", "");
702-
clearElement("ntripServerCasterPort_3", 0);
703-
clearElement("ntripServerCasterUser_3", "");
704-
clearElement("ntripServerCasterUserPW_3", "");
705-
clearElement("ntripServerMountPoint_3", "");
706-
clearElement("ntripServerMountPointPW_3", "");
707-
}
682+
checkElementString("ntripServerMountPointPW_0", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
683+
checkElementString("ntripServerCasterHost_1", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
684+
checkElementValue("ntripServerCasterPort_1", 0, 99999, "Must be 0 to 99999", "collapseBaseConfigNTRIP");
685+
checkElementString("ntripServer_CasterUser_1", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
686+
checkElementString("ntripServer_CasterUserPW_1", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
687+
checkElementString("ntripServerMountPoint_1", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
688+
checkElementString("ntripServerMountPointPW_1", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
689+
checkElementString("ntripServerCasterHost_2", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
690+
checkElementValue("ntripServerCasterPort_2", 0, 99999, "Must be 0 to 99999", "collapseBaseConfigNTRIP");
691+
checkElementString("ntripServer_CasterUser_2", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
692+
checkElementString("ntripServer_CasterUserPW_2", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
693+
checkElementString("ntripServerMountPoint_2", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
694+
checkElementString("ntripServerMountPointPW_2", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
695+
checkElementString("ntripServerCasterHost_3", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
696+
checkElementValue("ntripServerCasterPort_3", 0, 99999, "Must be 0 to 99999", "collapseBaseConfigNTRIP");
697+
checkElementString("ntripServer_CasterUser_3", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
698+
checkElementString("ntripServer_CasterUserPW_3", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfig");
699+
checkElementString("ntripServerMountPoint_3", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
700+
checkElementString("ntripServerMountPointPW_3", 0, 49, "Must be 0 to 49 characters", "collapseBaseConfigNTRIP");
701+
}
702+
// Don't overwrite with the defaults here. User may want to disable NTRIP but not lose the existing settings.
703+
// else {
704+
// clearElement("ntripServerCasterHost_0", "rtk2go.com");
705+
// clearElement("ntripServerCasterPort_0", 2101);
706+
// clearElement("ntripServerCasterUser_0", "[email protected]");
707+
// clearElement("ntripServerCasterUserPW_0", "");
708+
// clearElement("ntripServerMountPoint_0", "bldr_dwntwn2");
709+
// clearElement("ntripServerMountPointPW_0", "WR5wRo4H");
710+
// clearElement("ntripServerCasterHost_1", "");
711+
// clearElement("ntripServerCasterPort_1", 0);
712+
// clearElement("ntripServerCasterUser_1", "");
713+
// clearElement("ntripServerCasterUserPW_1", "");
714+
// clearElement("ntripServerMountPoint_1", "");
715+
// clearElement("ntripServerMountPointPW_1", "");
716+
// clearElement("ntripServerCasterHost_2", "");
717+
// clearElement("ntripServerCasterPort_2", 0);
718+
// clearElement("ntripServerCasterUser_2", "");
719+
// clearElement("ntripServerCasterUserPW_2", "");
720+
// clearElement("ntripServerMountPoint_2", "");
721+
// clearElement("ntripServerMountPointPW_2", "");
722+
// clearElement("ntripServerCasterHost_3", "");
723+
// clearElement("ntripServerCasterPort_3", 0);
724+
// clearElement("ntripServerCasterUser_3", "");
725+
// clearElement("ntripServerCasterUserPW_3", "");
726+
// clearElement("ntripServerMountPoint_3", "");
727+
// clearElement("ntripServerMountPointPW_3", "");
728+
// }
708729

709730
//PointPerfect Config
710731
if (ge("enablePointPerfectCorrections").checked == true) {
@@ -726,18 +747,21 @@ function validateFields() {
726747
checkElementString("wifiNetwork_2Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
727748
checkElementString("wifiNetwork_3SSID", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
728749
checkElementString("wifiNetwork_3Password", 0, 49, "Must be 0 to 49 characters", "collapseWiFiConfig");
750+
751+
//TCP/UDP Config
729752
if (ge("enableTcpClient").checked == true) {
730-
checkElementString("tcpClientPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
753+
checkElementValue("tcpClientPort", 1, 65535, "Must be 1 to 65535", "collapseTCPUDPConfig");
754+
checkElementString("tcpClientHost", 1, 49, "Must be 1 to 49 characters", "collapseTCPUDPConfig");
731755
}
732756
if (ge("enableTcpServer").checked == true) {
733-
checkElementString("tcpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
757+
checkElementValue("tcpServerPort", 1, 65535, "Must be 1 to 65535", "collapseTCPUDPConfig");
734758
}
735759
if (ge("enableUdpServer").checked == true) {
736-
checkElementString("udpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
760+
checkElementValue("udpServerPort", 1, 65535, "Must be 1 to 65535", "collapseTCPUDPConfig");
737761
}
738762
//On Ethernet, TCP Client and Server can not be enabled at the same time
739763
//But, on WiFi, they can be...
740-
//checkCheckboxMutex("enableTcpClient", "enableTcpServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
764+
//checkCheckboxMutex("enableTcpClient", "enableTcpServer", "TCP Client and Server can not be enabled at the same time", "collapseTCPUDPConfig");
741765

742766
//System Config
743767
if (ge("enableLogging").checked == true) {
@@ -994,12 +1018,19 @@ function checkElementIPAddress(id, errorText, collapseID) {
9941018
clearError(id);
9951019
}
9961020

997-
function checkElementCasterUser(id, badUserName, errorText, collapseID) {
998-
if (ge("ntripClientCasterHost").value.toLowerCase() == "rtk2go.com") {
999-
checkElementString(id, 1, 49, errorText, collapseID);
1021+
function checkElementCasterUser(host, user, url, errorText, collapseID) {
1022+
if (ge(host).value.toLowerCase().includes(url)) {
1023+
value = ge(user).value;
1024+
if ((value.length < 1) || (value.length > 49)) {
1025+
ge(user + 'Error').innerHTML = 'Error: ' + errorText;
1026+
ge(collapseID).classList.add('show');
1027+
errorCount++;
1028+
}
1029+
else
1030+
clearError(user);
10001031
}
10011032
else
1002-
clearError(id);
1033+
clearError(user);
10031034
}
10041035

10051036
function checkCheckboxMutex(id1, id2, errorText, collapseID) {
@@ -1680,6 +1711,7 @@ function loadGeodetic() {
16801711
else {
16811712
console.log("stationGeodetic split error");
16821713
}
1714+
}
16831715
}
16841716

16851717
//Based on recordsGeodetic array, update and monospace HTML list

0 commit comments

Comments
 (0)