From 8e5a47f65b8a818885b8512f3617f240e6366462 Mon Sep 17 00:00:00 2001 From: Alexander Klein Date: Thu, 27 Apr 2023 12:15:06 +0200 Subject: [PATCH] added fixtype and carrier solution to gps menu --- src/SpecialMenus/GPS/menuGPS.cpp | 38 +++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/src/SpecialMenus/GPS/menuGPS.cpp b/src/SpecialMenus/GPS/menuGPS.cpp index 4713b6d..338dbd2 100644 --- a/src/SpecialMenus/GPS/menuGPS.cpp +++ b/src/SpecialMenus/GPS/menuGPS.cpp @@ -78,7 +78,39 @@ void MenuGPS::printPage() const { } break; - case 4: + case 4: + lineOne = "Fix type:"; + if (fixType == 0) + lineTwo = "None"; + else if (fixType == 1) + lineTwo = "Dead Reckoning"; + else if (fixType == 2) + lineTwo = "2D"; + else if (fixType == 3) + lineTwo = "3D"; + else if (fixType == 3) + lineTwo = "GNSS + Dead Reck"; + else if (fixType == 5) + lineTwo = "Time Only"; + else + lineTwo = "UNKNOWN"; + break; + + case 5: { + lineOne = "Carrier Solution"; + uint8_t carrSoln = gpsData->flags.bits.carrSoln; + if (carrSoln == 0) + lineTwo = "None"; + else if (carrSoln == 1) + lineTwo = "Floating"; + else if (carrSoln == 2) + lineTwo = "Fixed"; + else + lineTwo = "UNKNOWN"; + } + break; + + case 6: lineOne = "Hrizntl Accuracy"; if (fixType) { lineTwo = ""; @@ -87,7 +119,7 @@ void MenuGPS::printPage() const { lineTwo = "0"; break; - case 5: + case 7: lineOne = "magDec: "; lineTwo = "magAcc: "; if (fixType) { @@ -99,7 +131,7 @@ void MenuGPS::printPage() const { } break; - case 6: + case 8: lineOne = "Azimuth: "; lineTwo = ""; lineTwo.concat(this->navigation->getAzimuth());