Update BTSerial library with ESP32 core v2.0.2

Author: nseidle

Firmware/RTK_Surveyor/src/BluetoothSerial/BTAddress.cpp

@@ -7,7 +7,7 @@
  *      Author: Thomas M. (ArcticSnowSky)
  */
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 
 #include "BTAddress.h"
 #include <string>

Firmware/RTK_Surveyor/src/BluetoothSerial/BTAddress.h

@@ -10,7 +10,7 @@
 #ifndef COMPONENTS_CPP_UTILS_BTADDRESS_H_
 #define COMPONENTS_CPP_UTILS_BTADDRESS_H_
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 #include <esp_gap_bt_api.h> // ESP32 BT
 #include <string>
 

Firmware/RTK_Surveyor/src/BluetoothSerial/BTAdvertisedDeviceSet.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 
 //#include <map>
 

Firmware/RTK_Surveyor/src/BluetoothSerial/BTScanResultsSet.cpp

@@ -6,7 +6,7 @@
  */
 
 #include "sdkconfig.h"
-#if defined(CONFIG_BT_ENABLED)
+#if defined(CONFIG_BT_ENABLED) && defined(CONFIG_BLUEDROID_ENABLED)
 
 
 #include <esp_err.h>

Firmware/RTK_Surveyor/src/BluetoothSerial/BluetoothSerial.cpp

@@ -41,11 +41,9 @@
 const char * _spp_server_name = "ESP32SPP";
 
 //Now passed in during begin()
-//#define RX_QUEUE_SIZE (512 * 4) //Increase to facilitate larger NTRIP transfers
-//#define TX_QUEUE_SIZE 512 //Increase to facilitate high transmission rates
-
 //#define RX_QUEUE_SIZE 512 //Original
 //#define TX_QUEUE_SIZE 32
+
 #define SPP_TX_QUEUE_TIMEOUT 1000
 #define SPP_TX_DONE_TIMEOUT 1000
 #define SPP_CONGESTED_TIMEOUT 1000
@@ -542,6 +540,7 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
     }
 }
 
+//static bool _init_bt(const char *deviceName)
 static bool _init_bt(const char *deviceName, uint16_t rxQueueSize, uint16_t txQueueSize)
 {
     if(!_bt_event_group){
@@ -563,13 +562,15 @@ static bool _init_bt(const char *deviceName, uint16_t rxQueueSize, uint16_t txQu
         xEventGroupSetBits(_spp_event_group, SPP_DISCONNECTED);
     }
     if (_spp_rx_queue == NULL){
+        //_spp_rx_queue = xQueueCreate(RX_QUEUE_SIZE, sizeof(uint8_t)); //initialize the queue
         _spp_rx_queue = xQueueCreate(rxQueueSize, sizeof(uint8_t)); //initialize the queue
         if (_spp_rx_queue == NULL){
             log_e("RX Queue Create Failed");
             return false;
         }
     }
     if (_spp_tx_queue == NULL){
+        //_spp_tx_queue = xQueueCreate(TX_QUEUE_SIZE, sizeof(spp_packet_t*)); //initialize the queue
         _spp_tx_queue = xQueueCreate(txQueueSize, sizeof(spp_packet_t*)); //initialize the queue
         if (_spp_tx_queue == NULL){
             log_e("TX Queue Create Failed");
@@ -728,12 +729,14 @@ BluetoothSerial::~BluetoothSerial(void)
     _stop_bt();
 }
 
+//bool BluetoothSerial::begin(String localName, bool isMaster)
 bool BluetoothSerial::begin(String localName, bool isMaster, uint16_t rxQueueSize, uint16_t txQueueSize)
 {
     _isMaster = isMaster;
     if (localName.length()){
         local_name = localName;
     }
+    //return _init_bt(local_name.c_str());
     return _init_bt(local_name.c_str(), rxQueueSize, txQueueSize);
 }
 
@@ -1027,5 +1030,4 @@ BluetoothSerial::operator bool() const
 bool BluetoothSerial::isCongested(){
     return(!(xEventGroupGetBits(_spp_event_group) & SPP_CONGESTED));
 }
-
 #endif