Update to ESP core v2.0.4. Remove unused vars, increase arrays, remove flash helpers.

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -14,7 +14,7 @@ void startWebServer()
   {
     csd_t csd;
     sd->card()->readCSD(&csd); //Card Specific Data
-    sdCardSizeMB = 0.000512 * sdCardCapacity(&csd);
+    sdCardSizeMB = 0.000512 * sd->card()->sectorCount();
     sd->volumeBegin();
 
     //Find available cluster/space

Firmware/RTK_Surveyor/NVM.ino

@@ -347,7 +347,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
       struct tm timeinfo = rtc.getTimeStruct();
       char timestamp[30];
       strftime(timestamp, sizeof(timestamp), "%Y-%m-%d %H:%M:%S", &timeinfo);
-      Serial.printf("RTCM: %s.%03d\r\n", timestamp, rtc.getMillis());
+      Serial.printf("RTCM: %s.%03ld\r\n", timestamp, rtc.getMillis());
     }
     previousMilliseconds = currentMilliseconds;
 

Firmware/RTK_Surveyor/NtripServer.ino

@@ -93,7 +93,7 @@ uint8_t activeProfiles = 0; //Bit vector indicating which profiles are active
 uint8_t displayProfile; //Range: 0 - (MAX_PROFILE_COUNT - 1)
 uint8_t profileNumber = MAX_PROFILE_COUNT; //profileNumber gets set once at boot to save loading time
 char profileNames[MAX_PROFILE_COUNT][50]; //Populated based on names found in LittleFS and SD
-char settingsFileName[40]; //Contains the %s_Settings_%d.txt with current profile number set
+char settingsFileName[60]; //Contains the %s_Settings_%d.txt with current profile number set
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Handy library for setting ESP32 system time to GNSS time
@@ -228,7 +228,7 @@ float battChangeRate = 0.0;
 #include "src/BluetoothSerial/BluetoothSerial.h"
 #endif
 
-char platformPrefix[40] = "Surveyor"; //Sets the prefix for broadcast names
+char platformPrefix[55] = "Surveyor"; //Sets the prefix for broadcast names
 
 HardwareSerial serialGNSS(2); //TX on 17, RX on 16
 
@@ -341,7 +341,7 @@ float lBandEBNO = 0.0; //Used on system status menu
 //Global variables
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 uint8_t unitMACAddress[6]; //Use MAC address in BT broadcast and display
-char deviceName[30]; //The serial string that is broadcast. Ex: 'Surveyor Base-BC61'
+char deviceName[70]; //The serial string that is broadcast. Ex: 'Surveyor Base-BC61'
 const byte menuTimeout = 15; //Menus will exit/timeout after this number of seconds
 int systemTime_minutes = 0; //Used to test if logging is less than max minutes
 uint32_t powerPressedStartTime = 0; //Times how long user has been holding power button, used for power down
@@ -483,9 +483,6 @@ void setup()
 
 void loop()
 {
-  uint32_t delayTime;
-
-
   if (online.gnss == true)
   {
     i2cGNSS.checkUblox(); //Regularly poll to get latest data and any RTCM
@@ -756,5 +753,5 @@ void updateRTC()
 
 void printElapsedTime(const char* title)
 {
-  Serial.printf("%s: %d\n\r", title, millis() - startTime);
+  Serial.printf("%s: %ld\n\r", title, millis() - startTime);
 }

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -440,7 +440,6 @@ void updateSystemState()
               //Get the marks file name
               char fileName[32];
               bool fileOpen = false;
-              size_t fileSize;
               char markBuffer[100];
               bool sdCardWasOnline;
               int year;
@@ -483,7 +482,7 @@ void updateSystemState()
                   //                           1         2         3         4         5         6         7         8         9
                   //                  1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901
                   strcpy(markBuffer, "Date, Time, Latitude, Longitude, Altitude Meters, SIV, HPA Meters, Battery Level, Voltage\n");
-                  int writeBytes = marksFile->write(markBuffer, strlen(markBuffer));
+                  marksFile->write(markBuffer, strlen(markBuffer));
                 }
                 if (fileOpen)
                 {
@@ -513,7 +512,7 @@ void updateSystemState()
                              battLevel, battVoltage);
 
                   //Write the mark to the file
-                  int writeBytes = marksFile->write(markBuffer, strlen(markBuffer));
+                  marksFile->write(markBuffer, strlen(markBuffer));
 
                   // Update the file to create time & date
                   updateDataFileCreate(marksFile);
@@ -1048,6 +1047,6 @@ void changeState(SystemState newState)
     struct tm timeinfo = rtc.getTimeStruct();
     char s[30];
     strftime(s, sizeof(s), "%Y-%m-%d %H:%M:%S", &timeinfo);
-    Serial.printf(", %s.%03d\r\n", s, rtc.getMillis());
+    Serial.printf(", %s.%03ld\r\n", s, rtc.getMillis());
   }
 }

Firmware/RTK_Surveyor/States.ino

@@ -441,7 +441,7 @@ void ButtonCheckTask(void *e)
 
 void idleTask(void *e)
 {
-  uint32_t lastStackPrintTime;
+  uint32_t lastStackPrintTime = 0;
 
   while (1)
   {

Firmware/RTK_Surveyor/Tasks.ino

@@ -82,7 +82,7 @@ void menuBase()
 
     if (!settings.fixedBase) {
       Serial.print(F("12) Select survey-in radio: "));
-      Serial.printf("%s\r\n", settings.ntripServer_StartAtSurveyIn ? F("WiFi") : F("Bluetooth"));
+      Serial.printf("%s\r\n", settings.ntripServer_StartAtSurveyIn ? "WiFi" : "Bluetooth");
     }
 
     Serial.println(F("x) Exit"));

Firmware/RTK_Surveyor/menuBase.ino

@@ -333,7 +333,7 @@ void beginLogging()
   {
     if (online.microSD == true && settings.enableLogging == true && online.rtc == true) //We can't create a file until we have date/time
     {
-      char fileName[40] = "";
+      char fileName[66 + 6 + 40] = "";
 
       if (reuseLastLog == true) //attempt to use previous log
       {

Firmware/RTK_Surveyor/menuMessages.ino

@@ -164,7 +164,7 @@ void menuPointPerfectKeys()
       long expYear;
       gpsWeekToWToDate(keyGPSWeek, keyGPSToW, &expDay, &expMonth, &expYear);
 
-      Serial.printf("%02d/%02d/%d\n\r", expDay, expMonth, expYear);
+      Serial.printf("%02ld/%02ld/%ld\n\r", expDay, expMonth, expYear);
     }
     else
       Serial.println("N/A");
@@ -189,7 +189,7 @@ void menuPointPerfectKeys()
       long expYear;
       gpsWeekToWToDate(keyGPSWeek, keyGPSToW, &expDay, &expMonth, &expYear);
 
-      Serial.printf("%02d/%02d/%d\n\r", expDay, expMonth, expYear);
+      Serial.printf("%02ld/%02ld/%ld\n\r", expDay, expMonth, expYear);
     }
     else
       Serial.println("N/A");