Skip to content

Commit f4d6d32

Browse files
committed
Move detectedGnssReceiver to start of settings
1 parent c842c60 commit f4d6d32

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

Firmware/RTK_Everywhere/settings.h

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -653,6 +653,12 @@ struct Settings
653653
int sizeOfSettings = 0; // sizeOfSettings **must** be the first entry and must be int
654654
int rtkIdentifier = RTK_IDENTIFIER; // rtkIdentifier **must** be the second entry
655655

656+
//Once we detect the platform or receiver, no need to re-detect
657+
//ProductVariant previouslyDetectedPlatform = RTK_UNKNOWN; //Because LFS is started after deviceID, this is mute
658+
gnssReceiverType_e detectedGnssReceiver = GNSS_RECEIVER_UNKNOWN;
659+
bool detectedTilt = false;
660+
bool testedTilt = false;
661+
656662
// Antenna
657663
int16_t antennaHeight_mm = 1800; // Aka Pole length
658664
float antennaPhaseCenter_mm = 0.0; // Aka ARP
@@ -1082,12 +1088,6 @@ struct Settings
10821088

10831089
bool debugMalloc = false;
10841090

1085-
//Once we detect the platform or receiver, no need to re-detect
1086-
//ProductVariant previouslyDetectedPlatform = RTK_UNKNOWN; //Because LFS is started after deviceID, this is mute
1087-
gnssReceiverType_e detectedGnssReceiver = GNSS_RECEIVER_UNKNOWN;
1088-
bool detectedTilt = false;
1089-
bool testedTilt = false;
1090-
10911091
// Add new settings to appropriate group above or create new group
10921092
// Then also add to the same group in rtkSettingsEntries below
10931093
} settings;
@@ -1227,6 +1227,11 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
12271227
// i d i v V i c n r e
12281228
// g s x k 2 c h d d x Type Qual Variable Name
12291229

1230+
// Detected GNSS Receiver (for Flex). Save / load first so Flex settting availability can be correctly validated
1231+
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, tGnssReceiver, 0, & settings.detectedGnssReceiver, "detectedGnssReceiver", },
1232+
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, _bool, 0, & settings.detectedTilt, "detectedTilt", },
1233+
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, _bool, 0, & settings.testedTilt, "testedTilt", },
1234+
12301235
// Antenna
12311236
{ 1, 1, 0, 1, 1, 1, 1, 1, 1, FFA, _int16_t, 0, & settings.antennaHeight_mm, "antennaHeight_mm", },
12321237
{ 1, 1, 0, 1, 1, 1, 1, 1, 1, FFA, _float, 2, & settings.antennaPhaseCenter_mm, "antennaPhaseCenter_mm" },
@@ -1719,10 +1724,6 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
17191724
{ 0, 1, 0, 1, 1, 1, 1, 1, 1, FFA, _bool, 0, & settings.baseCasterOverride, "baseCasterOverride", },
17201725

17211726

1722-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, tGnssReceiver, 0, & settings.detectedGnssReceiver, "detectedGnssReceiver", },
1723-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, _bool, 0, & settings.detectedTilt, "detectedTilt", },
1724-
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, FFA, _bool, 0, & settings.testedTilt, "testedTilt", },
1725-
17261727
// Add new settings to appropriate group above or create new group
17271728
// Then also add to the same group in settings above
17281729
// F

0 commit comments

Comments
 (0)