Merge branch 'release/v2.x' of https://github.com/espressif/arduino-esp32 into release/v2.x

Author: P-R-O-C-H-Y

.github/workflows/allboards.yml

@@ -32,7 +32,11 @@ jobs:
       test-chunks: ${{ steps['set-test-chunks'].outputs['test-chunks'] }}
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.client_payload.branch }}
+
       - run: npm install
       - name: Setup jq
         uses: dcarbone/install-jq-action@v1.0.1
@@ -63,6 +67,8 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.client_payload.branch }}
 
       - name: Echo FQBNS to file
         run:

boards.txt

@@ -173,9 +173,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/HWCDC.cpp

@@ -16,8 +16,12 @@
 
 #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-bt.c

@@ -167,6 +167,9 @@ extern void __attachInterruptFunctionalArg(uint8_t pin, voidFuncPtrArg userFunc,
 {
     static bool interrupt_initialized = false;
 
+    // makes sure that pin -1 (255) will never work -- this follows Arduino standard
+    if (pin >= SOC_GPIO_PIN_COUNT) return;
+
     if(!interrupt_initialized) {
     	esp_err_t err = gpio_install_isr_service((int)ARDUINO_ISR_FLAG);
     	interrupt_initialized = (err == ESP_OK) || (err == ESP_ERR_INVALID_STATE);

cores/esp32/esp32-hal-gpio.c

@@ -51,7 +51,7 @@ extern "C" {
 #define PULLDOWN          0x08
 #define INPUT_PULLDOWN    0x09
 #define OPEN_DRAIN        0x10
-#define OUTPUT_OPEN_DRAIN 0x12
+#define OUTPUT_OPEN_DRAIN 0x13
 #define ANALOG            0xC0
 
 //Interrupt Modes

cores/esp32/esp32-hal-gpio.h

@@ -234,13 +234,13 @@ void analogWrite(uint8_t pin, int value) {
             return;
         }
         ledcAttachPin(pin, channel);
-        pin_to_channel[pin] = channel;
+        pin_to_channel[pin] = channel + 1;
         ledcWrite(channel, value);
     }
 }
 
 int8_t analogGetChannel(uint8_t pin) {
-    return pin_to_channel[pin];
+    return pin_to_channel[pin] - 1;
 }
 
 void analogWriteFrequency(uint32_t freq) {

cores/esp32/esp32-hal-ledc.c

@@ -209,9 +209,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()
 {

cores/esp32/esp32-hal-misc.c

@@ -48,8 +48,8 @@ This function will return analog value in millivolts.
 analogReadResolution
 ^^^^^^^^^^^^^^^^^^^^
 
-This function is used to set the resolution of ``analogRead`` return value. Default is 12 bits (range from 0 to 4096) 
-for all chips except ESP32S3 where default is 13 bits (range from 0 to 8192). 
+This function is used to set the resolution of ``analogRead`` return value. Default is 12 bits (range from 0 to 4095) 
+for all chips except ESP32S3 where default is 13 bits (range from 0 to 8191). 
 When different resolution is set, the values read will be shifted to match the given resolution.
 
 Range is 1 - 16 .The default value will be used, if this function is not used.
@@ -205,4 +205,4 @@ Here is an example of how to use the ADC.
 .. literalinclude:: ../../../libraries/ESP32/examples/AnalogRead/AnalogRead.ino
     :language: arduino
 
-Or you can run Arduino example 01.Basics -> AnalogReadSerial.
+Or you can run Arduino example 01.Basics -> AnalogReadSerial.

docs/source/api/adc.rst

@@ -14,21 +14,4 @@ Note that modifying ``sdkconfig`` or ``sdkconfig.h`` files found in the arduino-
 How to compile libs with different debug level?
 -----------------------------------------------
 
-The short answer is ``esp32-arduino-lib-builder/configs/defconfig.common:44``. A guide explaining the process can be found here <guides/core_debug>
-
-SPIFFS mount failed
--------------------
-When you come across and error like this:
-
-.. code-block:: shell
-
-   E (588) SPIFFS: mount failed, -10025
-   [E][SPIFFS.cpp:47] begin(): Mounting SPIFFS failed! Error: -1
-
-Try enforcing format on fail in your code by adding ``true`` in the ``begin`` method such as this:
-
-.. code-block:: c++
-
-   SPIFFS.begin(true);
-
-See the method prototype for reference: ``bool begin(bool formatOnFail=false, const char * basePath="/spiffs", uint8_t maxOpenFiles=10, const char * partitionLabel=NULL);``
+The short answer is ``esp32-arduino-lib-builder/configs/defconfig.common:44``. A guide explaining the process can be found here <guides/core_debug>