Skip to content

Group together the network settings #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 21, 2023
Merged

Group together the network settings #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c22725
Remove future expansion network selection comments
LeeLeahy2 Jul 13, 2023
e444adb
Group together the network settings
LeeLeahy2 Jul 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions Firmware/RTK_Surveyor/Form.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,10 +651,6 @@ void createSettingsString(char *newSettings)
stringRecord(newSettings, "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
stringRecord(newSettings, "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);

// stringRecord(newSettings, "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For future
// expansion stringRecord(newSettings, "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet);
// //For future expansion

// Sensor Fusion Config
stringRecord(newSettings, "enableSensorFusion", settings.enableSensorFusion);
stringRecord(newSettings, "autoIMUmountAlignment", settings.autoIMUmountAlignment);
Expand Down Expand Up @@ -1162,12 +1158,6 @@ void updateSettingWithValue(const char *settingName, const char *settingValueStr
else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
settings.ntripClient_TransmitGGA = settingValueBool;

// For future expansion
// else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
// settings.ntripServerUseWiFiNotEthernet = settingValueBool;
// else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
// settings.ntripClientUseWiFiNotEthernet = settingValueBool;

else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
settings.serialTimeoutGNSS = settingValue;
else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
Expand Down
10 changes: 0 additions & 10 deletions Firmware/RTK_Surveyor/NVM.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,6 @@ void recordSystemSettingsToFile(File *settingsFile)
settingsFile->printf("%s=%s\r\n", "ntripServer_CasterUserPW", settings.ntripServer_CasterUserPW);
settingsFile->printf("%s=%s\r\n", "ntripServer_MountPoint", settings.ntripServer_MountPoint);
settingsFile->printf("%s=%s\r\n", "ntripServer_MountPointPW", settings.ntripServer_MountPointPW);
// settingsFile->printf("%s=%d\r\n", "ntripServerUseWiFiNotEthernet", settings.ntripServerUseWiFiNotEthernet); //For
// future expansion
settingsFile->printf("%s=%d\r\n", "enableNtripClient", settings.enableNtripClient);
settingsFile->printf("%s=%s\r\n", "ntripClient_CasterHost", settings.ntripClient_CasterHost);
settingsFile->printf("%s=%d\r\n", "ntripClient_CasterPort", settings.ntripClient_CasterPort);
Expand All @@ -260,8 +258,6 @@ void recordSystemSettingsToFile(File *settingsFile)
settingsFile->printf("%s=%s\r\n", "ntripClient_MountPoint", settings.ntripClient_MountPoint);
settingsFile->printf("%s=%s\r\n", "ntripClient_MountPointPW", settings.ntripClient_MountPointPW);
settingsFile->printf("%s=%d\r\n", "ntripClient_TransmitGGA", settings.ntripClient_TransmitGGA);
// settingsFile->printf("%s=%d\r\n", "ntripClientUseWiFiNotEthernet", settings.ntripClientUseWiFiNotEthernet); //For
// future expansion
settingsFile->printf("%s=%d\r\n", "serialTimeoutGNSS", settings.serialTimeoutGNSS);
settingsFile->printf("%s=%s\r\n", "pointPerfectDeviceProfileToken", settings.pointPerfectDeviceProfileToken);
settingsFile->printf("%s=%d\r\n", "enablePointPerfectCorrections", settings.enablePointPerfectCorrections);
Expand Down Expand Up @@ -1006,9 +1002,6 @@ bool parseLine(char *str, Settings *settings)
strcpy(settings->ntripServer_MountPoint, settingValue);
else if (strcmp(settingName, "ntripServer_MountPointPW") == 0)
strcpy(settings->ntripServer_MountPointPW, settingValue);
// For future expansion
// else if (strcmp(settingName, "ntripServerUseWiFiNotEthernet") == 0)
// settings->ntripServerUseWiFiNotEthernet = d;
else if (strcmp(settingName, "enableNtripClient") == 0)
settings->enableNtripClient = d;
else if (strcmp(settingName, "ntripClient_CasterHost") == 0)
Expand All @@ -1025,9 +1018,6 @@ bool parseLine(char *str, Settings *settings)
strcpy(settings->ntripClient_MountPointPW, settingValue);
else if (strcmp(settingName, "ntripClient_TransmitGGA") == 0)
settings->ntripClient_TransmitGGA = d;
// For future expansion
// else if (strcmp(settingName, "ntripClientUseWiFiNotEthernet") == 0)
// settings->ntripClientUseWiFiNotEthernet = d;
else if (strcmp(settingName, "serialTimeoutGNSS") == 0)
settings->serialTimeoutGNSS = d;
else if (strcmp(settingName, "pointPerfectDeviceProfileToken") == 0)
Expand Down
4 changes: 2 additions & 2 deletions Firmware/RTK_Surveyor/NtripClient.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ void ntripClientUpdate()

// Start the network
case NTRIP_CLIENT_ON: {
if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
if (HAS_ETHERNET)
{
if (online.ethernetStatus == ETH_NOT_STARTED)
{
Expand Down Expand Up @@ -425,7 +425,7 @@ void ntripClientUpdate()
if ((millis() - ntripClientTimer) > (1 * 60 * 1000))
// Failed to connect to to the network, attempt to restart the network
ntripClientStop(false);
else if (HAS_ETHERNET) // && !settings.ntripClientUseWiFiNotEthernet) //For future expansion
else if (HAS_ETHERNET)
{
if (online.ethernetStatus == ETH_CONNECTED)
ntripClientSetState(NTRIP_CLIENT_NETWORK_CONNECTED);
Expand Down
4 changes: 2 additions & 2 deletions Firmware/RTK_Surveyor/NtripServer.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ void ntripServerUpdate()

// Start the network
case NTRIP_SERVER_ON:
if (HAS_ETHERNET) // && !settings.ntripServerUseWiFiNotEthernet) //For future expansion
if (HAS_ETHERNET)
{
if (online.ethernetStatus == ETH_NOT_STARTED)
{
Expand Down Expand Up @@ -424,7 +424,7 @@ void ntripServerUpdate()
if ((millis() - ntripServerTimer) > (1 * 60 * 1000))
// Failed to connect to to the network, attempt to restart the network
ntripServerStop(false);
else if (HAS_ETHERNET) // && !settings.ntripServerUseWiFiNotEthernet) //For future expansion
else if (HAS_ETHERNET)
{
if (online.ethernetStatus == ETH_CONNECTED)
ntripServerSetState(NTRIP_SERVER_NETWORK_CONNECTED);
Expand Down
14 changes: 0 additions & 14 deletions Firmware/RTK_Surveyor/menuBase.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,6 @@ void menuBase()
systemPrint("13) Select survey-in radio: ");
systemPrintf("%s\r\n", settings.ntripServer_StartAtSurveyIn ? "WiFi" : "Bluetooth");
}

// For future expansion
// if (HAS_ETHERNET)
//{
// systemPrintf("14) Use WiFi (not Ethernet) for NTRIP Server: ", menuEntry++);
// if (settings.ntripServerUseWiFiNotEthernet == true) systemPrintln("Enabled");
// else systemPrintln("Disabled");
// }
}
else
{
Expand Down Expand Up @@ -333,12 +325,6 @@ void menuBase()
settings.ntripServer_StartAtSurveyIn ^= 1;
restartBase = true;
}
// For future expansion
// else if (incoming == 14 && settings.enableNtripServer == true && HAS_ETHERNET)
//{
// settings.ntripServerUseWiFiNotEthernet ^= 1;
// restartBase = true;
// }
else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
break;
else if (incoming == INPUT_RESPONSE_GETNUMBER_TIMEOUT)
Expand Down
4 changes: 1 addition & 3 deletions Firmware/RTK_Surveyor/menuEthernet.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ bool ethernetIsNeeded()
// Does Base mode NTRIP Server need Ethernet?
if (HAS_ETHERNET && settings.enableNtripServer == true &&
(systemState >= STATE_BASE_NOT_STARTED && systemState <= STATE_BASE_FIXED_TRANSMITTING)
//&& !settings.ntripServerUseWiFiNotEthernet //For future expansion
)
return true;

// Does Rover mode NTRIP Client need Ethernet?
if (HAS_ETHERNET && settings.enableNtripClient == true &&
(systemState >= STATE_ROVER_NOT_STARTED && systemState <= STATE_ROVER_RTK_FIX)
//&& !settings.ntripClientUseWiFiNotEthernet //For future expansion
)
return true;

Expand Down Expand Up @@ -65,7 +63,7 @@ void beginEthernet()

online.ethernetStatus = ETH_STARTED_CHECK_CABLE;
lastEthernetCheck = millis(); // Wait a full second before checking the cable

break;

case (ETH_STARTED_CHECK_CABLE):
Expand Down
14 changes: 0 additions & 14 deletions Firmware/RTK_Surveyor/menuGNSS.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,6 @@ void menuGNSS()
settings.minElev);

systemPrintf("14) Minimum satellite signal level for navigation (dBHz): %d\r\n", minCNO);

// For future expansion
// if (HAS_ETHERNET)
//{
// systemPrintf("15) Use WiFi (not Ethernet) for NTRIP Client: ", menuEntry++);
// if (settings.ntripClientUseWiFiNotEthernet == true) systemPrintln("Enabled");
// else systemPrintln("Disabled");
// }
}
else
{
Expand Down Expand Up @@ -307,12 +299,6 @@ void menuGNSS()
restartRover = true;
}
}
// For future expansion
// else if (incoming == 15 && settings.enableNtripClient == true && HAS_ETHERNET)
//{
// settings.ntripClientUseWiFiNotEthernet ^= 1;
// restartRover = true;
// }
else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
break;
else if (incoming == INPUT_RESPONSE_GETNUMBER_TIMEOUT)
Expand Down
Loading