Add date to firmware version. Add firmware version output to boot and settings file.

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -31,7 +31,7 @@ void beginBoard()
     pin_batteryLevel_alert = 36;
 
     strcpy(platformFilePrefix, "SFE_Surveyor");
-    strcpy(platformBluetoothPrefix, "Surveyor");
+    strcpy(platformPrefix, "Surveyor");
   }
   else if (productVariant == RTK_EXPRESS)
   {
@@ -57,7 +57,7 @@ void beginBoard()
     setMuxport(settings.dataPortChannel); //Set mux to user's choice: NMEA, I2C, PPS, or DAC
 
     strcpy(platformFilePrefix, "SFE_Express");
-    strcpy(platformBluetoothPrefix, "Express");
+    strcpy(platformPrefix, "Express");
   }
   else if (productVariant == RTK_FACET)
   {
@@ -84,10 +84,10 @@ void beginBoard()
     setMuxport(settings.dataPortChannel); //Set mux to user's choice: NMEA, I2C, PPS, or DAC
 
     strcpy(platformFilePrefix, "SFE_Facet");
-    strcpy(platformBluetoothPrefix, "Facet");
+    strcpy(platformPrefix, "Facet");
   }
 
-  Serial.printf("RTK Variant: %s\n\r", platformFilePrefix);
+  Serial.printf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
 
   //For all boards, check reset reason. If reset was do to wdt or panic, append last log
   if (esp_reset_reason() == ESP_RST_POWERON)

Firmware/RTK_Surveyor/NVM.ino

@@ -88,6 +88,11 @@ void recordSystemSettingsToFile()
 
       settingsFile.println("sizeOfSettings=" + (String)settings.sizeOfSettings);
       settingsFile.println("rtkIdentifier=" + (String)settings.rtkIdentifier);
+
+      char firmwareVersion[30]; //v1.3 December 31 2021
+      sprintf(firmwareVersion, "v%d.%d-%s", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
+      settingsFile.println("rtkFirmwareVersion=" + (String)firmwareVersion);
+
       settingsFile.println("printDebugMessages=" + (String)settings.printDebugMessages);
       settingsFile.println("enableSD=" + (String)settings.enableSD);
       settingsFile.println("enableDisplay=" + (String)settings.enableDisplay);
@@ -368,7 +373,7 @@ bool parseLine(char* str) {
       strcat(settingsFileName, "_Settings.txt");
       sd.remove(settingsFileName);
 
-      Serial.printf("RTK %s has been factory reset via settings file. Freezing. Please restart and open terminal at 115200bps.\n\r", platformBluetoothPrefix);
+      Serial.printf("RTK %s has been factory reset via settings file. Freezing. Please restart and open terminal at 115200bps.\n\r", platformPrefix);
 
       while (1)
         delay(1); //Prevent CPU freakout

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -183,12 +183,13 @@ float battChangeRate = 0.0;
 
 //Hardware serial and BT buffers
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+//We use a local copy of the BluetoothSerial library so that we can increase the RX buffer. See issue: https://github.com/sparkfun/SparkFun_RTK_Surveyor/issues/18
 #include "src/BluetoothSerial/BluetoothSerial.h"
 BluetoothSerial SerialBT;
 #include "esp_bt.h" //Core access is needed for BT stop. See customBTstop() for more info.
 #include "esp_gap_bt_api.h" //Needed for setting of pin. See issue: https://github.com/sparkfun/SparkFun_RTK_Surveyor/issues/5
 
-char platformBluetoothPrefix[40] = "Surveyor"; //Sets the prefix for broadcast names
+char platformPrefix[40] = "Surveyor"; //Sets the prefix for broadcast names
 
 HardwareSerial serialGNSS(2);
 #define RXD2 16

Firmware/RTK_Surveyor/System.ino

@@ -13,7 +13,7 @@ bool startBluetooth()
   else
     strcpy(stateName, "Base");
 
-  sprintf(deviceName, "%s %s-%02X%02X", platformBluetoothPrefix, stateName, unitMACAddress[4], unitMACAddress[5]); //Base mode
+  sprintf(deviceName, "%s %s-%02X%02X", platformPrefix, stateName, unitMACAddress[4], unitMACAddress[5]); //Base mode
 
   if (SerialBT.begin(deviceName) == false)
   {

Firmware/RTK_Surveyor/menuMain.ino

@@ -7,7 +7,7 @@ void menuMain()
   while (1)
   {
     Serial.println();
-    Serial.printf("SparkFun RTK Surveyor v%d.%d\r\n", FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR);
+    Serial.printf("SparkFun RTK %s v%d.%d-%s\r\n", platformPrefix, FIRMWARE_VERSION_MAJOR, FIRMWARE_VERSION_MINOR, __DATE__);
 
     Serial.print(F("** Bluetooth broadcasting as: "));
     Serial.print(deviceName);