Merge branch 'master' into release/v2.x

.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
\ No newline at end of file

.github/workflows/boards.yml

-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

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

+#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

variants/lolin_s3_mini/pins_arduino.h

+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x8167
+
+#define EXTERNAL_NUM_INTERRUPTS 46
+#define NUM_DIGITAL_PINS        48
+#define NUM_ANALOG_INPUTS       18
+
+
+static const uint8_t LED_BUILTIN = 47;
+#define BUILTIN_LED  LED_BUILTIN // backward compatibility
+#define LED_BUILTIN LED_BUILTIN
+#define RGB_BUILTIN LED_BUILTIN
+#define RGB_BRIGHTNESS 64
+
+#define analogInputToDigitalPin(p)  (((p)<20)?(analogChannelToDigitalPin(p)):-1)
+#define digitalPinToInterrupt(p)    (((p)<48)?(p):-1)
+#define digitalPinHasPWM(p)         (p < 46)
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 35;
+static const uint8_t SCL = 36;
+
+static const uint8_t SS    = 10;
+static const uint8_t MOSI  = 11;
+static const uint8_t MISO  = 13;
+static const uint8_t SCK   = 12;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */