Skip to content

Commit e83b47f

Browse files
nseidlenseidle
committed
Rename PVT variables to TCP/UDP.
1 parent 1cb04e8 commit e83b47f

17 files changed

+1269
-1275
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,68 +1385,68 @@
13851385
</div>
13861386

13871387
<div class="form-check mt-3">
1388-
<label class="form-check-label" for="enablePvtClient">TCP Client</label>
1389-
<input class="form-check-input" type="checkbox" value="" id="enablePvtClient"
1388+
<label class="form-check-label" for="enableTcpClient">TCP Client</label>
1389+
<input class="form-check-input" type="checkbox" value="" id="enableTcpClient"
13901390
onClick="tcpBoxes()">
13911391
<span class="tt" data-bs-placement="right"
13921392
title="If enabled, device will connect to WiFi and push NMEA over the given TCP port.">
13931393
<span class="icon-info-circle text-primary ms-2"></span>
13941394
</span>
13951395
</div>
13961396
<div class="form-group row">
1397-
<p id="enablePvtClientError" class="inlineError"></p>
1397+
<p id="enableTcpClientError" class="inlineError"></p>
13981398
</div>
13991399

14001400
<div class="form-check mt-3">
1401-
<label class="form-check-label" for="enablePvtServer">TCP Server</label>
1402-
<input class="form-check-input" type="checkbox" value="" id="enablePvtServer"
1401+
<label class="form-check-label" for="enableTcpServer">TCP Server</label>
1402+
<input class="form-check-input" type="checkbox" value="" id="enableTcpServer"
14031403
onClick="tcpBoxes()">
14041404
<span class="tt" data-bs-placement="right"
14051405
title="If enabled, device will allow inbound TCP connections and push NMEA when a client is connected.">
14061406
<span class="icon-info-circle text-primary ms-2"></span>
14071407
</span>
14081408
</div>
14091409
<div class="form-group row">
1410-
<p id="enablePvtServerError" class="inlineError"></p>
1410+
<p id="enableTcpServerError" class="inlineError"></p>
14111411
</div>
14121412

14131413
<div id="tcpSettingsConfig">
14141414
<div class="form-group row">
1415-
<label for="pvtServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1415+
<label for="tcpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
14161416
<span class="tt" data-bs-placement="right" title="TCP port to use. Default: 2947">
14171417
<span class="icon-info-circle text-primary ms-2"></span>
14181418
</span>
14191419
</label>
14201420
<div class="col-sm-8 col-7">
1421-
<input type="text" class="form-control" id="pvtServerPort">
1422-
<p id="pvtServerPortError" class="inlineError"></p>
1421+
<input type="text" class="form-control" id="tcpServerPort">
1422+
<p id="tcpServerPortError" class="inlineError"></p>
14231423
</div>
14241424
</div>
14251425
</div>
14261426

14271427
<div class="form-check mt-3">
1428-
<label class="form-check-label" for="enablePvtUdpServer">UDP Server</label>
1429-
<input class="form-check-input" type="checkbox" value="" id="enablePvtUdpServer"
1428+
<label class="form-check-label" for="enableUdpServer">UDP Server</label>
1429+
<input class="form-check-input" type="checkbox" value="" id="enableUdpServer"
14301430
onClick="udpBoxes()">
14311431
<span class="tt" data-bs-placement="right"
14321432
title="If enabled, device will broadcast NMEA sentences over UPD">
14331433
<span class="icon-info-circle text-primary ms-2"></span>
14341434
</span>
14351435
</div>
14361436
<div class="form-group row">
1437-
<p id="enablePvtUdpServerError" class="inlineError"></p>
1437+
<p id="enableUdpServerError" class="inlineError"></p>
14381438
</div>
14391439

14401440
<div id="udpSettingsConfig">
14411441
<div class="form-group row">
1442-
<label for="pvtUdpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
1442+
<label for="udpServerPort" class="box-margin20 col-sm-3 col-4 col-form-label">Port:
14431443
<span class="tt" data-bs-placement="right" title="UDP port to use. Default: 10110">
14441444
<span class="icon-info-circle text-primary ms-2"></span>
14451445
</span>
14461446
</label>
14471447
<div class="col-sm-8 col-7">
1448-
<input type="text" class="form-control" id="pvtUdpServerPort">
1449-
<p id="pvtUdpServerPortError" class="inlineError"></p>
1448+
<input type="text" class="form-control" id="udpServerPort">
1449+
<p id="udpServerPortError" class="inlineError"></p>
14501450
</div>
14511451
</div>
14521452
</div>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -688,13 +688,13 @@ function validateFields() {
688688
checkElementString("wifiNetwork_2Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
689689
checkElementString("wifiNetwork_3SSID", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
690690
checkElementString("wifiNetwork_3Password", 0, 50, "Must be 0 to 50 characters", "collapseWiFiConfig");
691-
if ((ge("enablePvtClient").checked == true) || (ge("enablePvtServer").checked == true)) {
692-
checkElementString("pvtServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
691+
if ((ge("enableTcpClient").checked == true) || (ge("enableTcpServer").checked == true)) {
692+
checkElementString("tcpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
693693
}
694-
if (ge("enablePvtUdpServer").checked == true) {
695-
checkElementString("pvtUdpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
694+
if (ge("enableUdpServer").checked == true) {
695+
checkElementString("udpServerPort", 1, 65535, "Must be 1 to 65535", "collapseWiFiConfig");
696696
}
697-
checkCheckboxMutex("enablePvtClient", "enablePvtServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
697+
checkCheckboxMutex("enableTcpClient", "enableTcpServer", "TCP Client and Server can not be enabled at the same time", "collapseWiFiConfig");
698698

699699
//System Config
700700
if (ge("enableLogging").checked == true) {
@@ -1790,22 +1790,22 @@ function abortHandler(event) {
17901790
}
17911791

17921792
function tcpBoxes() {
1793-
if ((ge("enablePvtServer").checked == true) || (ge("enablePvtClient").checked == true)) {
1793+
if ((ge("enableTcpServer").checked == true) || (ge("enableTcpClient").checked == true)) {
17941794
show("tcpSettingsConfig");
17951795
}
17961796
else {
17971797
hide("tcpSettingsConfig");
1798-
ge("pvtServerPort").value = 2947;
1798+
ge("tcpServerPort").value = 2947;
17991799
}
18001800
}
18011801

18021802
function udpBoxes() {
1803-
if (ge("enablePvtUdpServer").checked == true) {
1803+
if (ge("enableUdpServer").checked == true) {
18041804
show("udpSettingsConfig");
18051805
}
18061806
else {
18071807
hide("udpSettingsConfig");
1808-
ge("pvtUdpServerPort").value = 10110;
1808+
ge("udpServerPort").value = 10110;
18091809
}
18101810
}
18111811

‎Firmware/RTK_Everywhere/Developer.ino

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
/*
2-
pvtServer.ino
3-
42
The code in this module is only compiled when features are disabled in developer
53
mode (ENABLE_DEVELOPER defined).
64
*/
@@ -17,9 +15,6 @@ IPAddress ethernetGetIpAddress() {return IPAddress((uint32_t)0);}
1715
void ethernetUpdate() {}
1816
void ethernetVerifyTables() {}
1917

20-
void ethernetPvtClientSendData(uint8_t *data, uint16_t length) {}
21-
void ethernetPvtClientUpdate() {}
22-
2318
void ethernetWebServerStartESP32W5500() {}
2419
void ethernetWebServerStopESP32W5500() {}
2520

@@ -41,7 +36,7 @@ void ntpServerStop() {}
4136
// Network layer
4237
//----------------------------------------
4338

44-
void menuNetwork() {systemPrint("**Network not compiled**");}
39+
void menuTcpUdp() {systemPrint("**Network not compiled**");}
4540
void networkUpdate() {}
4641
void networkVerifyTables() {}
4742
void networkStop(uint8_t networkType) {}
@@ -72,24 +67,24 @@ bool ntripServerIsCasting(int serverIndex) {
7267
}
7368

7469
//----------------------------------------
75-
// PVT client
70+
// TCP client
7671
//----------------------------------------
7772

78-
int32_t pvtClientSendData(uint16_t dataHead) {return 0;}
79-
void pvtClientUpdate() {}
80-
void pvtClientValidateTables() {}
81-
void pvtClientZeroTail() {}
82-
void discardPvtClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
73+
int32_t tcpClientSendData(uint16_t dataHead) {return 0;}
74+
void tcpClientUpdate() {}
75+
void tcpClientValidateTables() {}
76+
void tcpClientZeroTail() {}
77+
void discardTcpClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
8378

8479
//----------------------------------------
85-
// PVT UDP server
80+
// UDP server
8681
//----------------------------------------
8782

88-
int32_t pvtUdpServerSendData(uint16_t dataHead) {return 0;}
89-
void pvtUdpServerStop() {}
90-
void pvtUdpServerUpdate() {}
91-
void pvtUdpServerZeroTail() {}
92-
void discardPvtUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
83+
int32_t udpServerSendData(uint16_t dataHead) {return 0;}
84+
void udpServerStop() {}
85+
void udpServerUpdate() {}
86+
void udpServerZeroTail() {}
87+
void discardUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
9388

9489
#endif // COMPILE_NETWORK
9590

@@ -138,15 +133,15 @@ void sendStringToWebsocket(char* stringToSend) {}
138133
#ifndef COMPILE_WIFI
139134

140135
//----------------------------------------
141-
// PVT server
136+
// TCP server
142137
//----------------------------------------
143138

144-
int32_t pvtServerSendData(uint16_t dataHead) {return 0;}
145-
void pvtServerStop() {}
146-
void pvtServerUpdate() {}
147-
void pvtServerZeroTail() {}
148-
void pvtServerValidateTables() {}
149-
void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
139+
int32_t tcpServerSendData(uint16_t dataHead) {return 0;}
140+
void tcpServerStop() {}
141+
void tcpServerUpdate() {}
142+
void tcpServerZeroTail() {}
143+
void tcpServerValidateTables() {}
144+
void discardTcpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
150145

151146
//----------------------------------------
152147
// WiFi

‎Firmware/RTK_Everywhere/Ethernet.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ bool ethernetIsNeeded()
250250
if (settings.enableNtripClient == true && inRoverMode() == true)
251251
return true;
252252

253-
// Does PVT client or server need Ethernet?
254-
if (settings.enablePvtClient || settings.enablePvtServer || settings.enablePvtUdpServer ||
253+
// Does TCP client or server need Ethernet?
254+
if (settings.enableTcpClient || settings.enableTcpServer || settings.enableUdpServer ||
255255
settings.enableAutoFirmwareUpdate)
256256
return true;
257257

0 commit comments

Comments
 (0)