Skip to content

Commit cdfb29c

Browse files
committed
Correct radioType NVM storage
1 parent 4586789 commit cdfb29c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Firmware/RTK_Surveyor/ESPNOW.ino

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,15 @@ bool espnowIsPaired()
223223
memcpy(settings.espnowPeers[settings.espnowPeerCount], receivedMAC, 6);
224224
settings.espnowPeerCount++;
225225
settings.espnowPeerCount %= ESPNOW_MAX_PEERS;
226-
227-
//Enable radio. User may have arrived here from the setup menu rather than serial menu.
228-
settings.radioType = RADIO_ESPNOW;
229226
}
230227

231228
//Send message directly to the received MAC (not unicast), then exit
232229
espnowSendPairMessage(receivedMAC);
233230

231+
//Enable radio. User may have arrived here from the setup menu rather than serial menu.
232+
settings.radioType = RADIO_ESPNOW;
233+
recordSystemSettings();
234+
234235
espnowSetState(ESPNOW_PAIRED);
235236
return (true);
236237
}

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ void recordSystemSettingsToFile(File * settingsFile)
267267
}
268268
settingsFile->printf("%s=%d\n\r", "espnowPeerCount", settings.espnowPeerCount);
269269
settingsFile->printf("%s=%d\n\r", "enableNtripServerMessageParsing", settings.enableNtripServerMessageParsing);
270-
settingsFile->printf("%s=%d\n\r", "radioType", settings.bluetoothRadioType);
270+
settingsFile->printf("%s=%d\n\r", "bluetoothRadioType", settings.bluetoothRadioType);
271271

272272
//Record constellation settings
273273
for (int x = 0 ; x < MAX_CONSTELLATIONS ; x++)
@@ -876,6 +876,8 @@ bool parseLine(char* str, Settings *settings)
876876
settings->espnowPeerCount = d;
877877
else if (strcmp(settingName, "enableNtripServerMessageParsing") == 0)
878878
settings->enableNtripServerMessageParsing = d;
879+
else if (strcmp(settingName, "radioType") == 0)
880+
settings->radioType = (RadioType_e)d;
879881
else if (strcmp(settingName, "bluetoothRadioType") == 0)
880882
settings->bluetoothRadioType = (BluetoothRadioType_e)d;
881883

0 commit comments

Comments
 (0)