Pass rx/tx buffer size to BluetoothSerial library

See original mods at: sparkfun/SparkFun_RTK_Firmware@bc06787

Escalated the "RX Full!" log_d to a Serial.print.

Author: nseidle

Firmware/RTK_Everywhere/Bluetooth.ino

@@ -292,17 +292,17 @@ void bluetoothStart()
         if (settings.bluetoothRadioType == BLUETOOTH_RADIO_SPP_AND_BLE)
         {
             beginSuccess &=
-                bluetoothSerialBle->begin(deviceName, false, settings.sppRxQueueSize,
-                                          settings.sppTxQueueSize); // localName, isMaster, rxBufferSize, txBufferSize
+                bluetoothSerialBle->begin(deviceName, false, false, settings.sppRxQueueSize,
+                                          settings.sppTxQueueSize); // localName, isMaster, disableBLE, rxBufferSize, txBufferSize
             beginSuccess &=
-                bluetoothSerialSpp->begin(deviceName, false, settings.sppRxQueueSize,
-                                          settings.sppTxQueueSize); // localName, isMaster, rxBufferSize, txBufferSize
+                bluetoothSerialSpp->begin(deviceName, false, false, settings.sppRxQueueSize,
+                                          settings.sppTxQueueSize); // localName, isMaster, disableBLE, rxBufferSize, txBufferSize
         }
         else
         {
             beginSuccess &=
-                bluetoothSerial->begin(deviceName, false, settings.sppRxQueueSize,
-                                       settings.sppTxQueueSize); // localName, isMaster, rxBufferSize, txBufferSize
+                bluetoothSerial->begin(deviceName, false, true, settings.sppRxQueueSize,
+                                       settings.sppTxQueueSize); // localName, isMaster, disableBLE, rxBufferSize, txBufferSize
         }
 
         if (beginSuccess == false)

Firmware/RTK_Everywhere/bluetoothSelect.h

@@ -3,14 +3,14 @@
 // We use a local copy of the BluetoothSerial library so that we can increase the RX buffer. See issues:
 // https://github.com/sparkfun/SparkFun_RTK_Firmware/issues/23
 // https://github.com/sparkfun/SparkFun_RTK_Firmware/issues/469
-#include <BluetoothSerial.h>
+#include "src/BluetoothSerial/BluetoothSerial.h"
 
 #include <BleSerial.h> //Click here to get the library: http://librarymanager/All#ESP32_BleSerial v1.0.4 by Avinab Malla
 
 class BTSerialInterface
 {
   public:
-    virtual bool begin(String deviceName, bool isMaster, uint16_t rxQueueSize, uint16_t txQueueSize) = 0;
+    virtual bool begin(String deviceName, bool isMaster, bool disableBLE, uint16_t rxQueueSize, uint16_t txQueueSize) = 0;
     virtual void disconnect() = 0;
     virtual void end() = 0;
     virtual esp_err_t register_callback(esp_spp_cb_t callback) = 0;
@@ -31,9 +31,9 @@ class BTClassicSerial : public virtual BTSerialInterface, public BluetoothSerial
     // Everything is already implemented in BluetoothSerial since the code was
     // originally written using that class
   public:
-    bool begin(String deviceName, bool isMaster, uint16_t rxQueueSize, uint16_t txQueueSize)
+    bool begin(String deviceName, bool isMaster, bool disableBLE, uint16_t rxQueueSize, uint16_t txQueueSize)
     {
-        return BluetoothSerial::begin(deviceName, isMaster); //, rxQueueSize, txQueueSize); v3.0.0 has no QueueSize parameters
+        return BluetoothSerial::begin(deviceName, isMaster, disableBLE, rxQueueSize, txQueueSize);
     }
 
     void disconnect()
@@ -91,7 +91,7 @@ class BTLESerial : public virtual BTSerialInterface, public BleSerial
 {
   public:
     // Missing from BleSerial
-    bool begin(String deviceName, bool isMaster, uint16_t rxQueueSize, uint16_t txQueueSize)
+    bool begin(String deviceName, bool isMaster, bool disableBLE, uint16_t rxQueueSize, uint16_t txQueueSize)
     {
         BleSerial::begin(deviceName.c_str());
         return true;

Firmware/RTK_Everywhere/src/BluetoothSerial/BluetoothSerial.cpp

@@ -40,8 +40,8 @@
 
 const char *_spp_server_name = "ESP32SPP";
 
-#define RX_QUEUE_SIZE         512
-#define TX_QUEUE_SIZE         32
+// #define RX_QUEUE_SIZE         512
+// #define TX_QUEUE_SIZE         32
 #define SPP_TX_QUEUE_TIMEOUT  1000
 #define SPP_TX_DONE_TIMEOUT   1000
 #define SPP_CONGESTED_TIMEOUT 1000
@@ -347,7 +347,7 @@ static void esp_spp_cb(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
       } else if (_spp_rx_queue != NULL) {
         for (int i = 0; i < param->data_ind.len; i++) {
           if (xQueueSend(_spp_rx_queue, param->data_ind.data + i, (TickType_t)0) != pdTRUE) {
-            log_e("RX Full! Discarding %u bytes", param->data_ind.len - i);
+            Serial.printf("RX Full! Discarding %u bytes\r\n", param->data_ind.len - i);
             break;
           }
         }
@@ -616,7 +616,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, bt_mode mode) {
+static bool _init_bt(const char *deviceName, bt_mode mode, uint16_t rxQueueSize, uint16_t txQueueSize) {
   if (!_bt_event_group) {
     _bt_event_group = xEventGroupCreate();
     if (!_bt_event_group) {
@@ -637,14 +637,16 @@ static bool _init_bt(const char *deviceName, bt_mode mode) {
     xEventGroupSetBits(_spp_event_group, SPP_CLOSED);
   }
   if (_spp_rx_queue == NULL) {
-    _spp_rx_queue = xQueueCreate(RX_QUEUE_SIZE, sizeof(uint8_t));  //initialize the queue
+    //_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(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");
       return false;
@@ -820,12 +822,13 @@ BluetoothSerial::~BluetoothSerial(void) {
  * @param isMaster set to true if you want to connect to an other device
  * @param disableBLE if BLE is not used, its ram can be freed to get +10kB free ram
  */
-bool BluetoothSerial::begin(String localName, bool isMaster, bool disableBLE) {
+//bool BluetoothSerial::begin(String localName, bool isMaster, bool disableBLE) {
+bool BluetoothSerial::begin(String localName, bool isMaster, bool disableBLE, uint16_t rxQueueSize, uint16_t txQueueSize) {
   _isMaster = isMaster;
   if (localName.length()) {
     local_name = localName;
   }
-  return _init_bt(local_name.c_str(), disableBLE ? BT_MODE_CLASSIC_BT : BT_MODE_BTDM);
+  return _init_bt(local_name.c_str(), disableBLE ? BT_MODE_CLASSIC_BT : BT_MODE_BTDM, rxQueueSize, txQueueSize);
 }
 
 int BluetoothSerial::available(void) {

Firmware/RTK_Everywhere/src/BluetoothSerial/BluetoothSerial.h

@@ -39,7 +39,7 @@ class BluetoothSerial : public Stream {
   BluetoothSerial(void);
   ~BluetoothSerial(void);
 
-  bool begin(String localName = String(), bool isMaster = false, bool disableBLE = false);
+  bool begin(String localName = String(), bool isMaster = false, bool disableBLE = false, uint16_t rxQueueSize = 512 * 2, uint16_t txQueueSize = 512);
   bool begin(unsigned long baud) {  //compatibility
     return begin();
   }