Fixes for ESP core v2.0.6

Author: nseidle

Firmware/RTK_Surveyor/Form.ino

@@ -501,11 +501,13 @@ void createSettingsString(char* newSettings)
   stringRecord(newSettings, "maxLogTime_minutes", settings.maxLogTime_minutes);
   stringRecord(newSettings, "maxLogLength_minutes", settings.maxLogLength_minutes);
 
-  char sdSpace[30];
-  sprintf(sdSpace, "%s", stringHumanReadableSize(sdFreeSpace));
-  stringRecord(newSettings, "sdFreeSpace", sdSpace);
-  sprintf(sdSpace, "%s", stringHumanReadableSize(sdCardSize));
-  stringRecord(newSettings, "sdSize", sdSpace);
+  char sdCardSizeChar[20];
+  stringHumanReadableSize(sdCardSize).toCharArray(sdCardSizeChar, sizeof(sdCardSizeChar));
+  char sdFreeSpaceChar[20];
+  stringHumanReadableSize(sdFreeSpace).toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
+
+  stringRecord(newSettings, "sdFreeSpace", sdCardSizeChar);
+  stringRecord(newSettings, "sdSize", sdFreeSpaceChar);
 
   stringRecord(newSettings, "enableResetDisplay", settings.enableResetDisplay);
 

Firmware/RTK_Surveyor/Tasks.ino

@@ -115,7 +115,6 @@ void F9PSerialReadTask(void *e)
 {
   static PARSE_STATE parse = {waitForPreamble, processUart1Message, "Log"};
 
-  bool newDataLost = false; //Goes true at the first instance of 0 bytes available
   uint8_t incomingData = 0;
 
   availableHandlerSpace = settings.gnssHandlerBufferSize;
@@ -949,7 +948,7 @@ void sdSizeCheckTask(void *e)
 
         xSemaphoreGive(sdCardSemaphore);
 
-        uint64_t sdUsedSpace = sdCardSize - sdFreeSpace; //Don't think of it as used, think of it as unusable
+        //uint64_t sdUsedSpace = sdCardSize - sdFreeSpace; //Don't think of it as used, think of it as unusable
 
         systemPrintf("SD card size: %s / Free space: %s\r\n",
                  stringHumanReadableSize(sdCardSize),

Firmware/RTK_Surveyor/WiFi.ino

@@ -46,7 +46,6 @@ static const int MAX_WIFI_CONNECTION_ATTEMPTS = 500;
 //ms - Max of 4,294,967,295 or 4.3M seconds or 71,000 minutes or 1193 hours or 49 days between attempts
 static int wifiConnectionAttempts = 0; //Count the number of connection attempts between restarts
 static uint32_t wifiConnectionAttemptsTotal; //Count the number of connection attempts absolutely
-static uint32_t wifiLastConnectionAttempt = 0;
 static uint32_t wifiConnectionAttemptTimeout = 0;
 
 //----------------------------------------
@@ -55,6 +54,8 @@ static uint32_t wifiConnectionAttemptTimeout = 0;
 
 #ifdef COMPILE_WIFI
 
+static uint32_t wifiLastConnectionAttempt = 0;
+
 //WiFi Timer usage:
 //  * Measure interval to display IP address
 static unsigned long wifiDisplayTimer = 0;

Firmware/RTK_Surveyor/menuFirmware.ino

@@ -101,7 +101,7 @@ void menuFirmware()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;
@@ -414,7 +414,6 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)
 //Exits by either updating firmware and resetting, or failing to connect
 void otaUpdate()
 {
-  bool updateAvailable = false;
 #ifdef COMPILE_WIFI
   bool previouslyConnected = wifiIsConnected();
 

Firmware/RTK_Surveyor/menuMain.ino

@@ -55,7 +55,11 @@ void menuMain()
 
     systemPrintln("5) Configure Logging");
 
+#ifdef COMPILE_WIFI
     systemPrintln("6) Configure WiFi");
+#else
+    systemPrintln("6) **WiFi Not Compiled**");
+#endif
 
     systemPrintln("p) Configure User Profiles");
 
@@ -114,7 +118,7 @@ void menuMain()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;

Firmware/RTK_Surveyor/menuMessages.ino

@@ -10,11 +10,16 @@ void menuLog()
 
     if (settings.enableSD && online.microSD)
     {
+      char sdCardSizeChar[20];
+      stringHumanReadableSize(sdCardSize).toCharArray(sdCardSizeChar, sizeof(sdCardSizeChar));
+      char sdFreeSpaceChar[20];
+      stringHumanReadableSize(sdFreeSpace).toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
+
       char myString[200];
       snprintf(myString, sizeof(myString),
                "SD card size: %s / Free space: %s",
-               stringHumanReadableSize(sdCardSize),
-               stringHumanReadableSize(sdFreeSpace)
+               sdCardSizeChar,
+               sdFreeSpaceChar
               );
       systemPrintln(myString);
     }

Firmware/RTK_Surveyor/menuPP.ino

@@ -992,7 +992,7 @@ void menuPointPerfect()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;

Firmware/RTK_Surveyor/menuSystem.ino

@@ -358,7 +358,7 @@ void menuSystem()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;
@@ -464,7 +464,7 @@ void menuWiFi()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;
@@ -858,7 +858,7 @@ void menuDebug()
     }
     else if (incoming == 'x')
       break;
-    else if (incoming == INPUT_RESPONSE_EMPTY)
+    else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY)
       break;
     else if (incoming == INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT)
       break;

Firmware/RTK_Surveyor/settings.h

@@ -255,6 +255,7 @@ typedef enum
   INPUT_RESPONSE_GETNUMBER_EXIT = -9999999, //Less than min ECEF. User may be prompted for number but wants to exit without entering data
   INPUT_RESPONSE_GETNUMBER_TIMEOUT = -9999998,
   INPUT_RESPONSE_GETCHARACTERNUMBER_TIMEOUT = 255,
+  INPUT_RESPONSE_GETCHARACTERNUMBER_EMPTY = 254,
   INPUT_RESPONSE_TIMEOUT = -3,
   INPUT_RESPONSE_OVERFLOW = -2,
   INPUT_RESPONSE_EMPTY = -1,

Firmware/RTK_Surveyor/support.ino

@@ -776,8 +776,6 @@ uint8_t nmeaFindFirstComma(PARSE_STATE * parse, uint8_t data)
 //Read the CRC
 uint8_t rtcmReadCrc(PARSE_STATE * parse, uint8_t data)
 {
-  uint16_t dataSent;
-
   //Account for this data byte
   parse->bytesRemaining -= 1;
 
@@ -823,8 +821,6 @@ uint8_t rtcmReadCrc(PARSE_STATE * parse, uint8_t data)
 //Read the rest of the message
 uint8_t rtcmReadData(PARSE_STATE * parse, uint8_t data)
 {
-  uint16_t dataSent;
-
   //Account for this data byte
   parse->bytesRemaining -= 1;