Skip to content

Commit 9f51527

Browse files
authored
Merge pull request #259 from sparkfun/Resolve_#229
Limit Main Menu while in configureViaEthernet mode - resolve issue #229
2 parents 0dbaadc + 0d0ad61 commit 9f51527

File tree

10 files changed

+2131
-1914
lines changed

10 files changed

+2131
-1914
lines changed

Firmware/RTK_Everywhere/AP-Config/index.html

Lines changed: 91 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,33 @@
320320
</div>
321321
</div>
322322

323+
<div id="tiltCompensationSettings">
324+
<div class="form-check mt-3">
325+
<label class="form-check-label" for="enableTiltCompensation">Enable Tilt Compensation</label>
326+
<input class="form-check-input" type="checkbox" value="" id="enableTiltCompensation" onClick="tiltCompensationBoxes()">
327+
<span class="tt" data-bs-placement="right"
328+
title="Use tilt compensation. Default: Enabled.">
329+
<span class="icon-info-circle text-primary ms-2"></span>
330+
</span>
331+
</div>
332+
333+
<div id="poleLengthConfig">
334+
<div class="form-group row">
335+
<label for="tiltPoleLength"
336+
class="col-sm-4 col-6 col-form-label">Pole Length (m):
337+
<span class="tt" data-bs-placement="right"
338+
title="Pole length for tilt compensation. Default: 1.8m">
339+
<span class="icon-info-circle text-primary ms-2"></span>
340+
</span>
341+
</label>
342+
<div class="col-sm-4 col-6">
343+
<input type="number" class="form-control" id="tiltPoleLength">
344+
<p id="tiltPoleLengthError" class="inlineError"></p>
345+
</div>
346+
</div>
347+
</div>
348+
</div>
349+
323350
<div class="form-check mt-3">
324351
<label class="form-check-label" for="enableNtripClient">Enable NTRIP Client</label>
325352
<input class="form-check-input" type="checkbox" value="" id="enableNtripClient">
@@ -1073,7 +1100,7 @@
10731100
<button onClick="getMessageListBase()" class="btn btn-md btn-outline-primary mt-3 toggle-btn"
10741101
type="button" data-toggle="collapse" data-target="#collapseGNSSConfigMsgBase"
10751102
aria-expanded="false" aria-controls="collapseGNSSConfigMsgBase">
1076-
RTCM Rates <i class="caret-icon bi icon-caret-down"></i>
1103+
RTCM Rates <i id="baseMsgCaret" class="caret-icon bi icon-caret-down"></i>
10771104
</button>
10781105
<span class="tt" data-bs-placement="right"
10791106
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,36 +1411,83 @@
13841411
</div>
13851412
</div>
13861413

1414+
<div id="wifiConfigTypeDropdown" class="mt-3">
1415+
<label for="wifiConfigOverAP">Configure Mode: </label>
1416+
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1417+
<option value="1">AP</option>
1418+
<option value="0">WiFi</option>
1419+
</select>
1420+
<span class="tt" data-bs-placement="right"
1421+
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.">
1422+
<span class="icon-info-circle text-primary ms-2"></span>
1423+
</span>
1424+
</div>
1425+
1426+
</div>
1427+
</div>
1428+
1429+
<!-- --------- TCP / UDP Config --------- -->
1430+
<div class="d-grid gap-2">
1431+
<button class="btn btn-primary mt-3 toggle-btn" type="button" data-toggle="collapse"
1432+
data-target="#collapseTCPUDPConfig" aria-expanded="false" aria-controls="collapseTCPUDPConfig">
1433+
TCP / UDP Configuration <i id="tcpUdpCaret" class="caret-icon bi icon-caret-down"></i>
1434+
</button>
1435+
</div>
1436+
<div class="collapse" id="collapseTCPUDPConfig">
1437+
<div class="card card-body">
1438+
13871439
<div class="form-check mt-3">
13881440
<label class="form-check-label" for="enableTcpClient">TCP Client</label>
13891441
<input class="form-check-input" type="checkbox" value="" id="enableTcpClient"
1390-
onClick="tcpBoxes()">
1442+
onClick="tcpClientBoxes()">
13911443
<span class="tt" data-bs-placement="right"
1392-
title="If enabled, device will connect to WiFi and push NMEA over the given TCP port.">
1444+
title="If enabled, device will connect to WiFi and push NMEA to the given TCP server over the given port.">
13931445
<span class="icon-info-circle text-primary ms-2"></span>
13941446
</span>
13951447
</div>
1448+
<div id="tcpClientConfig">
1449+
<div class="form-group row">
1450+
<label for="tcpClientPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1451+
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2948">
1452+
<span class="icon-info-circle text-primary ms-2"></span>
1453+
</span>
1454+
</label>
1455+
<div class="col-sm-8 col-7">
1456+
<input type="text" class="form-control" id="tcpClientPort">
1457+
<p id="tcpClientPortError" class="inlineError"></p>
1458+
</div>
1459+
</div>
1460+
<div class="form-group row">
1461+
<label for="tcpClientHost" class="box-margin20 col-sm-3 col-4 col-form-label">Host for
1462+
TCP Client:
1463+
<span class="tt" data-bs-placement="right"
1464+
title="The name or address of the host which the TCP client data will be pushed to.">
1465+
<span class="icon-info-circle text-primary ms-2"></span>
1466+
</span>
1467+
</label>
1468+
<div class="col-sm-8 col-7">
1469+
<input type="text" class="form-control" id="tcpClientHost" value="test">
1470+
<p id="tcpClientHostError" class="inlineError"></p>
1471+
</div>
1472+
</div>
1473+
</div>
13961474
<div class="form-group row">
13971475
<p id="enableTcpClientError" class="inlineError"></p>
13981476
</div>
13991477

14001478
<div class="form-check mt-3">
14011479
<label class="form-check-label" for="enableTcpServer">TCP Server</label>
14021480
<input class="form-check-input" type="checkbox" value="" id="enableTcpServer"
1403-
onClick="tcpBoxes()">
1481+
onClick="tcpServerBoxes()">
14041482
<span class="tt" data-bs-placement="right"
1405-
title="If enabled, device will allow inbound TCP connections and push NMEA when a client is connected.">
1483+
title="If enabled, device will allow inbound TCP connections and push NMEA over the given port when a client is connected.">
14061484
<span class="icon-info-circle text-primary ms-2"></span>
14071485
</span>
14081486
</div>
1409-
<div class="form-group row">
1410-
<p id="enableTcpServerError" class="inlineError"></p>
1411-
</div>
1412-
1413-
<div id="tcpSettingsConfig">
1487+
<div id="tcpServerConfig">
14141488
<div class="form-group row">
14151489
<label for="tcpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1416-
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
1490+
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2948">
14171491
<span class="icon-info-circle text-primary ms-2"></span>
14181492
</span>
14191493
</label>
@@ -1423,20 +1497,19 @@
14231497
</div>
14241498
</div>
14251499
</div>
1500+
<div class="form-group row">
1501+
<p id="enableTcpServerError" class="inlineError"></p>
1502+
</div>
14261503

14271504
<div class="form-check mt-3">
14281505
<label class="form-check-label" for="enableUdpServer">UDP Server</label>
14291506
<input class="form-check-input" type="checkbox" value="" id="enableUdpServer"
14301507
onClick="udpBoxes()">
14311508
<span class="tt" data-bs-placement="right"
1432-
title="If enabled, device will broadcast NMEA sentences over UPD">
1509+
title="If enabled, device will broadcast NMEA sentences over UDP">
14331510
<span class="icon-info-circle text-primary ms-2"></span>
14341511
</span>
14351512
</div>
1436-
<div class="form-group row">
1437-
<p id="enableUdpServerError" class="inlineError"></p>
1438-
</div>
1439-
14401513
<div id="udpSettingsConfig">
14411514
<div class="form-group row">
14421515
<label for="udpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
@@ -1450,17 +1523,8 @@
14501523
</div>
14511524
</div>
14521525
</div>
1453-
1454-
<div id="wifiConfigTypeDropdown" class="mt-3">
1455-
<label for="wifiConfigOverAP">Configure Mode: </label>
1456-
<select name="wifiConfigType" id="wifiConfigOverAP" class="form-dropdown">
1457-
<option value="1">AP</option>
1458-
<option value="0">WiFi</option>
1459-
</select>
1460-
<span class="tt" data-bs-placement="right"
1461-
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.">
1462-
<span class="icon-info-circle text-primary ms-2"></span>
1463-
</span>
1526+
<div class="form-group row">
1527+
<p id="enableUdpServerError" class="inlineError"></p>
14641528
</div>
14651529

14661530
</div>
@@ -1876,17 +1940,6 @@
18761940

18771941
<br>
18781942

1879-
<div class="form-group row">
1880-
<label for="httpPort" class="col-5 col-form-label">Ethernet HTTP Port:
1881-
<span class="tt" data-bs-placement="right" title="Ethernet HTTP Port. Default is 80">
1882-
<span class="icon-info-circle text-primary ms-2"></span>
1883-
</span>
1884-
</label>
1885-
<div class="col-sm-5">
1886-
<input type="number" class="form-control" id="httpPort">
1887-
<p id="httpPortError" class="inlineError"></p>
1888-
</div>
1889-
</div>
18901943
<div class="form-group row">
18911944
<label for="ethernetNtpPort" class="col-5 col-form-label">Ethernet NTP Port:
18921945
<span class="tt" data-bs-placement="right" title="Ethernet NTP Port. Default is 123">

0 commit comments

Comments
 (0)