Skip to content

Commit f49cd3f

Browse files
nseidlenseidle
authored
Merge pull request #726 from sparkfun/release_candidate
Merge v3.10 changes
2 parents 68a5806 + f1d009a commit f49cd3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+6174
-2555
lines changed

‎.github/workflows/compile-rtk-firmware.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
env:
77
FILENAME_PREFIX: RTK_Surveyor_Firmware
88
FIRMWARE_VERSION_MAJOR: 3
9-
FIRMWARE_VERSION_MINOR: 9
9+
FIRMWARE_VERSION_MINOR: 10
1010
POINTPERFECT_TOKEN: ${{ secrets.POINTPERFECT_TOKEN }}
1111

1212
jobs:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,4 @@ NMEA_Client
5656
Read_Map_File
5757
RTK_Reset
5858
Split_Messages
59+
X.509_crt_bundle_bin_to_c

‎Firmware/RTKFirmware.csv‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Name, Type, SubType, Offset, Size, Flags
2+
nvs, data, nvs, 0x9000, 0x5000,
3+
otadata, data, ota, 0xe000, 0x2000,
4+
app0, app, ota_0, 0x10000, 0x640000,
5+
app1, app, ota_1, 0x650000,0x640000,
6+
spiffs, data, spiffs, 0xc90000,0x370000,

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

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1274,41 +1274,68 @@
12741274
</div>
12751275

12761276
<div class="form-check mt-3">
1277-
<label class="form-check-label" for="enableTcpClient">TCP Client</label>
1278-
<input class="form-check-input" type="checkbox" value="" id="enableTcpClient"
1277+
<label class="form-check-label" for="enablePvtClient">TCP Client</label>
1278+
<input class="form-check-input" type="checkbox" value="" id="enablePvtClient"
12791279
onClick="tcpBoxes()">
12801280
<span class="tt" data-bs-placement="right"
12811281
title="If enabled, device will connect to WiFi and push NMEA over the given TCP port.">
12821282
<span class="icon-info-circle text-primary ms-2"></span>
12831283
</span>
12841284
</div>
12851285
<div class="form-group row">
1286-
<p id="enableTcpClientError" class="inlineError"></p>
1286+
<p id="enablePvtClientError" class="inlineError"></p>
12871287
</div>
12881288

12891289
<div class="form-check mt-3">
1290-
<label class="form-check-label" for="enableTcpServer">TCP Server</label>
1291-
<input class="form-check-input" type="checkbox" value="" id="enableTcpServer"
1290+
<label class="form-check-label" for="enablePvtServer">TCP Server</label>
1291+
<input class="form-check-input" type="checkbox" value="" id="enablePvtServer"
12921292
onClick="tcpBoxes()">
12931293
<span class="tt" data-bs-placement="right"
12941294
title="If enabled, device will allow inbound TCP connections and push NMEA when a client is connected.">
12951295
<span class="icon-info-circle text-primary ms-2"></span>
12961296
</span>
12971297
</div>
12981298
<div class="form-group row">
1299-
<p id="enableTcpServerError" class="inlineError"></p>
1299+
<p id="enablePvtServerError" class="inlineError"></p>
13001300
</div>
13011301

13021302
<div id="tcpSettingsConfig">
13031303
<div class="form-group row">
1304-
<label for="wifiTcpPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1304+
<label for="pvtServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
13051305
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
13061306
<span class="icon-info-circle text-primary ms-2"></span>
13071307
</span>
13081308
</label>
13091309
<div class="col-sm-8 col-7">
1310-
<input type="text" class="form-control" id="wifiTcpPort">
1311-
<p id="wifiTcpPortError" class="inlineError"></p>
1310+
<input type="text" class="form-control" id="pvtServerPort">
1311+
<p id="pvtServerPortError" class="inlineError"></p>
1312+
</div>
1313+
</div>
1314+
</div>
1315+
1316+
<div class="form-check mt-3">
1317+
<label class="form-check-label" for="enablePvtUdpServer">UDP Server</label>
1318+
<input class="form-check-input" type="checkbox" value="" id="enablePvtUdpServer"
1319+
onClick="udpBoxes()">
1320+
<span class="tt" data-bs-placement="right"
1321+
title="If enabled, device will broadcast NMEA sentences over UPD">
1322+
<span class="icon-info-circle text-primary ms-2"></span>
1323+
</span>
1324+
</div>
1325+
<div class="form-group row">
1326+
<p id="enablePvtUdpServerError" class="inlineError"></p>
1327+
</div>
1328+
1329+
<div id="udpSettingsConfig">
1330+
<div class="form-group row">
1331+
<label for="pvtUdpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1332+
<span class="tt" data-bs-placement="right" title="UDP port to use. Default: 10110">
1333+
<span class="icon-info-circle text-primary ms-2"></span>
1334+
</span>
1335+
</label>
1336+
<div class="col-sm-8 col-7">
1337+
<input type="text" class="form-control" id="pvtUdpServerPort">
1338+
<p id="pvtUdpServerPortError" class="inlineError"></p>
13121339
</div>
13131340
</div>
13141341
</div>

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function parseIncoming(msg) {
123123

124124
ge("muxChannel2").innerHTML = "Wheel/Dir Encoder";
125125
}
126-
else if (platformPrefix == "Facet L-Band") {
126+
else if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
127127
show("baseConfig");
128128
hide("sensorConfig");
129129
show("ppConfig");
@@ -353,6 +353,7 @@ function parseIncoming(msg) {
353353
updateECEFList();
354354
updateGeodeticList();
355355
tcpBoxes();
356+
udpBoxes();
356357
tcpBoxesEthernet();
357358
dhcpEthernet();
358359
updateLatLong();
@@ -562,7 +563,7 @@ function validateFields() {
562563
}
563564

564565
//PointPerfect Config
565-
if (platformPrefix == "Facet L-Band") {
566+
if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
566567
if (ge("enablePointPerfectCorrections").checked == true) {
567568
value = ge("pointPerfectDeviceProfileToken").value;
568569
if (value.length > 0)
@@ -592,10 +593,13 @@ function validateFields() {
592593
checkElementString("wifiNetwork2Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
593594
checkElementString("wifiNetwork3SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
594595
checkElementString("wifiNetwork3Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
595-
if (ge("enableTcpClient").checked || ge("enableTcpServer").checked) {
596-
checkElementString("wifiTcpPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
596+
if (ge("enablePvtClient").checked || ge("enablePvtServer").checked) {
597+
checkElementString("pvtServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
597598
}
598-
checkCheckboxMutex("enableTcpClient", "enableTcpServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
599+
if (ge("enablePvtUdpServer").checked) {
600+
checkElementString("pvtUdpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
601+
}
602+
checkCheckboxMutex("enablePvtClient", "enablePvtServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
599603

600604
//System Config
601605
if (ge("enableLogging").checked) {
@@ -1062,7 +1066,7 @@ document.addEventListener("DOMContentLoaded", (event) => {
10621066
if (platformPrefix == "Facet") {
10631067
ge("antennaReferencePoint").value = 61.4;
10641068
}
1065-
else if (platformPrefix == "Facet L-Band") {
1069+
else if (platformPrefix == "Facet L-Band" || platformPrefix == "Facet L-Band Direct") {
10661070
ge("antennaReferencePoint").value = 69.0;
10671071
}
10681072
else {
@@ -1567,12 +1571,22 @@ function abortHandler(event) {
15671571
}
15681572

15691573
function tcpBoxes() {
1570-
if (ge("enableTcpClient").checked || ge("enableTcpServer").checked) {
1574+
if (ge("enablePvtServer").checked || ge("enablePvtClient").checked) {
15711575
show("tcpSettingsConfig");
15721576
}
15731577
else {
15741578
hide("tcpSettingsConfig");
1575-
ge("wifiTcpPort").value = 2947;
1579+
ge("pvtServerPort").value = 2947;
1580+
}
1581+
}
1582+
1583+
function udpBoxes() {
1584+
if (ge("enablePvtUdpServer").checked) {
1585+
show("udpSettingsConfig");
1586+
}
1587+
else {
1588+
hide("udpSettingsConfig");
1589+
ge("pvtUdpServerPort").value = 10110;
15761590
}
15771591
}
15781592

0 commit comments

Comments
 (0)