Skip to content

Commit ad172d8

Browse files
committed
Move GNSS lib debug control to gnss menu
1 parent 7edf2b0 commit ad172d8

File tree

5 files changed

+26
-9
lines changed

5 files changed

+26
-9
lines changed

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,6 @@ void setup()
288288

289289
danceLEDs(); //Turn on LEDs like a car dashboard
290290

291-
//i2cGNSS.enableDebugging(); //Enable debug messages over Serial (default)
292-
i2cGNSS.enableDebugging(Serial, true); //Enable only the critical debug messages over Serial
293291
}
294292

295293
void loop()

Firmware/RTK_Surveyor/System.ino

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ bool configureUbloxModule()
121121
}
122122

123123
//Based on current settings, update the logging options within the GNSS library
124-
if(settings.log.rawx == true)
124+
if (settings.log.rawx == true)
125125
{
126126
i2cGNSS.setAutoRXMRAWX(true, false); // Enable automatic RXM RAWX messages: without callback; without implicit update
127127
i2cGNSS.logRXMRAWX(true);
@@ -131,8 +131,8 @@ bool configureUbloxModule()
131131
i2cGNSS.setAutoRXMRAWX(false); // Disable automatic RXM RAWX messages
132132
i2cGNSS.logRXMRAWX(false);
133133
}
134-
135-
if(settings.log.sfrbx == true)
134+
135+
if (settings.log.sfrbx == true)
136136
{
137137
i2cGNSS.setAutoRXMSFRBX(true, false); // Enable automatic RXM SFRBX messages: without callback; without implicit update
138138
i2cGNSS.logRXMSFRBX(true);
@@ -152,6 +152,12 @@ bool configureUbloxModule()
152152
if (response == false)
153153
Serial.println(F("Module failed to save."));
154154

155+
//Turn on/off debug messages
156+
if (settings.enableI2Cdebug)
157+
i2cGNSS.enableDebugging(Serial, true); //Enable only the critical debug messages over Serial
158+
else
159+
i2cGNSS.disableDebugging();
160+
155161
return (response);
156162
}
157163

Firmware/RTK_Surveyor/menuGNSS.ino

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ void menuGNSS()
2020
if (getSBAS() == true) Serial.println(F("Enabled"));
2121
else Serial.println(F("Disabled"));
2222

23+
Serial.print(F("4) Toggle I2C Debugging Output: "));
24+
if (settings.enableI2Cdebug == true) Serial.println(F("Enabled"));
25+
else Serial.println(F("Disabled"));
26+
2327
Serial.println(F("x) Exit"));
2428

2529
int incoming = getNumber(30); //Timeout after x seconds
@@ -67,6 +71,15 @@ void menuGNSS()
6771
settings.enableSBAS = true;
6872
}
6973
}
74+
else if (incoming == 4)
75+
{
76+
settings.enableI2Cdebug ^= 1;
77+
78+
if(settings.enableI2Cdebug)
79+
i2cGNSS.enableDebugging(Serial, true); //Enable only the critical debug messages over Serial
80+
else
81+
i2cGNSS.disableDebugging();
82+
}
7083
else if (incoming == STATUS_PRESSED_X)
7184
break;
7285
else if (incoming == STATUS_GETNUMBER_TIMEOUT)

Firmware/RTK_Surveyor/nvm.ino

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,22 +118,21 @@ void recordSystemSettingsToFile()
118118
settingsFile.println("surveyInStartingAccuracy=" + (String)settings.surveyInStartingAccuracy);
119119
settingsFile.println("measurementRate=" + (String)settings.measurementRate);
120120
settingsFile.println("navigationRate=" + (String)settings.navigationRate);
121-
122121
settingsFile.println("broadcast.gga=" + (String)settings.broadcast.gga);
123122
settingsFile.println("broadcast.gsa=" + (String)settings.broadcast.gsa);
124123
settingsFile.println("broadcast.gsv=" + (String)settings.broadcast.gsv);
125124
settingsFile.println("broadcast.rmc=" + (String)settings.broadcast.rmc);
126125
settingsFile.println("broadcast.gst=" + (String)settings.broadcast.gst);
127126
settingsFile.println("broadcast.rawx=" + (String)settings.broadcast.rawx);
128127
settingsFile.println("broadcast.sfrbx=" + (String)settings.broadcast.sfrbx);
129-
130128
settingsFile.println("log.gga=" + (String)settings.log.gga);
131129
settingsFile.println("log.gsa=" + (String)settings.log.gsa);
132130
settingsFile.println("log.gsv=" + (String)settings.log.gsv);
133131
settingsFile.println("log.rmc=" + (String)settings.log.rmc);
134132
settingsFile.println("log.gst=" + (String)settings.log.gst);
135133
settingsFile.println("log.rawx=" + (String)settings.log.rawx);
136134
settingsFile.println("log.sfrbx=" + (String)settings.log.sfrbx);
135+
settingsFile.println("enableI2Cdebug=" + (String)settings.enableI2Cdebug);
137136

138137
if (online.gnss)
139138
updateDataFileAccess(&settingsFile); // Update the file access time & date
@@ -335,7 +334,6 @@ bool parseLine(char* str) {
335334
settings.measurementRate = d;
336335
else if (strcmp(settingName, "navigationRate") == 0)
337336
settings.navigationRate = d;
338-
339337
else if (strcmp(settingName, "broadcast.gga") == 0)
340338
settings.broadcast.gga = d;
341339
else if (strcmp(settingName, "broadcast.gsa") == 0)
@@ -350,7 +348,6 @@ bool parseLine(char* str) {
350348
settings.broadcast.rawx = d;
351349
else if (strcmp(settingName, "broadcast.sfrbx") == 0)
352350
settings.broadcast.sfrbx = d;
353-
354351
else if (strcmp(settingName, "log.gga") == 0)
355352
settings.log.gga = d;
356353
else if (strcmp(settingName, "log.gsa") == 0)
@@ -365,6 +362,8 @@ bool parseLine(char* str) {
365362
settings.log.rawx = d;
366363
else if (strcmp(settingName, "log.sfrbx") == 0)
367364
settings.log.sfrbx = d;
365+
else if (strcmp(settingName, "enableI2Cdebug") == 0)
366+
settings.enableI2Cdebug = d;
368367

369368
else
370369
Serial.printf("Unknown setting %s on line: %s\r\n", settingName, str);

Firmware/RTK_Surveyor/settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ struct struct_settings {
108108
uint16_t navigationRate = 1; //Ratio between number of measurements and navigation solutions. Default 1 for 4Hz (with measurementRate).
109109
gnssMessages broadcast;
110110
gnssMessages log;
111+
bool enableI2Cdebug = false; //Turn on to display GNSS library debug messages
111112
} settings;
112113

113114
//These are the devices on board RTK Surveyor that may be on or offline.

0 commit comments

Comments
 (0)