Skip to content

Commit 84b9ec4

Browse files
committed
Re-enable recording of zero length settings (needed for blank passwords)
1 parent 53dcb26 commit 84b9ec4

File tree

4 files changed

+5
-18
lines changed

4 files changed

+5
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function ge(e) {
1212
var platformPrefix = "Surveyor";
1313

1414
function parseIncoming(msg) {
15-
console.log("incoming message: " + msg);
15+
//console.log("incoming message: " + msg);
1616

1717
var data = msg.split(',');
1818
for (let x = 0; x < data.length - 1; x += 2) {

Firmware/RTK_Surveyor/Form.ino

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -372,17 +372,6 @@ void createSettingsString(char* settingsCSV)
372372

373373
stringRecord(settingsCSV, "enableResetDisplay", settings.enableResetDisplay);
374374

375-
//Pass any available firmware file names
376-
if (binCount > 0)
377-
{
378-
for (int x = 0 ; x < binCount ; x++)
379-
{
380-
char firmwareFileID[50];
381-
sprintf(firmwareFileID, "firmwareFileName%d", x);
382-
stringRecord(settingsCSV, firmwareFileID, binFileNames[x]);
383-
}
384-
}
385-
386375
//Turn on SD display block last
387376
stringRecord(settingsCSV, "sdMounted", online.microSD);
388377

@@ -624,11 +613,9 @@ bool parseIncomingSettings()
624613
headPtr = commaPtr + 1;
625614
}
626615

627-
Serial.printf("settingName: %s value: %s\n\r", settingName, valueStr);
616+
log_d("settingName: %s value: %s", settingName, valueStr);
628617

629-
//Ignore zero length values (measurementRateSec) received from browser
630-
if (strlen(valueStr) > 0)
631-
updateSettingWithValue(settingName, valueStr);
618+
updateSettingWithValue(settingName, valueStr);
632619
}
633620

634621
return (true);

Firmware/RTK_Surveyor/RTK_Surveyor.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
This firmware runs the core of the SparkFun RTK Surveyor product. It runs on an ESP32
77
and communicates with the ZED-F9P.
88
9-
Compiled with Arduino v1.8.13 with ESP32 core v1.0.6.
9+
Compiled with Arduino v1.8.15 with ESP32 core v2.0.1.
1010
v1.7 Moves to ESP32 core v2.0.0.
1111
1212
Select the ESP32 Dev Module from the boards list. This maps the same pins to the ESP32-WROOM module.

Firmware/RTK_Surveyor/form.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function ge(e) {
3535
var platformPrefix = "Surveyor";
3636

3737
function parseIncoming(msg) {
38-
console.log("incoming message: " + msg);
38+
//console.log("incoming message: " + msg);
3939

4040
var data = msg.split(',');
4141
for (let x = 0; x < data.length - 1; x += 2) {

0 commit comments

Comments
 (0)