Skip to content

Commit 2449300

Browse files
PaulZCPaulZC
committed
Correct web config NTRIP Server validation
Add TCP / UDP Configuration button Add TCP Client Host entry Delete Ethernet TCP Client settings
1 parent 35098d1 commit 2449300

File tree

2 files changed

+143
-148
lines changed

2 files changed

+143
-148
lines changed

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

Lines changed: 57 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,10 +1348,35 @@
13481348
</div>
13491349
</div>
13501350

1351+
<div id="wifiConfigTypeDropdown" class="mt-3">
1352+
<label for="wifiConfigType">Configure Mode: </label>
1353+
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1354+
<option value="1">AP</option>
1355+
<option value="0">WiFi</option>
1356+
</select>
1357+
<span class="tt" data-bs-placement="right"
1358+
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.">
1359+
<span class="icon-info-circle text-primary ms-2"></span>
1360+
</span>
1361+
</div>
1362+
1363+
</div>
1364+
</div>
1365+
1366+
<!-- --------- TCP/UDP Config --------- -->
1367+
<div class="d-grid gap-2">
1368+
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
1369+
data-target="#collapseTCPUDPConfig" aria-expanded="false" aria-controls="collapseTCPUDPConfig">
1370+
TCP/UDP Configuration <i id="tcpUdpCaret" class="caret-icon bi icon-caret-down"></i>
1371+
</button>
1372+
</div>
1373+
<div class="collapse" id="collapseTCPUDPConfig">
1374+
<div class="card card-body">
1375+
13511376
<div class="form-check mt-3">
13521377
<label class="form-check-label" for="enablePvtClient">TCP Client</label>
13531378
<input class="form-check-input" type="checkbox" value="" id="enablePvtClient"
1354-
onClick="tcpBoxes()">
1379+
onClick="tcpClientBoxes()">
13551380
<span class="tt" data-bs-placement="right"
13561381
title="If enabled, device will connect to WiFi and push NMEA over the given TCP port.">
13571382
<span class="icon-info-circle text-primary ms-2"></span>
@@ -1361,10 +1386,38 @@
13611386
<p id="enablePvtClientError" class="inlineError"></p>
13621387
</div>
13631388

1389+
<div id="tcpClientSettingsConfig">
1390+
<div class="form-group row">
1391+
<label for="pvtClientHost" class="box-margin20 col-sm-3 col-4 col-form-label">Host for
1392+
TCP Client:
1393+
<span class="tt" data-bs-placement="right"
1394+
title="The name or address of the host which the TCP client data will be pushed to.">
1395+
<span class="icon-info-circle text-primary ms-2"></span>
1396+
</span>
1397+
</label>
1398+
<div class="col-sm-8 col-7">
1399+
<input type="text" class="form-control" id="pvtClientHost" value="test">
1400+
<p id="pvtClientHostError" class="inlineError"></p>
1401+
</div>
1402+
</div>
1403+
1404+
<div class="form-group row">
1405+
<label for="pvtClientPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1406+
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
1407+
<span class="icon-info-circle text-primary ms-2"></span>
1408+
</span>
1409+
</label>
1410+
<div class="col-sm-8 col-7">
1411+
<input type="text" class="form-control" id="pvtClientPort">
1412+
<p id="pvtClientPortError" class="inlineError"></p>
1413+
</div>
1414+
</div>
1415+
</div>
1416+
13641417
<div class="form-check mt-3">
13651418
<label class="form-check-label" for="enablePvtServer">TCP Server</label>
13661419
<input class="form-check-input" type="checkbox" value="" id="enablePvtServer"
1367-
onClick="tcpBoxes()">
1420+
onClick="tcpServerBoxes()">
13681421
<span class="tt" data-bs-placement="right"
13691422
title="If enabled, device will allow inbound TCP connections and push NMEA when a client is connected.">
13701423
<span class="icon-info-circle text-primary ms-2"></span>
@@ -1374,7 +1427,7 @@
13741427
<p id="enablePvtServerError" class="inlineError"></p>
13751428
</div>
13761429

1377-
<div id="tcpSettingsConfig">
1430+
<div id="tcpServerSettingsConfig">
13781431
<div class="form-group row">
13791432
<label for="pvtServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
13801433
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
@@ -1393,7 +1446,7 @@
13931446
<input class="form-check-input" type="checkbox" value="" id="enablePvtUdpServer"
13941447
onClick="udpBoxes()">
13951448
<span class="tt" data-bs-placement="right"
1396-
title="If enabled, device will broadcast NMEA sentences over UPD">
1449+
title="If enabled, device will broadcast NMEA sentences over UDP">
13971450
<span class="icon-info-circle text-primary ms-2"></span>
13981451
</span>
13991452
</div>
@@ -1414,19 +1467,6 @@
14141467
</div>
14151468
</div>
14161469
</div>
1417-
1418-
<div id="wifiConfigTypeDropdown" class="mt-3">
1419-
<label for="wifiConfigType">Configure Mode: </label>
1420-
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1421-
<option value="1">AP</option>
1422-
<option value="0">WiFi</option>
1423-
</select>
1424-
<span class="tt" data-bs-placement="right"
1425-
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.">
1426-
<span class="icon-info-circle text-primary ms-2"></span>
1427-
</span>
1428-
</div>
1429-
14301470
</div>
14311471
</div>
14321472

@@ -1775,17 +1815,6 @@
17751815

17761816
<br>
17771817

1778-
<div class="form-group row">
1779-
<label for="ethernetHttpPort" class="col-5 col-form-label">Ethernet HTTP Port:
1780-
<span class="tt" data-bs-placement="right" title="Ethernet HTTP Port. Default is 80">
1781-
<span class="icon-info-circle text-primary ms-2"></span>
1782-
</span>
1783-
</label>
1784-
<div class="col-sm-5">
1785-
<input type="number" class="form-control" id="ethernetHttpPort">
1786-
<p id="ethernetHttpPortError" class="inlineError"></p>
1787-
</div>
1788-
</div>
17891818
<div class="form-group row">
17901819
<label for="ethernetNtpPort" class="col-5 col-form-label">Ethernet NTP Port:
17911820
<span class="tt" data-bs-placement="right" title="Ethernet NTP Port. Default is 123">
@@ -1797,46 +1826,6 @@
17971826
<p id="ethernetNtpPortError" class="inlineError"></p>
17981827
</div>
17991828
</div>
1800-
1801-
<br>
1802-
1803-
<div class="form-check mt-3">
1804-
<label class="form-check-label" for="enableTcpClientEthernet">TCP Client</label>
1805-
<input class="form-check-input" type="checkbox" value="" id="enableTcpClientEthernet"
1806-
onClick="tcpBoxesEthernet()">
1807-
<span class="tt" data-bs-placement="right"
1808-
title="If enabled, device will connect to Ethernet and push NMEA over the given TCP port.">
1809-
<span class="icon-info-circle text-primary ms-2"></span>
1810-
</span>
1811-
</div>
1812-
1813-
<div id="tcpSettingsConfigEthernet">
1814-
<div class="form-group row">
1815-
<label for="ethernetTcpPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1816-
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
1817-
<span class="icon-info-circle text-primary ms-2"></span>
1818-
</span>
1819-
</label>
1820-
<div class="col-sm-5">
1821-
<input type="number" class="form-control" id="ethernetTcpPort">
1822-
<p id="ethernetTcpPortError" class="inlineError"></p>
1823-
</div>
1824-
</div>
1825-
1826-
<div class="form-group row">
1827-
<label for="hostForTCPClient" class="box-margin20 col-sm-3 col-4 col-form-label">Host for
1828-
TCP Client:
1829-
<span class="tt" data-bs-placement="right"
1830-
title="The name or address of the host which the TCP client data will be pushed to.">
1831-
<span class="icon-info-circle text-primary ms-2"></span>
1832-
</span>
1833-
</label>
1834-
<div class="col-sm-5">
1835-
<input type="text" class="form-control" id="hostForTCPClient" value="test">
1836-
<p id="hostForTCPClientError" class="inlineError"></p>
1837-
</div>
1838-
</div>
1839-
</div>
18401829
</div>
18411830
</div>
18421831

0 commit comments

Comments
 (0)