Skip to content

Commit 2ba5589

Browse files
committed
Move HAE number of decimals to global const
1 parent d604722 commit 2ba5589

File tree

5 files changed

+11
-9
lines changed

5 files changed

+11
-9
lines changed

Firmware/RTK_Surveyor/Form.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ void createSettingsString(char* settingsCSV)
339339
stringRecord(settingsCSV, "fixedEcefX", settings.fixedEcefX, 3);
340340
stringRecord(settingsCSV, "fixedEcefY", settings.fixedEcefY, 3);
341341
stringRecord(settingsCSV, "fixedEcefZ", settings.fixedEcefZ, 3);
342-
stringRecord(settingsCSV, "fixedLat", settings.fixedLat, 9);
343-
stringRecord(settingsCSV, "fixedLong", settings.fixedLong, 9);
342+
stringRecord(settingsCSV, "fixedLat", settings.fixedLat, haeNumberOfDecimals);
343+
stringRecord(settingsCSV, "fixedLong", settings.fixedLong, haeNumberOfDecimals);
344344
stringRecord(settingsCSV, "fixedAltitude", settings.fixedAltitude, 4);
345345

346346
stringRecord(settingsCSV, "enableNtripServer", settings.enableNtripServer);
@@ -432,8 +432,8 @@ void createSettingsString(char* settingsCSV)
432432
stringRecord(settingsCSV, "bluetoothRadioType", settings.bluetoothRadioType);
433433

434434
//Current coordinates come from HPPOSLLH call back
435-
stringRecord(settingsCSV, "geodeticLat", latitude, 8);
436-
stringRecord(settingsCSV, "geodeticLon", longitude, 8);
435+
stringRecord(settingsCSV, "geodeticLat", latitude, haeNumberOfDecimals);
436+
stringRecord(settingsCSV, "geodeticLon", longitude, haeNumberOfDecimals);
437437
stringRecord(settingsCSV, "geodeticAlt", altitude, 3);
438438

439439
double ecefX = 0;

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,8 @@ uint16_t mseconds;
234234
uint8_t numSV;
235235
uint8_t fixType;
236236
uint8_t carrSoln;
237+
238+
const byte haeNumberOfDecimals = 8; //Used for printing and transitting lat/lon
237239
//=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
238240

239241
//Battery fuel gauge and PWM LEDs

Firmware/RTK_Surveyor/States.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ void updateSystemState()
921921
if (espnowIsPaired() == true)
922922
{
923923
paintEspNowPaired();
924-
924+
925925
// Return to the previous state
926926
changeState(lastSystemState);
927927
}

Firmware/RTK_Surveyor/menuBase.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ void menuBase()
3030
else if (settings.fixedBaseCoordinateType == COORD_TYPE_GEODETIC)
3131
{
3232
Serial.print("3) Set Lat/Long/Altitude coordinates: ");
33-
Serial.print(settings.fixedLat, 9);
33+
Serial.print(settings.fixedLat, haeNumberOfDecimals);
3434
Serial.print("°, ");
35-
Serial.print(settings.fixedLong, 9);
35+
Serial.print(settings.fixedLong, haeNumberOfDecimals);
3636
Serial.print("°, ");
3737
Serial.print(settings.fixedAltitude, 4);
3838
Serial.println("m");

Firmware/RTK_Surveyor/menuSystem.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,9 @@ void printCurrentConditions()
732732
Serial.print(horizontalAccuracy, 3);
733733

734734
Serial.print(", Lat: ");
735-
Serial.print(latitude, 9);
735+
Serial.print(latitude, haeNumberOfDecimals);
736736
Serial.print(", Lon: ");
737-
Serial.print(longitude, 9);
737+
Serial.print(longitude, haeNumberOfDecimals);
738738

739739
Serial.print(", Altitude (m): ");
740740
Serial.print(altitude, 1);

0 commit comments

Comments
 (0)