Skip to content

Commit a6115f6

Browse files
committed
Reorder settings to avoid stack explosion
1 parent d9700d6 commit a6115f6

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

Firmware/RTK_Surveyor/settings.h

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,27 @@ struct struct_settings {
187187
float surveyInStartingAccuracy = 1.0; //Wait for 1m horizontal positional accuracy before starting survey in
188188
uint16_t measurementRate = 250; //Elapsed ms between GNSS measurements. 25ms to 65535ms. Default 4Hz.
189189
uint16_t navigationRate = 1; //Ratio between number of measurements and navigation solutions. Default 1 for 4Hz (with measurementRate).
190+
bool enableI2Cdebug = false; //Turn on to display GNSS library debug messages
191+
bool enableHeapReport = false; //Turn on to display free heap
192+
bool enableTaskReports = false; //Turn on to display task high water marks
193+
muxConnectionType_e dataPortChannel = MUX_UBLOX_NMEA; //Mux default to ublox UART1
194+
uint16_t spiFrequency = 16; //By default, use 16MHz SPI
195+
bool enableLogging = true; //If an SD card is present, log default sentences
196+
uint16_t sppRxQueueSize = 2048;
197+
uint16_t sppTxQueueSize = 512;
198+
uint8_t dynamicModel = DYN_MODEL_PORTABLE;
199+
SystemState lastState = STATE_ROVER_NOT_STARTED; //For Express, start unit in last known state
200+
bool throttleDuringSPPCongestion = true;
201+
bool enableSensorFusion = false; //If IMU is available, avoid using it unless user specifically selects automotive
202+
bool autoIMUmountAlignment = true; //Allows unit to automatically establish device orientation in vehicle
203+
bool enableResetDisplay = false;
204+
uint8_t resetCount = 0;
205+
bool enableExternalPulse = false; //Send pulse once lock is achieved
206+
uint32_t externalPulseTimeBetweenPulse_us = 500000; //us between pulses, max of 65s
207+
uint32_t externalPulseLength_us = 100000; //us length of pulse
208+
pulseEdgeType_e externalPulsePolarity = PULSE_RISING_EDGE; //Pulse rises for pulse length, then falls
209+
bool enableExternalHardwareEventLogging = false; //Log when INT/TM2 pin goes low
210+
190211
ubxMsg ubxMessages[MAX_UBX_MSG] = //Report rates for all known messages
191212
{
192213
//NMEA
@@ -286,17 +307,6 @@ struct struct_settings {
286307
{UBLOX_CFG_MSGOUT_UBX_ESF_INS_UART1, UBX_ESF_INS, UBX_CLASS_ESF, 0, "UBX_ESF_INS", (PLATFORM_F9R)},
287308
};
288309

289-
bool enableI2Cdebug = false; //Turn on to display GNSS library debug messages
290-
bool enableHeapReport = false; //Turn on to display free heap
291-
bool enableTaskReports = false; //Turn on to display task high water marks
292-
muxConnectionType_e dataPortChannel = MUX_UBLOX_NMEA; //Mux default to ublox UART1
293-
uint16_t spiFrequency = 16; //By default, use 16MHz SPI
294-
bool enableLogging = true; //If an SD card is present, log default sentences
295-
uint16_t sppRxQueueSize = 2048;
296-
uint16_t sppTxQueueSize = 512;
297-
uint8_t dynamicModel = DYN_MODEL_PORTABLE;
298-
SystemState lastState = STATE_ROVER_NOT_STARTED; //For Express, start unit in last known state
299-
bool throttleDuringSPPCongestion = true;
300310
//Constellations monitored/used for fix
301311
ubxConstellation ubxConstellations[MAX_CONSTELLATIONS] =
302312
{
@@ -309,15 +319,6 @@ struct struct_settings {
309319
{UBLOX_CFG_SIGNAL_GLO_ENA, SFE_UBLOX_GNSS_ID_GLONASS, true, "GLONASS"},
310320
};
311321

312-
bool enableSensorFusion = false; //If IMU is available, avoid using it unless user specifically selects automotive
313-
bool autoIMUmountAlignment = true; //Allows unit to automatically establish device orientation in vehicle
314-
bool enableResetDisplay = false;
315-
uint8_t resetCount = 0;
316-
bool enableExternalPulse = false; //Send pulse once lock is achieved
317-
uint32_t externalPulseTimeBetweenPulse_us = 500000; //us between pulses, max of 65s
318-
uint32_t externalPulseLength_us = 100000; //us length of pulse
319-
pulseEdgeType_e externalPulsePolarity = PULSE_RISING_EDGE; //Pulse rises for pulse length, then falls
320-
bool enableExternalHardwareEventLogging = false; //Log when INT/TM2 pin goes low
321322
} settings;
322323

323324
//Monitor which devices on the device are on or offline.

0 commit comments

Comments
 (0)