Skip to content

Commit 91dd639

Browse files
PaulZCPaulZC
committed
ntripServer settings - add missing underscores etc.
1 parent 669108c commit 91dd639

File tree

4 files changed

+1781
-1746
lines changed

4 files changed

+1781
-1746
lines changed

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -816,60 +816,60 @@
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 0:</label>
819+
Host 1:</label>
820820
<div class="col-sm-8 col-6">
821821
<input type="text" class="form-control" id="ntripServer_CasterHost_0">
822-
<p id="ntripServer_CasterHostError" class="inlineError"></p>
822+
<p id="ntripServer_CasterHost_0Error" class="inlineError"></p>
823823
</div>
824824
</div>
825825

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

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

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

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

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

@@ -878,60 +878,60 @@
878878
<div class="form-group row">
879879
<label for="ntripServer_CasterHost_1"
880880
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
881-
Host 1:</label>
881+
Host 2:</label>
882882
<div class="col-sm-8 col-6">
883883
<input type="text" class="form-control" id="ntripServer_CasterHost_1">
884-
<p id="ntripServer_CasterHostError" class="inlineError"></p>
884+
<p id="ntripServer_CasterHost_1Error" class="inlineError"></p>
885885
</div>
886886
</div>
887887

888888
<div class="form-group row">
889-
<label for="ntripServerCasterPort_1"
889+
<label for="ntripServer_CasterPort_1"
890890
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
891-
Port 1:</label>
891+
Port 2:</label>
892892
<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>
893+
<input type="number" class="form-control" id="ntripServer_CasterPort_1">
894+
<p id="ntripServer_CasterPort_1Error" class="inlineError"></p>
895895
</div>
896896
</div>
897897

898898
<div class="form-group row">
899-
<label for="ntripServerCasterUser_1"
899+
<label for="ntripServer_CasterUser_1"
900900
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
901-
User 1:</label>
901+
User 2:</label>
902902
<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>
903+
<input type="text" class="form-control" id="ntripServer_CasterUser_1">
904+
<p id="ntripServer_CasterUser_1Error" class="inlineError"></p>
905905
</div>
906906
</div>
907907

908908
<div class="form-group row">
909-
<label for="ntripServerCasterUserPW_1"
909+
<label for="ntripServer_CasterUserPW_1"
910910
class="box-margin20 col-sm-3 col-5 col-form-label">Caster
911-
User PW 1:</label>
911+
User PW 2:</label>
912912
<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>
913+
<input type="text" class="form-control" id="ntripServer_CasterUserPW_1">
914+
<p id="ntripServer_CasterUserPW_1Error" class="inlineError"></p>
915915
</div>
916916
</div>
917917

918918
<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>
919+
<label for="ntripServer_MountPoint_1" class="box-margin20 col-sm-3 col-5 col-form-label">Mount
920+
Point 2:</label>
921921
<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>
922+
<input type="text" class="form-control" id="ntripServer_MountPoint_1">
923+
<p id="ntripServer_MountPoint_1Error" class="inlineError"></p>
924924
</div>
925925
</div>
926926

927927
<div class="form-group row">
928-
<label for="ntripServerMountPointPW_1"
928+
<label for="ntripServer_MountPointPW_1"
929929
class="box-margin20 col-sm-4 col-6 col-form-label">Mount
930930
Point
931-
PW 1:</label>
931+
PW 2:</label>
932932
<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>
933+
<input type="text" class="form-control" id="ntripServer_MountPointPW_1">
934+
<p id="ntripServer_MountPointPW_1Error" class="inlineError"></p>
935935
</div>
936936
</div>
937937

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

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

549549
if (ge("enableNtripServer").checked == true) {
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");
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");
550+
checkElementString("ntripServer_CasterHost_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
551+
checkElementValue("ntripServer_CasterPort_0", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
552+
checkElementString("ntripServer_CasterUser_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
553+
checkElementString("ntripServer_CasterUserPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
554+
checkElementString("ntripServer_MountPoint_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
555+
checkElementString("ntripServer_MountPointPW_0", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
556+
checkElementString("ntripServer_CasterHost_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
557+
checkElementValue("ntripServer_CasterPort_1", 1, 99999, "Must be 1 to 99999", "collapseBaseConfig");
558+
checkElementString("ntripServer_CasterUser_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
559+
checkElementString("ntripServer_CasterUserPW_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
560+
checkElementString("ntripServer_MountPoint_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
561+
checkElementString("ntripServer_MountPointPW_1", 1, 49, "Must be 1 to 49 characters", "collapseBaseConfig");
562562
}
563563
else {
564-
clearElement("ntripServerCasterHost_0", "rtk2go.com");
565-
clearElement("ntripServerCasterPort_0", 2101);
566-
clearElement("ntripServerCasterUser_0", "test@test.com");
567-
clearElement("ntripServerCasterUserPW_0", "");
568-
clearElement("ntripServerMountPoint_0", "bldr_dwntwn2");
569-
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", "");
564+
clearElement("ntripServer_CasterHost_0", "rtk2go.com");
565+
clearElement("ntripServer_CasterPort_0", 2101);
566+
clearElement("ntripServer_CasterUser_0", "test@test.com");
567+
clearElement("ntripServer_CasterUserPW_0", "");
568+
clearElement("ntripServer_MountPoint_0", "bldr_dwntwn2");
569+
clearElement("ntripServer_MountPointPW_0", "WR5wRo4H");
570+
clearElement("ntripServer_CasterHost_1", "");
571+
clearElement("ntripServer_CasterPort_1", 0);
572+
clearElement("ntripServer_CasterUser_1", "");
573+
clearElement("ntripServer_CasterUserPW_1", "");
574+
clearElement("ntripServer_MountPoint_1", "");
575+
clearElement("ntripServer_MountPointPW_1", "");
576576
}
577577
}
578578

0 commit comments

Comments
 (0)