Skip to content

Commit d604722

Browse files
committed
Fix bug during profile select from AP config
Assigning default settings was causing stack canary panic.
1 parent 59eaf59 commit d604722

File tree

4 files changed

+5
-2
lines changed

4 files changed

+5
-2
lines changed

Firmware/RTK_Surveyor/AP-Config/src/main.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ function parseIncoming(msg) {
176176
//console.log("Settings loaded");
177177

178178
ge("profileChangeMessage").innerHTML = '';
179+
ge("resetProfileMsg").innerHTML = '';
179180

180181
//Force element updates
181182
ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));

Firmware/RTK_Surveyor/System.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -591,8 +591,8 @@ void createNMEASentence(customNmeaType_e textID, char *nmeaMessage, char *textMe
591591
sprintf(nmeaMessage, "%s%02X", nmeaTxt, CRC);
592592
}
593593

594-
//Reset settings struct to default initializers
594+
//Reset settings struct to default initializers
595595
void settingsToDefaults()
596596
{
597-
settings = Settings(); //https://stackoverflow.com/questions/15183429/c-completely-erase-or-reset-all-values-of-a-struct
597+
settings = defaultSettings;
598598
}

Firmware/RTK_Surveyor/form.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ function parseIncoming(msg) {
199199
//console.log("Settings loaded");
200200

201201
ge("profileChangeMessage").innerHTML = '';
202+
ge("resetProfileMsg").innerHTML = '';
202203

203204
//Force element updates
204205
ge("measurementRateHz").dispatchEvent(new CustomEvent('change'));

Firmware/RTK_Surveyor/settings.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,7 @@ typedef struct {
503503
float antennaReferencePoint = 0.0; //in mm
504504
} Settings;
505505
Settings settings;
506+
const Settings defaultSettings = Settings();
506507

507508
//Monitor which devices on the device are on or offline.
508509
struct struct_online {

0 commit comments

Comments
 (0)