Allow disable of BT radio

Used primarily for debugging.

Author: nseidle

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -116,11 +116,13 @@ void bluetoothStart()
 
     sprintf(deviceName, "%s %s%02X%02X", platformPrefix, stateName, unitMACAddress[4], unitMACAddress[5]);
 
-    // BLE vs Bluetooth Classic
-    if (settings.enableBLE)
-      bluetoothSerial = new BTLESerial();
-    else
+    // Select Bluetooth setup
+    if (settings.bluetoothRadioType == BLUETOOTH_RADIO_OFF)
+      return;
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
       bluetoothSerial = new BTClassicSerial();
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
+      bluetoothSerial = new BTLESerial();
 
     if (bluetoothSerial->begin(deviceName) == false)
     {

Firmware/RTK_Surveyor/Display.ino

@@ -659,7 +659,7 @@ uint32_t setRadioIcons()
     //Because of lack of space we will indicate the Base/Rover if only two radios or less are active
 
     //Count the number of radios in use
-    uint8_t numberOfRadios = 1; //Bluetooth always indicated
+    uint8_t numberOfRadios = 1; //Bluetooth always indicated. TODO don't count if BT radio type is OFF.
     if (wifiState > WIFI_OFF) numberOfRadios++;
     if (espnowState > ESPNOW_OFF) numberOfRadios++;
 

Firmware/RTK_Surveyor/NVM.ino

@@ -267,7 +267,7 @@ void recordSystemSettingsToFile(File * settingsFile)
   }
   settingsFile->printf("%s=%d\n\r", "espnowPeerCount", settings.espnowPeerCount);
   settingsFile->printf("%s=%d\n\r", "enableNtripServerMessageParsing", settings.enableNtripServerMessageParsing);
-  settingsFile->printf("%s=%d\n\r", "enableBLE", settings.enableBLE);
+  settingsFile->printf("%s=%d\n\r", "radioType", settings.bluetoothRadioType);
 
   //Record constellation settings
   for (int x = 0 ; x < MAX_CONSTELLATIONS ; x++)
@@ -871,13 +871,13 @@ bool parseLine(char* str, Settings *settings)
   else if (strcmp(settingName, "enablePrintDuplicateStates") == 0)
     settings->enablePrintDuplicateStates = d;
   else if (strcmp(settingName, "radioType") == 0)
-    settings->radioType = (radioType_e)d;
+    settings->radioType = (RadioType_e)d;
   else if (strcmp(settingName, "espnowPeerCount") == 0)
     settings->espnowPeerCount = d;
   else if (strcmp(settingName, "enableNtripServerMessageParsing") == 0)
     settings->enableNtripServerMessageParsing = d;
-  else if (strcmp(settingName, "enableBLE") == 0)
-    settings->enableBLE = d;
+  else if (strcmp(settingName, "bluetoothRadioType") == 0)
+    settings->bluetoothRadioType = (BluetoothRadioType_e)d;
 
   //Check for bulk settings (constellations, message rates, ESPNOW Peers)
   //Must be last on else list

Firmware/RTK_Surveyor/menuSystem.ino

@@ -152,10 +152,12 @@ void menuSystem()
     Serial.printf("z) Set time zone offset: %02d:%02d:%02d\r\n", settings.timeZoneHours, settings.timeZoneMinutes, settings.timeZoneSeconds);
 
     Serial.print(F("b) Set Bluetooth Mode: "));
-    if (settings.enableBLE == true)
+    if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
+      Serial.println(F("Classic"));
+    else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
       Serial.println(F("BLE"));
     else
-      Serial.println(F("Classic"));
+      Serial.println(F("Off"));
 
     Serial.println("r) Reset all settings to default");
 
@@ -206,12 +208,13 @@ void menuSystem()
     {
       // Restart Bluetooth
       bluetoothStop();
-      if (settings.enableBLE == false)
-        settings.enableBLE = true;
-      else
-        settings.enableBLE = false;
+      if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP)
+        settings.bluetoothRadioType = BLUETOOTH_RADIO_BLE;
+      else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_BLE)
+        settings.bluetoothRadioType = BLUETOOTH_RADIO_OFF;
+      else if (settings.bluetoothRadioType == BLUETOOTH_RADIO_OFF)
+        settings.bluetoothRadioType = BLUETOOTH_RADIO_SPP;
       bluetoothStart();
-
     }
     else if (incoming == 'r')
     {

Firmware/RTK_Surveyor/settings.h

@@ -164,11 +164,18 @@ enum RtcmTransportState
   RTCM_TRANSPORT_STATE_CHECK_CRC
 };
 
-typedef enum radioType_e
+typedef enum RadioType_e
 {
   RADIO_EXTERNAL = 0,
   RADIO_ESPNOW,
-} radioType_e;
+} RadioType_e;
+
+typedef enum BluetoothRadioType_e
+{
+  BLUETOOTH_RADIO_SPP = 0,
+  BLUETOOTH_RADIO_BLE,
+  BLUETOOTH_RADIO_OFF,
+} BluetoothRadioType_e;
 
 //Radio status LED goes from off (LED off), no connection (blinking), to connected (solid)
 enum BTState
@@ -462,11 +469,11 @@ typedef struct {
   bool enablePrintNtripClientRtcm = false;
   bool enablePrintStates = true;
   bool enablePrintDuplicateStates = false;
-  radioType_e radioType = RADIO_EXTERNAL;
+  RadioType_e radioType = RADIO_EXTERNAL;
   uint8_t espnowPeers[5][6]; //Max of 5 peers. Contains the MAC addresses (6 bytes) of paired units
   uint8_t espnowPeerCount;
   bool enableNtripServerMessageParsing = false;
-  bool enableBLE = false;
+  BluetoothRadioType_e bluetoothRadioType = BLUETOOTH_RADIO_SPP;
 } Settings;
 Settings settings;