Skip to content

Commit 2a10718

Browse files
committed
Bug fixes for ESP32 core v2.0.4
The new core settings are a blessing and a curse: many bugs discovered and fixed.
1 parent 68e3f5c commit 2a10718

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

Firmware/RTK_Surveyor/Form.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ void createSettingsString(char* settingsCSV)
455455
stringRecord(settingsCSV, "antennaReferencePoint", settings.antennaReferencePoint, 1);
456456

457457
//Radio / ESP-Now settings
458-
char radioMAC[15]; //Send radio MAC
458+
char radioMAC[18]; //Send radio MAC
459459
sprintf(radioMAC, "%02X:%02X:%02X:%02X:%02X:%02X",
460460
wifiMACAddress[0],
461461
wifiMACAddress[1],

Firmware/RTK_Surveyor/NVM.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ void recordSystemSettingsToFile(File * settingsFile)
282282
settingsFile->printf("%s=%d\n\r", "enableNmeaServer", settings.enableNmeaServer);
283283
settingsFile->printf("%s=%d\n\r", "espnowBroadcast", settings.espnowBroadcast);
284284
settingsFile->printf("%s=%d\n\r", "antennaHeight", settings.antennaHeight);
285-
settingsFile->printf("%s=%d\n\r", "antennaReferencePoint", settings.antennaReferencePoint);
285+
settingsFile->printf("%s=%0.2f\n\r", "antennaReferencePoint", settings.antennaReferencePoint);
286286

287287
//Record constellation settings
288288
for (int x = 0 ; x < MAX_CONSTELLATIONS ; x++)

Firmware/RTK_Surveyor/NtripClient.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ bool ntripClientConnectLimitReached()
168168

169169
//Retry the connection a few times
170170
bool limitReached = false;
171-
if (ntripClientConnectionAttempts++ >= MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS);
171+
if (ntripClientConnectionAttempts++ >= MAX_NTRIP_CLIENT_CONNECTION_ATTEMPTS) limitReached = true;
172172

173173
if (limitReached == false)
174174
{
@@ -354,7 +354,7 @@ void ntripClientUpdate()
354354
if (millis() - ntripClientTimeoutPrint > 1000)
355355
{
356356
ntripClientTimeoutPrint = millis();
357-
Serial.printf("NTRIP Client connection timeout wait: %d of %d seconds \n\r",
357+
Serial.printf("NTRIP Client connection timeout wait: %ld of %d seconds \n\r",
358358
(millis() - ntripClientLastConnectionAttempt) / 1000,
359359
ntripClientConnectionAttemptTimeout / 1000
360360
);

Firmware/RTK_Surveyor/NtripServer.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ void ntripServerUpdate()
368368
if (millis() - ntripServerTimeoutPrint > 1000)
369369
{
370370
ntripServerTimeoutPrint = millis();
371-
Serial.printf("NTRIP Server connection timeout wait: %d of %d seconds \n\r",
371+
Serial.printf("NTRIP Server connection timeout wait: %ld of %d seconds \n\r",
372372
(millis() - ntripServerLastConnectionAttempt) / 1000,
373373
ntripServerConnectionAttemptTimeout / 1000
374374
);

Firmware/RTK_Surveyor/WiFi.ino

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ void wifiNmeaData(uint8_t * data, uint16_t length)
216216
{
217217
#ifdef COMPILE_WIFI
218218
static IPAddress ipAddress[WIFI_MAX_NMEA_CLIENTS];
219-
int index;
219+
int index = 0;
220220
static uint32_t lastNmeaConnectAttempt;
221221

222222
if (online.nmeaClient)
@@ -234,7 +234,7 @@ void wifiNmeaData(uint8_t * data, uint16_t length)
234234
}
235235
if (wifiNmeaClient[0].connect(ipAddress[0], WIFI_NMEA_TCP_PORT))
236236
{
237-
online.nmeaClient;
237+
online.nmeaClient = true;
238238
Serial.print("NMEA client connected to ");
239239
Serial.println(ipAddress[0]);
240240
wifiNmeaConnected |= 1 << index;
@@ -324,7 +324,6 @@ bool wifiNmeaTcpServerActive()
324324
void wifiStart(char* ssid, char* pw)
325325
{
326326
#ifdef COMPILE_WIFI
327-
bool restartESPNow = false;
328327

329328
if ((wifiState == WIFI_OFF) || (wifiState == WIFI_ON))
330329
{

0 commit comments

Comments
 (0)