Skip to content

Commit 9bbfcd8

Browse files
nseidlenseidle
authored
Merge pull request #531 from LeeLeahy2/future-expansion
Remove future expansion network selection comments
2 parents c5c9044 + 9c22725 commit 9bbfcd8

File tree

8 files changed

+5
-61
lines changed

8 files changed

+5
-61
lines changed

‎Firmware/RTK_Surveyor/Form.ino‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -651,10 +651,6 @@ void createSettingsString(char *newSettings)
651651
stringRecord(newSettings, "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
652652
stringRecord(newSettings, "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);
653653

654-
// stringRecord(newSettings, "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For future
655-
// expansion stringRecord(newSettings, "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet);
656-
// //For future expansion
657-
658654
// Sensor Fusion Config
659655
stringRecord(newSettings, "enableSensorFusion", settings.enableSensorFusion);
660656
stringRecord(newSettings, "autoIMUmountAlignment", settings.autoIMUmountAlignment);
@@ -1162,12 +1158,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
11621158
else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
11631159
settings.ntripClient_TransmitGGA = settingValueBool;
11641160

1165-
// For future expansion
1166-
// else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
1167-
// settings.ntripServerUseWiFiNotEthernet = settingValueBool;
1168-
// else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
1169-
// settings.ntripClientUseWiFiNotEthernet = settingValueBool;
1170-
11711161
else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
11721162
settings.serialTimeoutGNSS = settingValue;
11731163
else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)

‎Firmware/RTK_Surveyor/NVM.ino‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,6 @@ void recordSystemSettingsToFile(File *settingsFile)
250250
settingsFile->printf("%s=%s\r\n", "ntripServer_CasterUserPW", settings.ntripServer_CasterUserPW);
251251
settingsFile->printf("%s=%s\r\n", "ntripServer_MountPoint", settings.ntripServer_MountPoint);
252252
settingsFile->printf("%s=%s\r\n", "ntripServer_MountPointPW", settings.ntripServer_MountPointPW);
253-
// settingsFile->printf("%s=%d\r\n", "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For
254-
// future expansion
255253
settingsFile->printf("%s=%d\r\n", "enableNtripClient", settings.enableNtripClient);
256254
settingsFile->printf("%s=%s\r\n", "ntripClient_CasterHost", settings.ntripClient_CasterHost);
257255
settingsFile->printf("%s=%d\r\n", "ntripClient_CasterPort", settings.ntripClient_CasterPort);
@@ -260,8 +258,6 @@ void recordSystemSettingsToFile(File *settingsFile)
260258
settingsFile->printf("%s=%s\r\n", "ntripClient_MountPoint", settings.ntripClient_MountPoint);
261259
settingsFile->printf("%s=%s\r\n", "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
262260
settingsFile->printf("%s=%d\r\n", "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);
263-
// settingsFile->printf("%s=%d\r\n", "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet); //For
264-
// future expansion
265261
settingsFile->printf("%s=%d\r\n", "serialTimeoutGNSS", settings.serialTimeoutGNSS);
266262
settingsFile->printf("%s=%s\r\n", "pointPerfectDeviceProfileToken", settings.pointPerfectDeviceProfileToken);
267263
settingsFile->printf("%s=%d\r\n", "enablePointPerfectCorrections", settings.enablePointPerfectCorrections);
@@ -1006,9 +1002,6 @@ bool parseLine(char *str, Settings *settings)
10061002
strcpy(settings->ntripServer_MountPoint, settingValue);
10071003
else if (strcmp(settingName, "ntripServer_MountPointPW") == 0)
10081004
strcpy(settings->ntripServer_MountPointPW, settingValue);
1009-
// For future expansion
1010-
// else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
1011-
// settings->ntripServerUseWiFiNotEthernet = d;
10121005
else if (strcmp(settingName, "enableNtripClient") == 0)
10131006
settings->enableNtripClient = d;
10141007
else if (strcmp(settingName, "ntripClient_CasterHost") == 0)
@@ -1025,9 +1018,6 @@ bool parseLine(char *str, Settings *settings)
10251018
strcpy(settings->ntripClient_MountPointPW, settingValue);
10261019
else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
10271020
settings->ntripClient_TransmitGGA = d;
1028-
// For future expansion
1029-
// else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
1030-
// settings->ntripClientUseWiFiNotEthernet = d;
10311021
else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
10321022
settings->serialTimeoutGNSS = d;
10331023
else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)

‎Firmware/RTK_Surveyor/NtripClient.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ void ntripClientUpdate()
374374

375375
// Start the network
376376
case NTRIP_CLIENT_ON: {
377-
if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
377+
if (HAS_ETHERNET)
378378
{
379379
if (online.ethernetStatus == ETH_NOT_STARTED)
380380
{
@@ -425,7 +425,7 @@ void ntripClientUpdate()
425425
if ((millis() - ntripClientTimer) > (1 * 60 * 1000))
426426
// Failed to connect to to the network, attempt to restart the network
427427
ntripClientStop(false);
428-
else if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
428+
else if (HAS_ETHERNET)
429429
{
430430
if (online.ethernetStatus == ETH_CONNECTED)
431431
ntripClientSetState(NTRIP_CLIENT_NETWORK_CONNECTED);

‎Firmware/RTK_Surveyor/NtripServer.ino‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void ntripServerUpdate()
373373

374374
// Start the network
375375
case NTRIP_SERVER_ON:
376-
if (HAS_ETHERNET) // && !settings.ntripServerUseWiFiNotEthernet) //For future expansion
376+
if (HAS_ETHERNET)
377377
{
378378
if (online.ethernetStatus == ETH_NOT_STARTED)
379379
{
@@ -424,7 +424,7 @@ void ntripServerUpdate()
424424
if ((millis() - ntripServerTimer) > (1 * 60 * 1000))
425425
// Failed to connect to to the network, attempt to restart the network
426426
ntripServerStop(false);
427-
else if (HAS_ETHERNET) // && !settings.ntripServerUseWiFiNotEthernet) //For future expansion
427+
else if (HAS_ETHERNET)
428428
{
429429
if (online.ethernetStatus == ETH_CONNECTED)
430430
ntripServerSetState(NTRIP_SERVER_NETWORK_CONNECTED);

‎Firmware/RTK_Surveyor/menuBase.ino‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,6 @@ void menuBase()
109109
systemPrint("13) Select survey-in radio: ");
110110
systemPrintf("%s\r\n", settings.ntripServer_StartAtSurveyIn ? "WiFi" : "Bluetooth");
111111
}
112-
113-
// For future expansion
114-
// if (HAS_ETHERNET)
115-
//{
116-
// systemPrintf("14) Use WiFi (not Ethernet) for NTRIP Server: ", menuEntry++);
117-
// if (settings.ntripServerUseWiFiNotEthernet == true) systemPrintln("Enabled");
118-
// else systemPrintln("Disabled");
119-
// }
120112
}
121113
else
122114
{
@@ -333,12 +325,6 @@ void menuBase()
333325
settings.ntripServer_StartAtSurveyIn ^= 1;
334326
restartBase = true;
335327
}
336-
// For future expansion
337-
// else if (incoming == 14 && settings.enableNtripServer == true && HAS_ETHERNET)
338-
//{
339-
// settings.ntripServerUseWiFiNotEthernet ^= 1;
340-
// restartBase = true;
341-
// }
342328
else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
343329
break;
344330
else if (incoming == INPUT_RESPONSE_GETNUMBER_TIMEOUT)

‎Firmware/RTK_Surveyor/menuEthernet.ino‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,12 @@ bool ethernetIsNeeded()
1010
// Does Base mode NTRIP Server need Ethernet?
1111
if (HAS_ETHERNET && settings.enableNtripServer == true &&
1212
(systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
13-
//&& !settings.ntripServerUseWiFiNotEthernet //For future expansion
1413
)
1514
return true;
1615

1716
// Does Rover mode NTRIP Client need Ethernet?
1817
if (HAS_ETHERNET && settings.enableNtripClient == true &&
1918
(systemState >= STATE_ROVER_NOT_STARTED && systemState <= STATE_ROVER_RTK_FIX)
20-
//&& !settings.ntripClientUseWiFiNotEthernet //For future expansion
2119
)
2220
return true;
2321

@@ -65,7 +63,7 @@ void beginEthernet()
6563

6664
online.ethernetStatus = ETH_STARTED_CHECK_CABLE;
6765
lastEthernetCheck = millis(); // Wait a full second before checking the cable
68-
66+
6967
break;
7068

7169
case (ETH_STARTED_CHECK_CABLE):

‎Firmware/RTK_Surveyor/menuGNSS.ino‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ void menuGNSS()
107107
settings.minElev);
108108

109109
systemPrintf("14) Minimum satellite signal level for navigation (dBHz): %d\r\n", minCNO);
110-
111-
// For future expansion
112-
// if (HAS_ETHERNET)
113-
//{
114-
// systemPrintf("15) Use WiFi (not Ethernet) for NTRIP Client: ", menuEntry++);
115-
// if (settings.ntripClientUseWiFiNotEthernet == true) systemPrintln("Enabled");
116-
// else systemPrintln("Disabled");
117-
// }
118110
}
119111
else
120112
{
@@ -307,12 +299,6 @@ void menuGNSS()
307299
restartRover = true;
308300
}
309301
}
310-
// For future expansion
311-
// else if (incoming == 15 && settings.enableNtripClient == true && HAS_ETHERNET)
312-
//{
313-
// settings.ntripClientUseWiFiNotEthernet ^= 1;
314-
// restartRover = true;
315-
// }
316302
else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
317303
break;
318304
else if (incoming == INPUT_RESPONSE_GETNUMBER_TIMEOUT)

‎Firmware/RTK_Surveyor/settings.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,10 +796,6 @@ typedef struct
796796
char ntripServer_CasterUserPW[50] = "";
797797
char ntripServer_MountPoint[50] = "bldr_dwntwn2"; // NTRIP Server
798798
char ntripServer_MountPointPW[50] = "WR5wRo4H";
799-
// Products that have Ethernet will always use Ethernet for NTRIP Server and Client, unless
800-
// ntripServerUseWiFiNotEthernet is set to true. Setting ntripServerUseWiFiNotEthernet to true will make
801-
// Ethernet-enabled products use WiFi for NTRIP Server instead. bool ntripServerUseWiFiNotEthernet = false; //For
802-
// future expansion
803799

804800
// NTRIP Client
805801
bool enableNtripClient = false;
@@ -811,8 +807,6 @@ typedef struct
811807
char ntripClient_MountPoint[50] = "bldr_SparkFun1";
812808
char ntripClient_MountPointPW[50] = "";
813809
bool ntripClient_TransmitGGA = true;
814-
// Setting ntripClientUseWiFiNotEthernet to true will make Ethernet-enabled products use WiFi for NTRIP Client
815-
// instead. bool ntripClientUseWiFiNotEthernet = false; //For future expansion
816810

817811
int16_t serialTimeoutGNSS = 1; // In ms - used during SerialGNSS.begin. Number of ms to pass of no data before
818812
// hardware serial reports data available.

0 commit comments

Comments
 (0)