Updates

Author: PilnyTomas

.github/ISSUE_TEMPLATE/Issue-report.yml

@@ -41,6 +41,7 @@ body:
       options:
         - latest master (checkout manually)
         - latest development Release Candidate (RC-X)
+        - v2.0.11
         - v2.0.10
         - v2.0.9
         - v2.0.8

cores/esp32/HWCDC.cpp

@@ -200,9 +200,18 @@ void HWCDC::begin(unsigned long baud)
     if(tx_lock == NULL) {
         tx_lock = xSemaphoreCreateMutex();
     }
-    setRxBufferSize(256);//default if not preset
-    setTxBufferSize(256);//default if not preset
-
+    //RX Buffer default has 256 bytes if not preset
+    if(rx_queue == NULL) {
+        if (!setRxBufferSize(256)) {
+            log_e("HW CDC RX Buffer error");
+        }
+    }
+    //TX Buffer default has 256 bytes if not preset
+    if (tx_ring_buf == NULL) {
+        if (!setTxBufferSize(256)) {
+            log_e("HW CDC TX Buffer error");
+        }    
+    }
     usb_serial_jtag_ll_disable_intr_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
     usb_serial_jtag_ll_clr_intsts_mask(USB_SERIAL_JTAG_LL_INTR_MASK);
     usb_serial_jtag_ll_ena_intr_mask(USB_SERIAL_JTAG_INTR_SERIAL_IN_EMPTY | USB_SERIAL_JTAG_INTR_SERIAL_OUT_RECV_PKT | USB_SERIAL_JTAG_INTR_BUS_RESET);

cores/esp32/esp32-hal-bt.c

@@ -17,8 +17,12 @@
 #if SOC_BT_SUPPORTED
 #ifdef CONFIG_BT_ENABLED
 
+#if CONFIG_IDF_TARGET_ESP32
+bool btInUse(){ return true; }
+#else
 // user may want to change it to free resources
 __attribute__((weak)) bool btInUse(){ return true; }
+#endif
 
 #include "esp_bt.h"
 

cores/esp32/esp32-hal-misc.c

@@ -243,9 +243,15 @@ bool verifyRollbackLater() { return false; }
 #endif
 
 #ifdef CONFIG_BT_ENABLED
+#if CONFIG_IDF_TARGET_ESP32
+//overwritten in esp32-hal-bt.c
+bool btInUse() __attribute__((weak));
+bool btInUse(){ return false; }
+#else
 //from esp32-hal-bt.c
 extern bool btInUse();
 #endif
+#endif
 
 void initArduino()
 {

libraries/BluetoothSerial/README.md

@@ -6,7 +6,7 @@ Note: Since version 3.0.0 this library does not support legacy pairing (using fi
 
 ### How to use it?
 
-There are 3 basic use cases: phone, other ESP32 or any MCU with BT serial module
+There are 3 basic use cases: phone, other ESP32 or any MCU with a Bluetooth serial module
 
 #### Phone
 
@@ -28,9 +28,9 @@ There are 3 basic use cases: phone, other ESP32 or any MCU with BT serial module
 You can flash one of the ESP32 with the example [`SerialToSerialBTM`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino) (the Master) and another ESP32 with [`SerialToSerialBT`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino) (the Slave).
 Those examples are preset to work out-of-the-box but they should be scalable to connect multiple Slaves to the Master.
 
-#### 3rd party Serial BT module
+#### 3rd party Serial Bluetooth module
 
-Using 3rd party Serial BT module will require to study the documentation of the particular module in order to make it work, however, one side can utilize the mentioned [`SerialToSerialBTM`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino) (the Master) or [`SerialToSerialBT`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino) (the Slave).
+Using a 3rd party Serial Bluetooth module will require to study the documentation of the particular module in order to make it work, however, one side can utilize the mentioned [`SerialToSerialBTM`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino) (the Master) or [`SerialToSerialBT`](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino) (the Slave).
 
 ### Pairing options
 
@@ -48,8 +48,7 @@ This method will authenticate automatically any attempt to pair and should not b
 
 The usage of SSP provides a secure connection. This option is demonstrated in the example `SerialToSerialBT_SSP``](https://github.com/espressif/arduino-esp32/blob/master/libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/SerialToSerialBT_SSP.ino)
 
-The Secure Simple Pairing is enabled by calling method `enableSSP` which has two variants - one is backward compatible without parameter `enableSSP()` and second with parameters `enableSSP(bool inputCapability, bool outputCapability)`.
-Alternatively, the SSP can be disabled by `disableSSP()`
+The Secure Simple Pairing is enabled by calling method `enableSSP` which has two variants - one is backward compatible without parameter `enableSSP()` and second with parameters `enableSSP(bool inputCapability, bool outputCapability)`. Similarly, the SSP can be disabled by calling `disableSSP()`.
 
 Both options must be called before `begin()` or if it is called after `begin()` the driver needs to be restarted (call `end()` followed by `begin()`) in order to take in effect enabling or disabling the SSP.
 

libraries/BluetoothSerial/examples/DiscoverConnect/DiscoverConnect.ino

@@ -29,8 +29,8 @@
 BluetoothSerial SerialBT;
 
 #define BT_DISCOVER_TIME  10000
-esp_spp_sec_t sec_mask=ESP_SPP_SEC_NONE; // or ESP_SPP_SEC_ENCRYPT|ESP_SPP_SEC_AUTHENTICATE to request pincode confirmation
-esp_spp_role_t role=ESP_SPP_ROLE_SLAVE; // or ESP_SPP_ROLE_MASTER
+esp_spp_sec_t sec_mask = ESP_SPP_SEC_NONE; // or ESP_SPP_SEC_ENCRYPT|ESP_SPP_SEC_AUTHENTICATE to request pincode confirmation
+esp_spp_role_t role = ESP_SPP_ROLE_SLAVE; // or ESP_SPP_ROLE_MASTER
 
 // std::map<BTAddress, BTAdvertisedDeviceSet> btDeviceList;
 

libraries/BluetoothSerial/examples/SerialToSerialBT/SerialToSerialBT.ino

@@ -9,14 +9,14 @@
 
 String device_name = "ESP32-BT-Slave";
 
-// Check if BlueTooth is available
+// Check if Bluetooth is available
 #if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
   #error Bluetooth is not enabled! Please run `make menuconfig` to and enable it
 #endif
 
 // Check Serial Port Profile
 #if !defined(CONFIG_BT_SPP_ENABLED)
-  #error Serial Port Profile for BlueTooth is not available or not enabled. It is only available for the ESP32 chip.
+  #error Serial Port Profile for Bluetooth is not available or not enabled. It is only available for the ESP32 chip.
 #endif
 
 BluetoothSerial SerialBT;

libraries/BluetoothSerial/examples/SerialToSerialBTM/SerialToSerialBTM.ino

@@ -19,14 +19,14 @@
 
 #define USE_NAME // Comment this to use MAC address instead of a slaveName
 
-// Check if BlueTooth is available
+// Check if Bluetooth is available
 #if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
   #error Bluetooth is not enabled! Please run `make menuconfig` to and enable it
 #endif
 
 // Check Serial Port Profile
 #if !defined(CONFIG_BT_SPP_ENABLED)
-  #error Serial Port Profile for BlueTooth is not available or not enabled. It is only available for the ESP32 chip.
+  #error Serial Port Profile for Bluetooth is not available or not enabled. It is only available for the ESP32 chip.
 #endif
 BluetoothSerial SerialBT;
 

libraries/BluetoothSerial/examples/SerialToSerialBT_Legacy/SerialToSerialBT_Legacy.ino

@@ -7,19 +7,19 @@
 
 #include "BluetoothSerial.h"
 
-// Check if BlueTooth is available
+// Check if Bluetooth is available
 #if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
   #error Bluetooth is not enabled! Please run `make menuconfig` to and enable it
 #endif
 
 // Check Serial Port Profile
 #if !defined(CONFIG_BT_SPP_ENABLED)
-  #error Serial Port Profile for BlueTooth is not available or not enabled. It is only available for the ESP32 chip.
+  #error Serial Port Profile for Bluetooth is not available or not enabled. It is only available for the ESP32 chip.
 #endif
 
 // Check Simple Secure Pairing
 #if defined(CONFIG_BT_SSP_ENABLED)
-  #warning Legacy Pairing is disabled (the CONFIG_BT_SSP_ENABLED is enabled) disable it in menuconfig.
+  #warning Legacy Pairing is disabled (CONFIG_BT_SSP_ENABLED is enabled. Disable it in menuconfig).
   void setup(){}
   void loop(){}
 #else
@@ -32,20 +32,19 @@ void BTAuthCompleteCallback(boolean success){
   if (success){
     confirmRequestDone = true;
     Serial.println("Pairing success!!");
-  }
-  else{
+  } else {
     Serial.println("Pairing failed, rejected by user!!");
   }
 }
 
 void serial_response(){
   if (Serial.available()){
-      SerialBT.write(Serial.read());
-    }
-    if (SerialBT.available()){
-      Serial.write(SerialBT.read());
-    }
-    delay(20);
+    SerialBT.write(Serial.read());
+  }
+  if (SerialBT.available()){
+    Serial.write(SerialBT.read());
+  }
+  delay(20);
 }
 
 void setup(){
@@ -59,8 +58,8 @@ void setup(){
 void loop(){
   if (confirmRequestDone){
     serial_response();
-  }else{
+  } else {
     delay(1); // Feed the watchdog
   }
 }
-#endif
+#endif

libraries/BluetoothSerial/examples/SerialToSerialBT_SSP/SerialToSerialBT_SSP.ino

@@ -12,19 +12,19 @@
 
 //#define AUTO_PAIR // Uncomment to automatically authenticate ESP32 side
 
-// Check if BlueTooth is available
+// Check if Bluetooth is available
 #if !defined(CONFIG_BT_ENABLED) || !defined(CONFIG_BLUEDROID_ENABLED)
   #error Bluetooth is not enabled! Please run `make menuconfig` to and enable it
 #endif
 
 // Check Serial Port Profile
 #if !defined(CONFIG_BT_SPP_ENABLED)
-  #error Serial Port Profile for BlueTooth is not available or not enabled. It is only available for the ESP32 chip.
+  #error Serial Port Profile for Bluetooth is not available or not enabled. It is only available for the ESP32 chip.
 #endif
 
 // Check Simple Secure Pairing
 #if !defined(CONFIG_BT_SSP_ENABLED)
-  #error Simple Secure Pairing for BlueTooth is not available or not enabled.
+  #error Simple Secure Pairing for Bluetooth is not available or not enabled.
 #endif
 
 const char * deviceName = "ESP32_SSP_example";
@@ -48,17 +48,17 @@ void BTConfirmRequestCallback(uint32_t numVal){
 #ifndef AUTO_PAIR
   Serial.printf("The PIN is: %06lu. If it matches number displayed on the other device write \'Y\' or \'y\':\n", numVal); // Note the formatting "%06lu" - PIN can start with zero(s) which would be ignored with simple "%lu"
   while (!Serial.available()) {
-      delay(1); // Feed the watchdog
-      // Wait until data is available on the Serial port.
-    }
-    Serial.printf("Oh you sent %d Bytes, lets see...", Serial.available());
-    int dat = Serial.read();
-    if (dat == 'Y' || dat == 'y'){
-      SerialBT.confirmReply(true);
-    }
-    else{
-      SerialBT.confirmReply(false);
-    }
+    delay(1); // Feed the watchdog
+    // Wait until data is available on the Serial port.
+  }
+  Serial.printf("Oh you sent %d Bytes, lets see...", Serial.available());
+  int dat = Serial.read();
+  if (dat == 'Y' || dat == 'y'){
+    SerialBT.confirmReply(true);
+  }
+  else{
+    SerialBT.confirmReply(false);
+  }
 #else
   SerialBT.confirmReply(true);
 #endif
@@ -90,20 +90,19 @@ void BTAuthCompleteCallback(boolean success){
   if (success){
     confirmRequestDone = true;
     Serial.println("Pairing success!!");
-  }
-  else{
+  } else {
     Serial.println("Pairing failed, rejected by user!!");
   }
 }
 
 void serial_response(){
   if (Serial.available()){
-      SerialBT.write(Serial.read());
-    }
-    if (SerialBT.available()){
-      Serial.write(SerialBT.read());
-    }
-    delay(20);
+    SerialBT.write(Serial.read());
+  }
+  if (SerialBT.available()){
+    Serial.write(SerialBT.read());
+  }
+  delay(20);
 }
 
 void setup(){
@@ -129,7 +128,7 @@ void setup(){
 void loop(){
   if (confirmRequestDone){
     serial_response();
-  }else{
+  } else {
     delay(1); // Feed the watchdog
   }
 }

libraries/BluetoothSerial/examples/bt_remove_paired_devices/bt_remove_paired_devices.ino

@@ -43,7 +43,7 @@ void setup(){
   int count = SerialBT.getNumberOfBondedDevices();
   if(!count){
     Serial.println("No bonded devices found.");
-  }else{
+  } else {
     Serial.printf("Bonded device count: %d\n", count);
     if(PAIR_MAX_DEVICES < count){
       count = PAIR_MAX_DEVICES;
@@ -62,7 +62,7 @@ void setup(){
         if(REMOVE_BONDED_DEVICES){
           if(SerialBT.deleteBondedDevice(pairedDeviceBtAddr[i])){
             Serial.printf("Removed bonded device # %d\n", i);
-          }else{
+          } else {
             Serial.printf("Failed to remove bonded device # %d", i);
           } // if(ESP_OK == tError)
         } // if(REMOVE_BONDED_DEVICES)
@@ -71,4 +71,4 @@ void setup(){
   } // if(!count)
 }
 
-void loop() {}
+void loop() {}

libraries/BluetoothSerial/src/BluetoothSerial.cpp

@@ -573,8 +573,7 @@ static void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *pa
             if (key_request_callback) {
                 memcpy(current_bd_addr, param->cfm_req.bda, sizeof(esp_bd_addr_t));
                 key_request_callback();
-            }
-            else {
+            } else {
                 log_w("ESP_BT_GAP_KEY_REQ_EVT: key_request_callback does not exist - refuseing pairing");
                 esp_bt_gap_ssp_confirm_reply(param->cfm_req.bda, false);
             }
@@ -1355,7 +1354,7 @@ void BluetoothSerial::deleteAllBondedDevices(){
     if(expected_dev_num == 0){
         log_i("No devices in cache.");
         return;
-    }else{
+    } else {
         log_d("Found %d bonded devices", expected_dev_num);
     }
     esp_err_t ret;
@@ -1382,7 +1381,7 @@ void BluetoothSerial::deleteAllBondedDevices(){
             log_d("esp_bt_gap_remove_bond_device ret = %d", ret);
             if(ret == ESP_OK){
                 log_d("Removed bonded device #%d", i);
-            }else{
+            } else {
                 log_w("Failed to removed bonded device #%d", i);
             }
             //btc_storage_remove_bonded_device(dev_list[i]);

libraries/HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino

@@ -33,8 +33,7 @@ void setup(void) {
     Serial.println("WiFi failed, retrying.");
   }
 
-  MDNS.begin(host);
-  if (MDNS.begin("esp32")) {
+  if (MDNS.begin(host)) {
     Serial.println("mDNS responder started");
   }