Merge branch 'espressif:release/v2.x' into release/v2.x

Author: Jason2866

.github/scripts/find_new_boards.sh

@@ -86,5 +86,5 @@ then
     echo $json_matrix
     echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
 else
-    echo "FQBNS=''" >> $GITHUB_ENV
+    echo "FQBNS=" >> $GITHUB_ENV
 fi

.github/workflows/boards.yml

@@ -1,4 +1,4 @@
-name: New Board Test
+name: Boards Test
 
 # The workflow will run on schedule and labeled pull requests
 on:
@@ -30,7 +30,7 @@ jobs:
   test-boards:
     needs: find-boards
     runs-on: ubuntu-latest
-    if: ${{ needs.changes.outputs.services != '' }}
+    if: needs.find-boards.outputs.fqbns != ''
 
     env:
       REPOSITORY: |
@@ -58,4 +58,4 @@ jobs:
             - --warnings="all"
           exit-on-fail: true
           sketch-paths:
-            "- ./libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino"
+            "- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"

boards.txt

@@ -6095,6 +6095,174 @@ lolin_s3.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+lolin_s3_mini.name=LOLIN S3 Mini
+lolin_s3_mini.vid.0=0x303a
+lolin_s3_mini.pid.0=0x8167
+
+lolin_s3_mini.bootloader.tool=esptool_py
+lolin_s3_mini.bootloader.tool.default=esptool_py
+
+lolin_s3_mini.upload.tool=esptool_py
+lolin_s3_mini.upload.tool.default=esptool_py
+lolin_s3_mini.upload.tool.network=esp_ota
+
+lolin_s3_mini.upload.maximum_size=1310720
+lolin_s3_mini.upload.maximum_data_size=327680
+lolin_s3_mini.upload.flags=
+lolin_s3_mini.upload.extra_flags=
+lolin_s3_mini.upload.use_1200bps_touch=false
+lolin_s3_mini.upload.wait_for_upload_port=false
+
+lolin_s3_mini.serial.disableDTR=false
+lolin_s3_mini.serial.disableRTS=false
+
+lolin_s3_mini.build.tarch=xtensa
+lolin_s3_mini.build.bootloader_addr=0x0
+lolin_s3_mini.build.target=esp32s3
+lolin_s3_mini.build.mcu=esp32s3
+lolin_s3_mini.build.core=esp32
+lolin_s3_mini.build.variant=lolin_s3_mini
+lolin_s3_mini.build.board=LOLIN_S3_MINI
+
+lolin_s3_mini.build.usb_mode=1
+lolin_s3_mini.build.cdc_on_boot=0
+lolin_s3_mini.build.msc_on_boot=0
+lolin_s3_mini.build.dfu_on_boot=0
+lolin_s3_mini.build.f_cpu=240000000L
+lolin_s3_mini.build.flash_size=4MB
+lolin_s3_mini.build.flash_freq=80m
+lolin_s3_mini.build.flash_mode=dio
+lolin_s3_mini.build.boot=qio
+lolin_s3_mini.build.boot_freq=80m
+lolin_s3_mini.build.partitions=default
+lolin_s3_mini.build.defines=-DBOARD_HAS_PSRAM
+lolin_s3_mini.build.loop_core=
+lolin_s3_mini.build.event_core=
+lolin_s3_mini.build.psram_type=qspi
+lolin_s3_mini.build.memory_type={build.boot}_{build.psram_type}
+
+lolin_s3_mini.menu.FlashMode.qio=QIO 80MHz
+lolin_s3_mini.menu.FlashMode.qio.build.flash_mode=dio
+lolin_s3_mini.menu.FlashMode.qio.build.boot=qio
+lolin_s3_mini.menu.FlashMode.qio.build.boot_freq=80m
+lolin_s3_mini.menu.FlashMode.qio.build.flash_freq=80m
+lolin_s3_mini.menu.FlashMode.qio120=QIO 120MHz
+lolin_s3_mini.menu.FlashMode.qio120.build.flash_mode=dio
+lolin_s3_mini.menu.FlashMode.qio120.build.boot=qio
+lolin_s3_mini.menu.FlashMode.qio120.build.boot_freq=120m
+lolin_s3_mini.menu.FlashMode.qio120.build.flash_freq=80m
+
+lolin_s3_mini.menu.LoopCore.1=Core 1
+lolin_s3_mini.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+lolin_s3_mini.menu.LoopCore.0=Core 0
+lolin_s3_mini.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+lolin_s3_mini.menu.EventsCore.1=Core 1
+lolin_s3_mini.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+lolin_s3_mini.menu.EventsCore.0=Core 0
+lolin_s3_mini.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+lolin_s3_mini.menu.USBMode.hwcdc=Hardware CDC and JTAG
+lolin_s3_mini.menu.USBMode.hwcdc.build.usb_mode=1
+lolin_s3_mini.menu.USBMode.default=USB-OTG (TinyUSB)
+lolin_s3_mini.menu.USBMode.default.build.usb_mode=0
+
+lolin_s3_mini.menu.CDCOnBoot.default=Disabled
+lolin_s3_mini.menu.CDCOnBoot.default.build.cdc_on_boot=0
+lolin_s3_mini.menu.CDCOnBoot.cdc=Enabled
+lolin_s3_mini.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+lolin_s3_mini.menu.MSCOnBoot.default=Disabled
+lolin_s3_mini.menu.MSCOnBoot.default.build.msc_on_boot=0
+lolin_s3_mini.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+lolin_s3_mini.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+lolin_s3_mini.menu.DFUOnBoot.default=Disabled
+lolin_s3_mini.menu.DFUOnBoot.default.build.dfu_on_boot=0
+lolin_s3_mini.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+lolin_s3_mini.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+lolin_s3_mini.menu.UploadMode.default=UART0 / Hardware CDC
+lolin_s3_mini.menu.UploadMode.default.upload.use_1200bps_touch=false
+lolin_s3_mini.menu.UploadMode.default.upload.wait_for_upload_port=false
+lolin_s3_mini.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+lolin_s3_mini.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+lolin_s3_mini.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+lolin_s3_mini.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+lolin_s3_mini.menu.PartitionScheme.default.build.partitions=default
+lolin_s3_mini.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+lolin_s3_mini.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+lolin_s3_mini.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
+lolin_s3_mini.menu.PartitionScheme.no_ota.build.partitions=no_ota
+lolin_s3_mini.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
+lolin_s3_mini.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
+lolin_s3_mini.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
+lolin_s3_mini.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
+lolin_s3_mini.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
+lolin_s3_mini.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
+lolin_s3_mini.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
+lolin_s3_mini.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
+lolin_s3_mini.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
+lolin_s3_mini.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
+lolin_s3_mini.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
+lolin_s3_mini.menu.PartitionScheme.huge_app.build.partitions=huge_app
+lolin_s3_mini.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
+lolin_s3_mini.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
+lolin_s3_mini.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
+lolin_s3_mini.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
+lolin_s3_mini.menu.PartitionScheme.rainmaker=RainMaker
+lolin_s3_mini.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
+lolin_s3_mini.menu.PartitionScheme.rainmaker.upload.maximum_size=3145728
+
+lolin_s3_mini.menu.CPUFreq.240=240MHz (WiFi)
+lolin_s3_mini.menu.CPUFreq.240.build.f_cpu=240000000L
+lolin_s3_mini.menu.CPUFreq.160=160MHz (WiFi)
+lolin_s3_mini.menu.CPUFreq.160.build.f_cpu=160000000L
+lolin_s3_mini.menu.CPUFreq.80=80MHz (WiFi)
+lolin_s3_mini.menu.CPUFreq.80.build.f_cpu=80000000L
+lolin_s3_mini.menu.CPUFreq.40=40MHz
+lolin_s3_mini.menu.CPUFreq.40.build.f_cpu=40000000L
+lolin_s3_mini.menu.CPUFreq.20=20MHz
+lolin_s3_mini.menu.CPUFreq.20.build.f_cpu=20000000L
+lolin_s3_mini.menu.CPUFreq.10=10MHz
+lolin_s3_mini.menu.CPUFreq.10.build.f_cpu=10000000L
+
+lolin_s3_mini.menu.UploadSpeed.921600=921600
+lolin_s3_mini.menu.UploadSpeed.921600.upload.speed=921600
+lolin_s3_mini.menu.UploadSpeed.115200=115200
+lolin_s3_mini.menu.UploadSpeed.115200.upload.speed=115200
+lolin_s3_mini.menu.UploadSpeed.256000.windows=256000
+lolin_s3_mini.menu.UploadSpeed.256000.upload.speed=256000
+lolin_s3_mini.menu.UploadSpeed.230400.windows.upload.speed=256000
+lolin_s3_mini.menu.UploadSpeed.230400=230400
+lolin_s3_mini.menu.UploadSpeed.230400.upload.speed=230400
+lolin_s3_mini.menu.UploadSpeed.460800.linux=460800
+lolin_s3_mini.menu.UploadSpeed.460800.macosx=460800
+lolin_s3_mini.menu.UploadSpeed.460800.upload.speed=460800
+lolin_s3_mini.menu.UploadSpeed.512000.windows=512000
+lolin_s3_mini.menu.UploadSpeed.512000.upload.speed=512000
+
+lolin_s3_mini.menu.DebugLevel.none=None
+lolin_s3_mini.menu.DebugLevel.none.build.code_debug=0
+lolin_s3_mini.menu.DebugLevel.error=Error
+lolin_s3_mini.menu.DebugLevel.error.build.code_debug=1
+lolin_s3_mini.menu.DebugLevel.warn=Warn
+lolin_s3_mini.menu.DebugLevel.warn.build.code_debug=2
+lolin_s3_mini.menu.DebugLevel.info=Info
+lolin_s3_mini.menu.DebugLevel.info.build.code_debug=3
+lolin_s3_mini.menu.DebugLevel.debug=Debug
+lolin_s3_mini.menu.DebugLevel.debug.build.code_debug=4
+lolin_s3_mini.menu.DebugLevel.verbose=Verbose
+lolin_s3_mini.menu.DebugLevel.verbose.build.code_debug=5
+
+lolin_s3_mini.menu.EraseFlash.none=Disabled
+lolin_s3_mini.menu.EraseFlash.none.upload.erase_cmd=
+lolin_s3_mini.menu.EraseFlash.all=Enabled
+lolin_s3_mini.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 lolin_s3_pro.name=LOLIN S3 Pro
 lolin_s3_pro.vid.0=0x303a
 lolin_s3_pro.pid.0=0x8161

cores/esp32/esp32-hal-tinyusb.c

@@ -357,6 +357,11 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ
 /*
  * Required Callbacks
  * */
+#if CFG_TUD_DFU
+__attribute__ ((weak)) uint32_t tud_dfu_get_timeout_cb(uint8_t alt, uint8_t state){return 0;}
+__attribute__ ((weak)) void tud_dfu_download_cb (uint8_t alt, uint16_t block_num, uint8_t const *data, uint16_t length){}
+__attribute__ ((weak)) void tud_dfu_manifest_cb(uint8_t alt){}
+#endif
 #if CFG_TUD_HID
 __attribute__ ((weak)) const uint8_t * tud_hid_descriptor_report_cb(uint8_t itf){return NULL;}
 __attribute__ ((weak)) uint16_t tud_hid_get_report_cb(uint8_t itf, uint8_t report_id, hid_report_type_t report_type, uint8_t* buffer, uint16_t reqlen){return 0;}

cores/esp32/esp_arduino_version.h

@@ -23,7 +23,7 @@ extern "C" {
 /** Minor version number (x.X.x) */
 #define ESP_ARDUINO_VERSION_MINOR   0
 /** Patch version number (x.x.X) */
-#define ESP_ARDUINO_VERSION_PATCH   7
+#define ESP_ARDUINO_VERSION_PATCH   8
 
 /**
  * Macro to convert ARDUINO version number into an integer

libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino

@@ -0,0 +1,45 @@
+#include <Wire.h>
+#include <SPI.h>
+
+void setup() {
+  // UART initialization
+  Serial.begin(9600);
+
+  // I2C initialization
+  Wire.begin();
+
+  // SPI initialization
+  SPI.begin();
+}
+
+void loop() {
+  // UART echo
+  if (Serial.available()) {
+    Serial.write(Serial.read());
+  }
+
+  // I2C read/write
+  Wire.beginTransmission(0x68);  // I2C address of device
+  Wire.write(0x00);              // register to read/write
+  Wire.write(0xFF);              // data to write (if writing)
+  Wire.endTransmission();
+
+  Wire.requestFrom(0x68, 1);     // number of bytes to read
+
+  while (Wire.available()) {
+    Serial.println(Wire.read());
+  }
+
+  // SPI read/write
+  digitalWrite(SS, LOW);         // select slave device
+  SPI.transfer(0x01);            // data to write
+  digitalWrite(SS, HIGH);        // deselect slave device
+
+  digitalWrite(SS, LOW);         // select slave device
+  byte data = SPI.transfer(0x00);// data to read
+  digitalWrite(SS, HIGH);        // deselect slave device
+
+  Serial.println(data);
+
+  delay(1000);                   // wait for 1 second before repeating loop
+}

libraries/ESP32/examples/Camera/CameraWebServer/camera_pins.h

@@ -155,7 +155,8 @@
 #define HREF_GPIO_NUM     23
 #define PCLK_GPIO_NUM     22
 
-#define LED_GPIO_NUM      33
+// 4 for flash led or 33 for normal led
+#define LED_GPIO_NUM       4
 
 #elif defined(CAMERA_MODEL_TTGO_T_JOURNAL)
 #define PWDN_GPIO_NUM      0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "framework-arduinoespressif32",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Arduino Wiring-based Framework for the Espressif ESP32, ESP32-S and ESP32-C series of SoCs",
   "keywords": [
     "framework",

platform.txt

@@ -1,5 +1,5 @@
 name=ESP32 Arduino
-version=2.0.7
+version=2.0.8
 
 tools.xtensa-esp32-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32-elf
 tools.xtensa-esp32s2-elf-gcc.path={runtime.platform.path}/tools/xtensa-esp32s2-elf

tools/sdk/esp32/include/espressif__esp_secure_cert_mgr/include/esp_secure_cert_read.h

@@ -16,6 +16,17 @@ extern "C"
 {
 #endif
 
+/**
+@brief Enumeration of ESP Secure Certificate key types.
+*/
+typedef enum key_type {
+    ESP_SECURE_CERT_INVALID_KEY = -1, /* Invalid key */
+    ESP_SECURE_CERT_DEFAULT_FORMAT_KEY, /* Key type for the key in default format */
+    ESP_SECURE_CERT_HMAC_ENCRYPTED_KEY, /* Encrypted key type */
+    ESP_SECURE_CERT_HMAC_DERIVED_ECDSA_KEY, /* HMAC-derived ECDSA key type. */
+    ESP_SECURE_CERT_ECDSA_PERIPHERAL_KEY, /* ECDSA peripheral key type. */
+} esp_secure_cert_key_type_t;
+
 /* @info
  * Init the esp_secure_cert nvs partition
  *
@@ -115,6 +126,8 @@ esp_err_t esp_secure_cert_free_ca_cert(char *buffer);
  *      The esp_secure_cert_free_priv_key API needs to be called in order to free the memory.
  *      The API shall only free the memory if it has been dynamically allocated.
  *
+ *      The private key(buffer) shall be returned as NULL when private key type is ESP_SECURE_CERT_ECDSA_PERIPHERAL_KEY.
+ *
  * @params
  *      - buffer(out)       This value shall be filled with the private key address
  *                          on successful completion
@@ -128,6 +141,23 @@ esp_err_t esp_secure_cert_free_ca_cert(char *buffer);
  */
 esp_err_t esp_secure_cert_get_priv_key(char **buffer, uint32_t *len);
 
+#ifndef CONFIG_ESP_SECURE_CERT_SUPPORT_LEGACY_FORMATS
+/* @info
+ *  Get the private key type from the esp_secure_cert partition
+ *
+ * @note
+ *      The API is only supported for the TLV format
+ *
+ * @params
+ *      - priv_key_type(in/out)    Pointer to store the obtained key type
+ * @return
+ *      - ESP_OK    On success
+ *      - ESP_FAIL/other relevant esp error code
+ *                  On failure
+ */
+esp_err_t esp_secure_cert_get_priv_key_type(esp_secure_cert_key_type_t *priv_key_type);
+#endif
+
 /*
  * Free any internally allocated resources for the priv key.
  * @note
@@ -157,9 +187,27 @@ esp_ds_data_ctx_t *esp_secure_cert_get_ds_ctx(void);
  *@info
  *      Free the ds context
  */
+
 void esp_secure_cert_free_ds_ctx(esp_ds_data_ctx_t *ds_ctx);
 #endif /* CONFIG_ESP_SECURE_CERT_DS_PERIPHERAL */
 
+#ifndef CONFIG_ESP_SECURE_CERT_SUPPORT_LEGACY_FORMATS
+/* @info
+ *  Get the efuse key block id in which the private key is stored.
+ * @note
+ *      The API is only supported for the TLV format.
+ *      For now only ECDSA type of private key can be stored in the eFuse key blocks
+ *
+ * @params
+ *      - efuse_key_id(in/out)    Pointer to store the obtained key id
+ * @return
+ *      - ESP_OK    On success
+ *      - ESP_FAIL/other relevant esp error code
+ *                  On failure
+ */
+esp_err_t esp_secure_cert_get_priv_key_efuse_id(uint8_t *efuse_key_id);
+#endif
+
 #ifdef __cplusplus
 }
 #endif