Skip to content

Commit b9d4ffb

Browse files
PaulZCPaulZC
committed
Add TCP UDP collapse to web config. Better message rate checking
1 parent 7251e91 commit b9d4ffb

File tree

3 files changed

+1825
-1752
lines changed

3 files changed

+1825
-1752
lines changed

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

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@
10731073
<button onClick="getMessageListBase()" class="btn btn-md btn-outline-primary mt-3 toggle-btn"
10741074
type="button" data-toggle="collapse" data-target="#collapseGNSSConfigMsgBase"
10751075
aria-expanded="false" aria-controls="collapseGNSSConfigMsgBase">
1076-
RTCM Rates <i class="caret-icon bi icon-caret-down"></i>
1076+
RTCM Rates <i id="baseMsgCaret" class="caret-icon bi icon-caret-down"></i>
10771077
</button>
10781078
<span class="tt" data-bs-placement="right"
10791079
title="RTCM is transmitted by the base at a default of 1Hz for messages 1005, 1074, 1084, 1094, 1124, and 0.1Hz for 1230. This can be lowered for radios with low bandwidth or tailored to transmit any/all RTCM messages. Limits: 0 to 20. Note: The measurement rate is overridden to 1Hz when in Base mode.">
@@ -1384,6 +1384,31 @@
13841384
</div>
13851385
</div>
13861386

1387+
<div id="wifiConfigTypeDropdown" class="mt-3">
1388+
<label for="wifiConfigOverAP">Configure Mode: </label>
1389+
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1390+
<option value="1">AP</option>
1391+
<option value="0">WiFi</option>
1392+
</select>
1393+
<span class="tt" data-bs-placement="right"
1394+
title="In AP mode, the device will broadcast as an access point called RTK-Config. In WiFi mode, the device will connect to local WiFi and be configurable on the displayed IP address.">
1395+
<span class="icon-info-circle text-primary ms-2"></span>
1396+
</span>
1397+
</div>
1398+
1399+
</div>
1400+
</div>
1401+
1402+
<!-- --------- TCP / UDP Config --------- -->
1403+
<div class="d-grid gap-2">
1404+
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
1405+
data-target="#collapseTCPUDPConfig" aria-expanded="false" aria-controls="collapseTCPUDPConfig">
1406+
TCP / UDP Configuration <i id="tcpUdpCaret" class="caret-icon bi icon-caret-down"></i>
1407+
</button>
1408+
</div>
1409+
<div class="collapse" id="collapseTCPUDPConfig">
1410+
<div class="card card-body">
1411+
13871412
<div class="form-check mt-3">
13881413
<label class="form-check-label" for="enableTcpClient">TCP Client</label>
13891414
<input class="form-check-input" type="checkbox" value="" id="enableTcpClient"
@@ -1475,19 +1500,6 @@
14751500
<p id="enableUdpServerError" class="inlineError"></p>
14761501
</div>
14771502

1478-
1479-
<div id="wifiConfigTypeDropdown" class="mt-3">
1480-
<label for="wifiConfigOverAP">Configure Mode: </label>
1481-
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1482-
<option value="1">AP</option>
1483-
<option value="0">WiFi</option>
1484-
</select>
1485-
<span class="tt" data-bs-placement="right"
1486-
title="In AP mode, the device will broadcast as an access point called RTK-Config. In WiFi mode, the device will connect to local WiFi and be configurable on the displayed IP address.">
1487-
<span class="icon-info-circle text-primary ms-2"></span>
1488-
</span>
1489-
</div>
1490-
14911503
</div>
14921504
</div>
14931505

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

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,18 @@ function checkMessageValue(id) {
536536
checkElementValue(id, 0, 255, "Must be between 0 and 255", "collapseGNSSConfigMsg");
537537
}
538538

539+
function checkMessageValueBase(id) {
540+
checkElementValue(id, 0, 255, "Must be between 0 and 255", "collapseGNSSConfigMsgBase");
541+
}
542+
543+
function checkMessageValueUM980(id) {
544+
checkElementValue(id, 0, 65, "Must be between 0 and 65", "collapseGNSSConfigMsg");
545+
}
546+
547+
function checkMessageValueUM980Base(id) {
548+
checkElementValue(id, 0, 65, "Must be between 0 and 65", "collapseGNSSConfigMsgBase");
549+
}
550+
539551
function collapseSection(section, caret) {
540552
ge(section).classList.remove('show');
541553
ge(caret).classList.remove('icon-caret-down');
@@ -549,13 +561,17 @@ function validateFields() {
549561
collapseSection("collapseGNSSConfig", "gnssCaret");
550562
collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
551563
collapseSection("collapseBaseConfig", "baseCaret");
564+
collapseSection("collapseGNSSConfigMsgBase", "baseMsgCaret");
552565
collapseSection("collapsePPConfig", "pointPerfectCaret");
553566
collapseSection("collapsePortsConfig", "portsCaret");
567+
collapseSection("collapseWiFiConfig", "wifiCaret");
568+
collapseSection("collapseTCPUDPConfig", "tcpUdpCaret");
554569
collapseSection("collapseRadioConfig", "radioCaret");
570+
collapseSection("collapseCorrectionsPriorityConfig", "correctionsCaret");
555571
collapseSection("collapseSystemConfig", "systemCaret");
556572
collapseSection("collapseEthernetConfig", "ethernetCaret");
557573
collapseSection("collapseNTPConfig", "ntpCaret");
558-
collapseSection("collapseCorrectionsPriorityConfig", "correctionsCaret");
574+
collapseSection("collapseFileManager", "fileManagerCaret");
559575

560576
errorCount = 0;
561577

@@ -587,12 +603,35 @@ function validateFields() {
587603
}
588604

589605
//Check all UBX message boxes
590-
//match all ids starting with ubxMessageRate (ubxMessageRate_ & ubxMessageRateBase_)
591-
var ubxMessages = document.querySelectorAll('input[id^=ubxMessageRate]');
606+
//match all ids starting with ubxMessageRate_
607+
var ubxMessages = document.querySelectorAll('input[id^=ubxMessageRate_]');
592608
for (let x = 0; x < ubxMessages.length; x++) {
593609
var messageName = ubxMessages[x].id;
594610
checkMessageValue(messageName);
595611
}
612+
//match all ids starting with ubxMessageRateBase_
613+
var ubxMessages = document.querySelectorAll('input[id^=ubxMessageRateBase_]');
614+
for (let x = 0; x < ubxMessages.length; x++) {
615+
var messageName = ubxMessages[x].id;
616+
checkMessageValueBase(messageName);
617+
}
618+
619+
//Check all UM980 message boxes
620+
var ubxMessages = document.querySelectorAll('input[id^=um980MessageRatesNMEA_]');
621+
for (let x = 0; x < ubxMessages.length; x++) {
622+
var messageName = ubxMessages[x].id;
623+
checkMessageValueUM980(messageName);
624+
}
625+
var ubxMessages = document.querySelectorAll('input[id^=um980MessageRatesRTCMRover_]');
626+
for (let x = 0; x < ubxMessages.length; x++) {
627+
var messageName = ubxMessages[x].id;
628+
checkMessageValueUM980(messageName);
629+
}
630+
var ubxMessages = document.querySelectorAll('input[id^=um980MessageRatesRTCMBase_]');
631+
for (let x = 0; x < ubxMessages.length; x++) {
632+
var messageName = ubxMessages[x].id;
633+
checkMessageValueUM980Base(messageName);
634+
}
596635

597636
//Base Config
598637
if (ge("baseTypeSurveyIn").checked == true) {
@@ -777,12 +816,16 @@ function changeProfile() {
777816
collapseSection("collapseGNSSConfig", "gnssCaret");
778817
collapseSection("collapseGNSSConfigMsg", "gnssMsgCaret");
779818
collapseSection("collapseBaseConfig", "baseCaret");
819+
collapseSection("collapseGNSSConfigMsgBase", "baseMsgCaret");
780820
collapseSection("collapsePPConfig", "pointPerfectCaret");
781821
collapseSection("collapsePortsConfig", "portsCaret");
822+
collapseSection("collapseWiFiConfig", "wifiCaret");
823+
collapseSection("collapseTCPUDPConfig", "tcpUdpCaret");
824+
collapseSection("collapseCorrectionsPriorityConfig", "correctionsCaret");
782825
collapseSection("collapseSystemConfig", "systemCaret");
783826
collapseSection("collapseEthernetConfig", "ethernetCaret");
784827
collapseSection("collapseNTPConfig", "ntpCaret");
785-
collapseSection("collapseCorrectionsPriorityConfig", "correctionsCaret");
828+
collapseSection("collapseFileManager", "fileManagerCaret");
786829
}
787830
}
788831

@@ -910,6 +953,9 @@ function checkElementValue(id, min, max, errorText, collapseID) {
910953
if (collapseID == "collapseGNSSConfigMsg") {
911954
ge("collapseGNSSConfig").classList.add('show');
912955
}
956+
if (collapseID == "collapseGNSSConfigMsgBase") {
957+
ge("collapseBaseConfig").classList.add('show');
958+
}
913959
errorCount++;
914960
}
915961
else

0 commit comments

Comments
 (0)