Combine bluetooth start functions. Remove BT radio start/stop for WiFi.

Author: nseidle

Firmware/RTK_Surveyor/Base.ino

@@ -290,7 +290,7 @@ bool updateNtripServer()
     //Turn off Bluetooth and turn on WiFi
     endBluetooth();
 
-    Serial.printf("Connecting to local WiFi: %s\n", settings.wifiSSID);
+    Serial.printf("Connecting to local WiFi: %s", settings.wifiSSID);
     WiFi.begin(settings.wifiSSID, settings.wifiPW);
 
     int maxTime = 10000;
@@ -304,8 +304,10 @@ bool updateNtripServer()
         Serial.println(F("\nFailed to connect to WiFi. Are you sure your WiFi credentials are correct?"));
         return (false);
       }
+
+      if(Serial.available()) return(false); //User has pressed a key
     }
-    delay(10);
+    Serial.println();
 
     radioState = WIFI_CONNECTED;
   } //End WiFi connect check
@@ -375,7 +377,7 @@ bool updateNtripServer()
     } //End attempt to connect
     else
     {
-      Serial.println(F("Failed to connect to caster"));
+      Serial.println(F("Failed to connect to caster. Are you sure your Caster address is correct?"));
       delay(10); //Give RTOS some time
       return (false);
     }

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -29,10 +29,9 @@
     (Done) Base - Enter fixed coordinates, survey-in settings
     (Done) Ports - Configure Radio and Data port baud rates
     (Done) Test menu
+    (Done) Firmware upgrade menu
     Enable various debug outputs sent over BT
 
-    when user exits wifi mode, turn BT back on
-
 */
 
 const int FIRMWARE_VERSION_MAJOR = 1;
@@ -194,7 +193,6 @@ const byte menuTimeout = 15; //Menus will exit/timeout after this number of seco
 bool inTestMode = false; //Used to re-route BT traffic while in test sub menu
 long systemTime_minutes = 0; //Used to test if logging is less than max minutes
 
-uint32_t lastBluetoothLEDBlink = 0;
 uint32_t lastRoverUpdate = 0;
 uint32_t lastBaseUpdate = 0;
 uint32_t lastBattUpdate = 0;
@@ -252,7 +250,7 @@ void setup()
   beginFuelGauge(); //Configure battery fuel guage monitor
   checkBatteryLevels(); //Force display so you see battery level immediately at power on
 
-  beginBT(); //Get MAC, start radio
+  beginBluetooth(); //Get MAC, start radio
 
   beginGNSS(); //Connect and configure ZED-F9P
 
@@ -289,7 +287,7 @@ void loop()
 
     baseState = BASE_OFF;
 
-    startBluetooth(); //Restart Bluetooth with 'Rover' name
+    beginBluetooth(); //Restart Bluetooth with 'Rover' name
 
     //If we are survey'd in, but switch is rover then disable survey
     if (configureUbloxModuleRover() == false)
@@ -311,7 +309,7 @@ void loop()
 
     //Restart Bluetooth with 'Base' name
     //We start BT regardless of Ntrip Server in case user wants to transmit survey-in stats over BT
-    startBluetooth();
+    beginBluetooth();
 
     baseState = BASE_SURVEYING_IN_NOTSTARTED; //Switch to new state
   }

Firmware/RTK_Surveyor/System.ino

@@ -1,100 +1,32 @@
-//Tack device's MAC address to end of friendly broadcast name
-//This allows multiple units to be on at same time
-bool startBluetooth()
-{
-  //Shutdown any previous WiFi
-  caster.stop();
-  WiFi.mode(WIFI_OFF);
-  radioState = RADIO_OFF;
-
-  btStart();
-
-  if (digitalRead(baseSwitch) == HIGH)
-  {
-    //Rover mode
-    sprintf(deviceName, "Surveyor Rover-%02X%02X", unitMACAddress[4], unitMACAddress[5]);
-  }
-  else
-  {
-    //Base mode
-    sprintf(deviceName, "Surveyor Base-%02X%02X", unitMACAddress[4], unitMACAddress[5]);
-  }
-
-  if (SerialBT.begin(deviceName) == false)
-  {
-    Serial.println(F("An error occurred initializing Bluetooth"));
-    radioState = RADIO_OFF;
-    digitalWrite(bluetoothStatusLED, LOW);
-    return (false);
-  }
-
-  Serial.print(F("Bluetooth broadcasting as: "));
-  Serial.println(deviceName);
-
-  radioState = BT_ON_NOCONNECTION;
-  digitalWrite(bluetoothStatusLED, HIGH);
-  lastBluetoothLEDBlink = millis();
-
-  //Start the tasks for handling incoming and outgoing BT bytes to/from ZED-F9P
-  //Reduced stack size from 10,000 to 1,000 to make room for WiFi/NTRIP server capabilities
-  xTaskCreate(F9PSerialReadTask, "F9Read", 1000, NULL, 0, &F9PSerialReadTaskHandle);
-  xTaskCreate(F9PSerialWriteTask, "F9Write", 1000, NULL, 0, &F9PSerialWriteTaskHandle);
-
-  SerialBT.setTimeout(1);
-
-  return (true);
-}
-
-//Turn off BT so we can go into WiFi mode
-bool endBluetooth()
-{
-  //Kill tasks if running
-  if (F9PSerialReadTaskHandle != NULL)
-  {
-    vTaskDelete(F9PSerialReadTaskHandle);
-    F9PSerialReadTaskHandle = NULL;
-  }
-  if (F9PSerialWriteTaskHandle != NULL)
-  {
-    vTaskDelete(F9PSerialWriteTaskHandle);
-    F9PSerialWriteTaskHandle = NULL;
-  }
-
-  //SerialBT.end();
-  customBTstop(); //Gracefully turn off Bluetooth so we can turn it back on if needed
-
-  Serial.println(F("Bluetooth turned off"));
-}
-
 //Starting and restarting BT is a problem. See issue: https://github.com/espressif/arduino-esp32/issues/2718
 //To work around the bug without modifying the core we create our own btStop() function with
 //the patch from github
-bool customBTstop() {
-  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
-    return true;
-  }
-  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) {
-    if (esp_bt_controller_disable()) {
-      log_e("BT Disable failed");
-      return false;
-    }
-    while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED);
-  }
-  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED)
-  {
-    log_i("inited");
-    if (esp_bt_controller_deinit())
-    {
-      log_e("BT deint failed");
-      return false;
-    }
-    while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED)
-      ;
-    return true;
-  }
-  log_e("BT Stop failed");
-  return false;
-}
+//bool customBTstop() {
+//  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
+//    return true;
+//  }
+//  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED) {
+//    if (esp_bt_controller_disable()) {
+//      log_e("BT Disable failed");
+//      return false;
+//    }
+//    while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_ENABLED);
+//  }
+//  if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED)
+//  {
+//    log_i("inited");
+//    if (esp_bt_controller_deinit())
+//    {
+//      log_e("BT deint failed");
+//      return false;
+//    }
+//    while (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_INITED)
+//      ;
+//    return true;
+//  }
+//  log_e("BT Stop failed");
+//  return false;
+//}
 
 //If the phone has any new data (NTRIP RTCM, etc), read it in over Bluetooth and pass along to ZED
 //Task for writing to the GNSS receiver
@@ -641,7 +573,6 @@ void btCallback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
     Serial.println(F("Client disconnected"));
     radioState = BT_ON_NOCONNECTION;
     digitalWrite(bluetoothStatusLED, LOW);
-    lastBluetoothLEDBlink = millis();
   }
 }
 

Firmware/RTK_Surveyor/begin.ino

@@ -153,14 +153,75 @@ void beginGNSS()
 }
 
 //Get MAC, start radio
-void beginBT()
+//Tack device's MAC address to end of friendly broadcast name
+//This allows multiple units to be on at same time
+bool beginBluetooth()
 {
+  //Shutdown any previous WiFi
+  caster.stop();
+  WiFi.mode(WIFI_OFF);
+  radioState = RADIO_OFF;
+
+  //Due to a known issue, you cannot call esp_bt_controller_enable() a second time
+  //to change the controller mode dynamically. To change controller mode, call
+  //esp_bt_controller_disable() and then call esp_bt_controller_enable() with the new mode.
+
+  //btStart(); //In v1.1 we do not turn off or on the bt radio. See WiFiBluetooSwitch sketch for more info:
+
   //Get unit MAC address
   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
 
+  if (digitalRead(baseSwitch) == HIGH)
+    sprintf(deviceName, "Surveyor Rover-%02X%02X", unitMACAddress[4], unitMACAddress[5]); //Rover mode
+  else
+    sprintf(deviceName, "Surveyor Base-%02X%02X", unitMACAddress[4], unitMACAddress[5]); //Base mode
+
+  if (SerialBT.begin(deviceName) == false)
+  {
+    Serial.println(F("An error occurred initializing Bluetooth"));
+    radioState = RADIO_OFF;
+    digitalWrite(bluetoothStatusLED, LOW);
+    return (false);
+  }
   SerialBT.register_callback(btCallback);
-  startBluetooth();
+  SerialBT.setTimeout(1);
+
+  Serial.print(F("Bluetooth broadcasting as: "));
+  Serial.println(deviceName);
+
+  radioState = BT_ON_NOCONNECTION;
+  digitalWrite(bluetoothStatusLED, HIGH);
+
+  //Start the tasks for handling incoming and outgoing BT bytes to/from ZED-F9P
+  //Reduced stack size from 10,000 to 1,000 to make room for WiFi/NTRIP server capabilities
+  if(F9PSerialReadTaskHandle == NULL) xTaskCreate(F9PSerialReadTask, "F9Read", 1000, NULL, 0, &F9PSerialReadTaskHandle);
+  if(F9PSerialWriteTaskHandle == NULL) xTaskCreate(F9PSerialWriteTask, "F9Write", 1000, NULL, 0, &F9PSerialWriteTaskHandle);
+
+  return (true);
+}
+
+//Turn off BT so we can go into WiFi mode
+bool endBluetooth()
+{
+  //Delete tasks if running
+//  if (F9PSerialReadTaskHandle != NULL)
+//  {
+//    vTaskDelete(F9PSerialReadTaskHandle);
+//    F9PSerialReadTaskHandle = NULL;
+//  }
+//  if (F9PSerialWriteTaskHandle != NULL)
+//  {
+//    vTaskDelete(F9PSerialWriteTaskHandle);
+//    F9PSerialWriteTaskHandle = NULL;
+//  }
+
+  SerialBT.flush();
+  SerialBT.disconnect();
+  //SerialBT.end(); //Do not call both end and custom stop
+  //customBTstop(); //Gracefully turn off Bluetooth so we can turn it back on if needed
+
+  Serial.println(F("Bluetooth turned off"));
 }
 
 //Set LEDs for output and configure PWM