Skip to content

Commit 7926c91

Browse files
authored
Merge pull request #714 from sparkfun/pcUpdates
Fix type for outputTipAltitude
2 parents 02cb9a3 + a68c06f commit 7926c91

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

Firmware/RTK_Everywhere/settings.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,8 @@ struct Settings
850850
1; // Core where hardware is started and interrupts are assigned to, 0=core, 1=Arduino
851851
uint8_t btReadTaskCore = 1; // Core where task should run, 0=core, 1=Arduino
852852
uint8_t btReadTaskPriority = 1; // Read from BT SPP and Write to GNSS. 3 being the highest, and 0 being the lowest
853-
bool enableHeapReport = false; // Turn on to display free heap
853+
bool debugMalloc = false;
854+
bool enableHeapReport = false; // Turn on to display free heap
854855
bool enablePrintIdleTime = false;
855856
bool enablePsram = true; // Control the use on onboard PSRAM. Used for testing behavior when PSRAM is not available.
856857
bool enableTaskReports = false; // Turn on to display task high water marks
@@ -1091,8 +1092,6 @@ struct Settings
10911092
bool enableNtripCaster = false; //When true, respond as a faux NTRIP Caster to incoming TCP connections
10921093
bool baseCasterOverride = false; //When true, user has put device into 'BaseCast' mode. Change settings, but don't save to NVM.
10931094

1094-
bool debugMalloc = false;
1095-
10961095
// Add new settings to appropriate group above or create new group
10971096
// Then also add to the same group in rtkSettingsEntries below
10981097
} settings;
@@ -1732,7 +1731,7 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
17321731
{ 1, 1, 1, 1, 1, 1, 1, 1, 1, ALL, tWiFiNet, MAX_WIFI_NETWORKS, & settings.wifiNetworks, "wifiNetwork_", },
17331732
{ 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, _uint32_t, 0, & settings.wifiConnectTimeoutMs, "wifiConnectTimeoutMs", },
17341733

1735-
{ 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, _uint32_t, 0, & settings.outputTipAltitude, "outputTipAltitude", },
1734+
{ 0, 1, 0, 1, 1, 1, 1, 1, 1, ALL, _bool, 0, & settings.outputTipAltitude, "outputTipAltitude", },
17361735

17371736
// Localized distribution
17381737
{ 1, 1, 0, 1, 1, 0, 1, 1, 1, ALL, _bool, 0, & settings.useLocalizedDistribution, "useLocalizedDistribution", },

0 commit comments

Comments
 (0)