Dynamically change Bluetooth advertising based on platform

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -9,7 +9,7 @@ void beginBoard()
   {
     productVariant = RTK_EXPRESS;
   }
-  else if(analogRead(35) > 400 && analogRead(35) < 600)
+  else if (analogRead(35) > 400 && analogRead(35) < 600)
   {
     productVariant = RTK_FACET;
   }
@@ -31,6 +31,7 @@ void beginBoard()
     pin_batteryLevel_alert = 36;
 
     strcpy(platformFilePrefix, "SFE_Surveyor");
+    strcpy(platformBluetoothPrefix, "Surveyor");
   }
   else if (productVariant == RTK_EXPRESS)
   {
@@ -56,6 +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");
   }
   else if (productVariant == RTK_FACET)
   {
@@ -82,6 +84,7 @@ void beginBoard()
     setMuxport(settings.dataPortChannel); //Set mux to user's choice: NMEA, I2C, PPS, or DAC
 
     strcpy(platformFilePrefix, "SFE_Facet");
+    strcpy(platformBluetoothPrefix, "Facet");
   }
 
   Serial.printf("RTK Variant: %s\n\r", platformFilePrefix);

Firmware/RTK_Surveyor/Display.ino

@@ -1300,7 +1300,6 @@ void displayTest()
       oled.setCursor(xOffset, yOffset + (3 * charHeight) ); //x, y
       oled.print(F("GNSS:"));
       int satsInView = i2cGNSS.getSIV();
-      
       if (online.gnss == true && satsInView > 8)
         oled.print(F("OK"));
       else

Firmware/RTK_Surveyor/System.ino

@@ -7,10 +7,13 @@ bool startBluetooth()
   esp_read_mac(unitMACAddress, ESP_MAC_WIFI_STA);
   unitMACAddress[5] += 2; //Convert MAC address to Bluetooth MAC (add 2): https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/system.html#mac-address
 
+  char stateName[10];
   if (buttonPreviousState == BUTTON_ROVER)
-    sprintf(deviceName, "Surveyor Rover-%02X%02X", unitMACAddress[4], unitMACAddress[5]); //Rover mode
+    strcpy(stateName, "Rover");
   else
-    sprintf(deviceName, "Surveyor Base-%02X%02X", unitMACAddress[4], unitMACAddress[5]); //Base mode
+    strcpy(stateName, "Base");
+
+  sprintf(deviceName, "%s %s-%02X%02X", platformBluetoothPrefix, stateName, unitMACAddress[4], unitMACAddress[5]); //Base mode
 
   if (SerialBT.begin(deviceName) == false)
   {
@@ -186,7 +189,7 @@ bool configureUbloxModule()
 #define INPUT_SETTING 12
 
   //UART1 will primarily be used to pass NMEA and UBX from ZED to ESP32 (eventually to cell phone)
-  //but the phone can also provide RTCM data and a user may want to configure the ZED over Bluetooth. 
+  //but the phone can also provide RTCM data and a user may want to configure the ZED over Bluetooth.
   //So let's be sure to enable UBX+NMEA+RTCM on the input
   getPortSettings(COM_PORT_UART1); //Load the settingPayload with this port's settings
   if (settingPayload[OUTPUT_SETTING] != (COM_TYPE_NMEA | COM_TYPE_UBX) || settingPayload[INPUT_SETTING] != (COM_TYPE_NMEA | COM_TYPE_UBX | COM_TYPE_RTCM3))