Fix compiler errors in v2.0.4 core

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -828,7 +828,6 @@ void beginI2C()
   //SCL/GND shorted: 1000ms, response 5
   //SDA/VCC shorted: 1000ms, reponse 5
   //SDA/GND shorted: 14ms, response 5
-  unsigned long startTime = millis();
   Wire.beginTransmission(0x15); //Dummy address
   int endValue = Wire.endTransmission();
   if (endValue == 2)

Firmware/RTK_Surveyor/Display.ino

@@ -379,7 +379,7 @@ void updateDisplay()
 #ifdef COMPILE_BT
         sprintf(macAddress, "%02X", unitMACAddress[5]);
 #else
-        sprintf(macAddress, "%02X", 0, 0); //If BT is not available, print zeroes
+        sprintf(macAddress, "%02X", 0); //If BT is not available, print zeroes
 #endif
         oled.setFont(QW_FONT_5X7); //Set font to smallest
         oled.setCursor(9, 3);

Firmware/RTK_Surveyor/Form.ino

@@ -1,8 +1,6 @@
 //Once connected to the access point for WiFi Config, the ESP32 sends current setting values in one long string to websocket
 //After user clicks 'save', data is validated via main.js and a long string of values is returned.
 
-static uint8_t bootProfileNumber;
-
 //Start webserver in AP mode
 void startWebServer()
 {
@@ -288,7 +286,7 @@ void createSettingsString(char* settingsCSV)
   //System Info
   stringRecord(settingsCSV, "platformPrefix", platformPrefix);
 
-  char apRtkFirmwareVersion[50];
+  char apRtkFirmwareVersion[86];
   sprintf(apRtkFirmwareVersion, "RTK %s Firmware: v%d.%d-%s", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
   stringRecord(settingsCSV, "rtkFirmwareVersion", apRtkFirmwareVersion);
 
@@ -298,7 +296,7 @@ void createSettingsString(char* settingsCSV)
   else if (zedModuleType == PLATFORM_F9R)
     strcpy(apZedPlatform, "ZED-F9R");
 
-  char apZedFirmwareVersion[50];
+  char apZedFirmwareVersion[80];
   sprintf(apZedFirmwareVersion, "%s Firmware: %s", apZedPlatform, zedFirmwareVersion);
   stringRecord(settingsCSV, "zedFirmwareVersion", apZedFirmwareVersion);
 
@@ -418,8 +416,6 @@ void createSettingsString(char* settingsCSV)
     sprintf(nameText, "%d: %s", index + 1, profileNames[index]);
     stringRecord(settingsCSV, tagText, nameText);
   }
-  bootProfileNumber = profileNumber + 1;
-  stringRecord(settingsCSV, "bootProfileNumber", bootProfileNumber);
   stringRecord(settingsCSV, "activeProfiles", activeProfiles);
 
   //New settings not yet integrated
@@ -517,14 +513,6 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
       recordProfileNumber(profileNumber);
     }
   }
-  else if (strcmp(settingName, "bootProfileNumber") == 0)
-  {
-    if ((sscanf(settingValueStr, "%d", &bootProfileNumber) != 1)
-        || (bootProfileNumber < 1)
-        || (bootProfileNumber > (MAX_PROFILE_COUNT + 1)))
-      bootProfileNumber = 1;
-    Serial.printf("bootProfileNumber: %d\r\n", bootProfileNumber);
-  }
   else if (strcmp(settingName, "enableNtripServer") == 0)
     settings.enableNtripServer = settingValueBool;
   else if (strcmp(settingName, "ntripServer_CasterHost") == 0)
@@ -600,11 +588,6 @@ void updateSettingWithValue(const char *settingName, const char* settingValueStr
   {
     if (newAPSettings == true) recordSystemSettings(); //If we've recieved settings, record before restart
 
-    //Determine which profile to boot
-    bootProfileNumber -= 1;
-    if (bootProfileNumber != profileNumber)
-      recordProfileNumber(bootProfileNumber);
-
     //Reboot the machine
     ESP.restart();
   }
@@ -726,7 +709,7 @@ void stringRecord(char* settingsCSV, const char *id, char* settingValue)
 void stringRecord(char* settingsCSV, const char *id, uint64_t settingValue)
 {
   char record[100];
-  sprintf(record, "%s,%ld,", id, settingValue);
+  sprintf(record, "%s,%lld,", id, settingValue);
   strcat(settingsCSV, record);
 }
 

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -581,9 +581,6 @@ void setup()
 
 void loop()
 {
-  uint32_t delayTime;
-  uint32_t currentMilliseconds;
-
   if (online.gnss == true)
   {
     i2cGNSS.checkUblox(); //Regularly poll to get latest data and any RTCM

Firmware/RTK_Surveyor/States.ino

@@ -807,7 +807,7 @@ void updateSystemState()
 
           if (online.rtc == true)
           {
-            uint8_t daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
+            int daysRemaining = daysFromEpoch(settings.pointPerfectNextKeyStart + settings.pointPerfectNextKeyDuration + 1);
 
             if (daysRemaining >= 0)
             {

Firmware/RTK_Surveyor/menuMain.ino

@@ -294,8 +294,6 @@ void factoryReset()
 //Configure the internal radio, if available
 void menuRadio()
 {
-  int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, ECEF coords, etc).
-
   while (1)
   {
     Serial.println();

Firmware/RTK_Surveyor/menuPP.ino

@@ -594,7 +594,7 @@ bool getDate(uint8_t &dd, uint8_t &mm, uint16_t &yy)
 }
 
 //Given an epoch in ms, return the number of days from given and Epoch now
-uint8_t daysFromEpoch(long long endEpoch)
+int daysFromEpoch(long long endEpoch)
 {
   endEpoch /= 1000; //Convert PointPerfect ms Epoch to s
 
@@ -603,7 +603,7 @@ uint8_t daysFromEpoch(long long endEpoch)
   long delta = endEpoch - localEpoch; //number of s between dates
   delta /= (60 * 60); //hours
   delta /= 24; //days
-  return ((uint8_t)delta);
+  return ((int)delta);
 }
 
 //Given the key's starting epoch time, and the key's duration

Firmware/RTK_Surveyor/menuSystem.ino

@@ -129,7 +129,7 @@ void menuSystem()
       uptimeSeconds += 1;
     }
     Serial.print("Uptime: ");
-    Serial.printf("%d %02d:%02d:%02d.%03ld\r\n",
+    Serial.printf("%d %02d:%02d:%02d.%03lld\r\n",
                   uptimeDays,
                   uptimeHours,
                   uptimeMinutes,
@@ -461,7 +461,7 @@ void menuDebug()
       else if (incoming == 9)
       {
         Serial.print("Enter GNSS Serial Timeout in milliseconds (0 to 1000): ");
-        uint16_t serialTimeoutGNSS = getNumber(menuTimeout); //Timeout after x seconds
+        int16_t serialTimeoutGNSS = getNumber(menuTimeout); //Timeout after x seconds
         if (serialTimeoutGNSS < 0 || serialTimeoutGNSS > 1000) //Arbitrary 1s limit
         {
           Serial.println("Error: Timeout is out of range");