Skip to content

Commit

Permalink
Move NTRIP Client lower in GNSS menu to simplify logic.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nseidle
nseidle committed Apr 3, 2024
1 parent 8ade18e commit 15af4f1
Showing 1 changed file with 40 additions and 48 deletions.
88 changes: 40 additions & 48 deletions Firmware/RTK_Everywhere/menuGNSS.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,49 +85,41 @@ void menuGNSS()

systemPrintln("4) Set Constellations");

systemPrint("5) Toggle NTRIP Client: ");
systemPrintf("5) Minimum elevation for a GNSS satellite to be used in fix (degrees): %d\r\n", settings.minElev);

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

systemPrint("7) Toggle NTRIP Client: ");
if (settings.enableNtripClient == true)
systemPrintln("Enabled");
else
systemPrintln("Disabled");

if (settings.enableNtripClient == true)
{
systemPrint("6) Set Caster Address: ");
systemPrint("8) Set Caster Address: ");
systemPrintln(settings.ntripClient_CasterHost);

systemPrint("7) Set Caster Port: ");
systemPrint("9) Set Caster Port: ");
systemPrintln(settings.ntripClient_CasterPort);

systemPrint("8) Set Caster User Name: ");
systemPrint("10) Set Caster User Name: ");
systemPrintln(settings.ntripClient_CasterUser);

systemPrint("9) Set Caster User Password: ");
systemPrint("11) Set Caster User Password: ");
systemPrintln(settings.ntripClient_CasterUserPW);

systemPrint("10) Set Mountpoint: ");
systemPrint("12) Set Mountpoint: ");
systemPrintln(settings.ntripClient_MountPoint);

systemPrint("11) Set Mountpoint PW: ");
systemPrint("13) Set Mountpoint PW: ");
systemPrintln(settings.ntripClient_MountPointPW);

systemPrint("12) Toggle sending GGA Location to Caster: ");
systemPrint("14) Toggle sending GGA Location to Caster: ");
if (settings.ntripClient_TransmitGGA == true)
systemPrintln("Enabled");
else
systemPrintln("Disabled");

systemPrintf("13) Minimum elevation for a GNSS satellite to be used in fix (degrees): %d\r\n",
settings.minElev);

systemPrintf("14) Minimum satellite signal level for navigation (dBHz): %d\r\n", gnssGetMinCno());
}
else
{
systemPrintf("6) Minimum elevation for a GNSS satellite to be used in fix (degrees): %d\r\n",
settings.minElev);

systemPrintf("7) Minimum satellite signal level for navigation (dBHz): %d\r\n", gnssGetMinCno());
}

systemPrintln("x) Exit");
Expand Down Expand Up @@ -227,18 +219,39 @@ void menuGNSS()
{
gnssMenuConstellations();
}

else if (incoming == 5)
{
// Arbitrary 90 degree max
if (getNewSetting("Enter minimum elevation in degrees", 0, 90, &settings.minElev) == INPUT_RESPONSE_VALID)
{
gnssSetElevation(settings.minElev);
}
}
else if (incoming == 6)
{
int minCNO = 0;
// Arbitrary 90 dBHz max
if (getNewSetting("Enter minimum satellite signal level for navigation in dBHz", 0, 90, &minCNO) ==
INPUT_RESPONSE_VALID)
{
// We don't know which platform we are using so we cannot explicitly use the settings.minCNO_F9P, eg
gnssSetMinCno(minCNO);
}
}

else if (incoming == 7)
{
settings.enableNtripClient ^= 1;
restartRover = true;
}
else if ((incoming == 6) && settings.enableNtripClient == true)
else if ((incoming == 8) && settings.enableNtripClient == true)
{
systemPrint("Enter new Caster Address: ");
getUserInputString(settings.ntripClient_CasterHost, sizeof(settings.ntripClient_CasterHost));
restartRover = true;
}
else if ((incoming == 7) && settings.enableNtripClient == true)
else if ((incoming == 9) && settings.enableNtripClient == true)
{
// Arbitrary 99k max port #
if (getNewSetting("Enter new Caster Port", 1, 99999, &settings.ntripClient_CasterPort) ==
Expand All @@ -247,56 +260,35 @@ void menuGNSS()
restartRover = true;
}
}
else if ((incoming == 8) && settings.enableNtripClient == true)
else if ((incoming == 10) && settings.enableNtripClient == true)
{
systemPrintf("Enter user name for %s: ", settings.ntripClient_CasterHost);
getUserInputString(settings.ntripClient_CasterUser, sizeof(settings.ntripClient_CasterUser));
restartRover = true;
}
else if ((incoming == 9) && settings.enableNtripClient == true)
else if ((incoming == 11) && settings.enableNtripClient == true)
{
systemPrintf("Enter user password for %s: ", settings.ntripClient_CasterHost);
getUserInputString(settings.ntripClient_CasterUserPW, sizeof(settings.ntripClient_CasterUserPW));
restartRover = true;
}
else if ((incoming == 10) && settings.enableNtripClient == true)
else if ((incoming == 12) && settings.enableNtripClient == true)
{
systemPrint("Enter new Mount Point: ");
getUserInputString(settings.ntripClient_MountPoint, sizeof(settings.ntripClient_MountPoint));
restartRover = true;
}
else if ((incoming == 11) && settings.enableNtripClient == true)
else if ((incoming == 13) && settings.enableNtripClient == true)
{
systemPrintf("Enter password for Mount Point %s: ", settings.ntripClient_MountPoint);
getUserInputString(settings.ntripClient_MountPointPW, sizeof(settings.ntripClient_MountPointPW));
restartRover = true;
}
else if ((incoming == 12) && settings.enableNtripClient == true)
else if ((incoming == 14) && settings.enableNtripClient == true)
{
settings.ntripClient_TransmitGGA ^= 1;
restartRover = true;
}
else if (((incoming == 13) && settings.enableNtripClient == true) ||
(incoming == 6 && settings.enableNtripClient == false))
{
// Arbitrary 90 degree max
if (getNewSetting("Enter minimum elevation in degrees", 0, 90, &settings.minElev) == INPUT_RESPONSE_VALID)
{
gnssSetElevation(settings.minElev);
}
}
else if (((incoming == 14) && settings.enableNtripClient == true) ||
(incoming == 7 && settings.enableNtripClient == false))
{
int minCNO = 0;
// Arbitrary 90 dBHz max
if (getNewSetting("Enter minimum satellite signal level for navigation in dBHz", 0, 90, &minCNO) ==
INPUT_RESPONSE_VALID)
{
// We don't know which platform we are using so we cannot explicitly use the settings.minCNO_F9P, eg
gnssSetMinCno(minCNO);
}
}

else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
break;
Expand Down

0 comments on commit 15af4f1

Please sign in to comment.