Skip to content

Commit 0287433

Browse files
LeeLeahy2LeeLeahy2
committed
Increase NTRIP_SERVER_MAX from 1 to 2
1 parent 033cf37 commit 0287433

File tree

6 files changed

+1707
-1596
lines changed

6 files changed

+1707
-1596
lines changed

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

Lines changed: 68 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@
816816
<div class="form-group row">
817817
<label for="ntripServer_CasterHost_0"
818818
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
819-
Host:</label>
819+
Host 0:</label>
820820
<div class="col-sm-8 col-6">
821821
<input type="text" class="form-control" id="ntripServer_CasterHost_0">
822822
<p id="ntripServer_CasterHostError" class="inlineError"></p>
@@ -826,7 +826,7 @@
826826
<div class="form-group row">
827827
<label for="ntripServerCasterPort_0"
828828
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
829-
Port:</label>
829+
Port 0:</label>
830830
<div class="col-sm-8 col-6">
831831
<input type="number" class="form-control" id="ntripServerCasterPort_0">
832832
<p id="ntripServer_CasterPortError" class="inlineError"></p>
@@ -836,7 +836,7 @@
836836
<div class="form-group row">
837837
<label for="ntripServerCasterUser_0"
838838
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
839-
User:</label>
839+
User 0:</label>
840840
<div class="col-sm-8 col-6">
841841
<input type="text" class="form-control" id="ntripServerCasterUser_0">
842842
<p id="ntripServer_CasterUserError" class="inlineError"></p>
@@ -846,7 +846,7 @@
846846
<div class="form-group row">
847847
<label for="ntripServerCasterUserPW_0"
848848
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
849-
User PW:</label>
849+
User PW 0:</label>
850850
<div class="col-sm-8 col-6">
851851
<input type="text" class="form-control" id="ntripServerCasterUserPW_0">
852852
<p id="ntripServer_CasterUserPWError" class="inlineError"></p>
@@ -855,7 +855,7 @@
855855

856856
<div class="form-group row">
857857
<label for="ntripServerMountPoint_0" class="box-margin20 col-sm-3 col-5 col-form-label">Mount
858-
Point:</label>
858+
Point 0:</label>
859859
<div class="col-sm-8 col-6">
860860
<input type="text" class="form-control" id="ntripServerMountPoint_0">
861861
<p id="ntripServer_MountPointError" class="inlineError"></p>
@@ -866,13 +866,75 @@
866866
<label for="ntripServerMountPointPW_0"
867867
class="box-margin20 col-sm-4 col-6 col-form-label">Mount
868868
Point
869-
PW:</label>
869+
PW 0:</label>
870870
<div class="col-sm-7 col-5">
871871
<input type="text" class="form-control" id="ntripServerMountPointPW_0">
872872
<p id="ntripServer_MountPointPWError" class="inlineError"></p>
873873
</div>
874874
</div>
875875

876+
<br>
877+
878+
<div class="form-group row">
879+
<label for="ntripServer_CasterHost_1"
880+
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
881+
Host 1:</label>
882+
<div class="col-sm-8 col-6">
883+
<input type="text" class="form-control" id="ntripServer_CasterHost_1">
884+
<p id="ntripServer_CasterHostError" class="inlineError"></p>
885+
</div>
886+
</div>
887+
888+
<div class="form-group row">
889+
<label for="ntripServerCasterPort_1"
890+
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
891+
Port 1:</label>
892+
<div class="col-sm-8 col-6">
893+
<input type="number" class="form-control" id="ntripServerCasterPort_1">
894+
<p id="ntripServer_CasterPortError" class="inlineError"></p>
895+
</div>
896+
</div>
897+
898+
<div class="form-group row">
899+
<label for="ntripServerCasterUser_1"
900+
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
901+
User 1:</label>
902+
<div class="col-sm-8 col-6">
903+
<input type="text" class="form-control" id="ntripServerCasterUser_1">
904+
<p id="ntripServer_CasterUserError" class="inlineError"></p>
905+
</div>
906+
</div>
907+
908+
<div class="form-group row">
909+
<label for="ntripServerCasterUserPW_1"
910+
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
911+
User PW 1:</label>
912+
<div class="col-sm-8 col-6">
913+
<input type="text" class="form-control" id="ntripServerCasterUserPW_1">
914+
<p id="ntripServer_CasterUserPWError" class="inlineError"></p>
915+
</div>
916+
</div>
917+
918+
<div class="form-group row">
919+
<label for="ntripServerMountPoint_1" class="box-margin20 col-sm-3 col-5 col-form-label">Mount
920+
Point 1:</label>
921+
<div class="col-sm-8 col-6">
922+
<input type="text" class="form-control" id="ntripServerMountPoint_1">
923+
<p id="ntripServer_MountPointError" class="inlineError"></p>
924+
</div>
925+
</div>
926+
927+
<div class="form-group row">
928+
<label for="ntripServerMountPointPW_1"
929+
class="box-margin20 col-sm-4 col-6 col-form-label">Mount
930+
Point
931+
PW 1:</label>
932+
<div class="col-sm-7 col-5">
933+
<input type="text" class="form-control" id="ntripServerMountPointPW_1">
934+
<p id="ntripServer_MountPointPWError" class="inlineError"></p>
935+
</div>
936+
</div>
937+
876938
<!-- For future expansion
877939
<div id="allowWiFiOverEthernetServer">
878940
<div class="form-check mt-1 box-margin20">

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,12 @@ function validateFields() {
553553
checkElementString("ntripServerUserPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
554554
checkElementString("ntripServerMountPoint_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
555555
checkElementString("ntripServerMountPointPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
556+
checkElementString("ntripServerCasterHost_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
557+
checkElementValue("ntripServerCasterPort_1", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
558+
checkElementString("ntripServerUser_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
559+
checkElementString("ntripServerUserPW_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
560+
checkElementString("ntripServerMountPoint_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
561+
checkElementString("ntripServerMountPointPW_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
556562
}
557563
else {
558564
clearElement("ntripServerCasterHost_0", "rtk2go.com");
@@ -561,6 +567,12 @@ function validateFields() {
561567
clearElement("ntripServerCasterUserPW_0", "");
562568
clearElement("ntripServerMountPoint_0", "bldr_dwntwn2");
563569
clearElement("ntripServerMountPointPW_0", "WR5wRo4H");
570+
clearElement("ntripServerCasterHost_1", "");
571+
clearElement("ntripServerCasterPort_1", 0);
572+
clearElement("ntripServerCasterUser_1", "");
573+
clearElement("ntripServerCasterUserPW_1", "");
574+
clearElement("ntripServerMountPoint_1", "");
575+
clearElement("ntripServerMountPointPW_1", "");
564576
}
565577
}
566578

‎Firmware/RTK_Surveyor/Network.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ const char * const networkUser[] =
188188
"PVT Server",
189189
"PVT UDP Server",
190190
"NTRIP Server 0",
191+
"NTRIP Server 1",
191192
};
192193
const int networkUserEntries = sizeof(networkUser) / sizeof(networkUser[0]);
193194

‎Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
// the minor firmware version
6161
#define RTK_IDENTIFIER (FIRMWARE_VERSION_MAJOR * 0x10 + FIRMWARE_VERSION_MINOR)
6262

63-
#define NTRIP_SERVER_MAX 1
63+
#define NTRIP_SERVER_MAX 2
6464

6565
#ifdef COMPILE_ETHERNET
6666
#include <Ethernet.h> // http://librarymanager/All#Arduino_Ethernet

0 commit comments

Comments
 (0)