Merge branch 'espressif:master' into master

Author: DogushC

.github/ISSUE_TEMPLATE/Issue-report.yml

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

.github/scripts/find_all_boards.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Get all boards
+boards_array=()
+
+for line in `grep '.tarch=' boards.txt`; do
+    board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
+    boards_array+=("espressif:esp32:$board_name")
+    echo "Added 'espressif:esp32:$board_name' to array"
+done
+
+# Create JSON like string with all boards found and pass it to env variable
+board_count=${#boards_array[@]}
+echo "Boards found: $board_count"
+echo "BOARD-COUNT=$board_count" >> $GITHUB_ENV
+
+if [ $board_count -gt 0 ]
+then
+    json_matrix='['
+    for board in ${boards_array[@]}
+    do
+        json_matrix+='"'$board'"'
+        if [ $board_count -gt 1 ]
+        then
+            json_matrix+=","
+        fi
+        board_count=$(($board_count - 1))
+    done
+    json_matrix+=']'
+
+    echo $json_matrix
+    echo "FQBNS=${json_matrix}" >> $GITHUB_ENV
+else
+    echo "FQBNS=" >> $GITHUB_ENV
+fi

.github/workflows/allboards.yml

@@ -0,0 +1,86 @@
+name: Boards Test - Remote trigger
+
+# The workflow will run on remote dispath with event-type set to "test-boards"
+on:
+  repository_dispatch:
+    types: [test-boards]
+
+jobs:
+  find-boards:
+    runs-on: ubuntu-latest
+
+    outputs:
+      fqbns: ${{ env.FQBNS }}
+      board-count: ${{ env.BOARD-COUNT }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.client_payload.branch }}
+
+      - name: Get boards fqbns
+        run: 
+          bash .github/scripts/find_all_boards.sh
+
+  setup-chunks:
+    needs: find-boards
+    runs-on: ubuntu-latest
+    if: needs.find-boards.outputs.fqbns != ''
+
+    outputs:
+      test-chunks: ${{ steps['set-test-chunks'].outputs['test-chunks'] }}
+
+    steps:
+      - uses: actions/checkout@v3
+      - run: npm install
+      - name: Setup jq
+        uses: dcarbone/[email protected]
+
+      - id: set-test-chunks
+        name: Set Chunks
+        run: 
+          echo "test-chunks<<EOF" >> $GITHUB_OUTPUT
+
+          echo "$( jq -nc '${{ needs.find-boards.outputs.fqbns }} | [_nwise( ${{ needs.find-boards.outputs.board-count }}/15 | ceil)]')" >> $GITHUB_OUTPUT
+
+          echo "EOF" >> $GITHUB_OUTPUT
+
+  test-boards:
+    needs: setup-chunks
+    runs-on: ubuntu-latest
+
+    env:
+      REPOSITORY: |
+        - source-path: '.'
+          name: "espressif:esp32"
+
+    strategy:
+      fail-fast: false
+      matrix: 
+        chunk: ${{ fromJSON(needs.setup-chunks.outputs['test-chunks']) }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Echo FQBNS to file
+        run:
+          echo "$FQBN" > fqbns.json
+        env: 
+          FQBN: ${{ toJSON(matrix.chunk) }}
+
+      - name: Compile sketch
+        uses: P-R-O-C-H-Y/compile-sketches@main
+        with:
+          platforms: |
+            ${{ env.REPOSITORY }}
+          multiple-fqbn: true
+          multiple-fqbn-path: "fqbns.json"
+          use-json-file: false
+          enable-deltas-report: false
+          enable-warnings-report: false
+          cli-compile-flags: |
+            - --warnings="all"
+          sketch-paths:
+            "- ./libraries/ESP32/examples/CI/CIBoardsTest/CIBoardsTest.ino"

.github/workflows/lib.json

@@ -19,9 +19,6 @@
         "name": "ESP32Servo",
         "exclude_targets": [],
         "sketch_path": [
-            "~/Arduino/libraries/ESP32Servo/examples/Knob/Knob.ino",
-            "~/Arduino/libraries/ESP32Servo/examples/Sweep/Sweep.ino",
-            "~/Arduino/libraries/ESP32Servo/examples/PWMExample/PWMExample.ino",
             "~/Arduino/libraries/ESP32Servo/examples/Multiple-Servo-Example-Arduino/Multiple-Servo-Example-Arduino.ino"
         ]
     },
@@ -51,5 +48,19 @@
         "sketch_path": [
             "~/Arduino/libraries/IRremote/examples/SendDemo/SendDemo.ino"
         ]
+    },
+    {
+        "name": "MFRC522",
+        "exclude_targets": [],
+        "sketch_path": [
+            "~/Arduino/libraries/MFRC522/examples/ReadUidMultiReader/ReadUidMultiReader.ino"
+        ]
+    },
+    {
+        "name": "WS2812FX",
+        "exclude_targets": [],
+        "sketch_path": [
+            "~/Arduino/libraries/WS2812FX/examples/ws2812fx_spi/ws2812fx_spi.ino"
+        ]
     }
 ]

boards.txt

@@ -7314,6 +7314,7 @@ dfrobot_beetle_esp32c3.menu.EraseFlash.all.upload.erase_cmd=-e
 dfrobot_firebeetle2_esp32e.name=FireBeetle 2 ESP32-E
 
 dfrobot_firebeetle2_esp32e.upload.tool=esptool_py
+dfrobot_firebeetle2_esp32e.upload.tool.default=esptool_py
 dfrobot_firebeetle2_esp32e.upload.maximum_size=1310720
 dfrobot_firebeetle2_esp32e.upload.maximum_data_size=327680
 dfrobot_firebeetle2_esp32e.upload.flags=
@@ -12264,6 +12265,198 @@ m5stack-core2.menu.EraseFlash.all.upload.erase_cmd=-e
 
 ##############################################################
 
+m5stack-cores3.name=M5Stack-CoreS3
+m5stack-cores3.vid.0=0x303a
+m5stack-cores3.pid.0=0x1001
+
+m5stack-cores3.bootloader.tool=esptool_py
+m5stack-cores3.bootloader.tool.default=esptool_py
+
+m5stack-cores3.upload.tool=esptool_py
+m5stack-cores3.upload.tool.default=esptool_py
+m5stack-cores3.upload.tool.network=esp_ota
+
+m5stack-cores3.upload.maximum_size=1310720
+m5stack-cores3.upload.maximum_data_size=327680
+m5stack-cores3.upload.flags=
+m5stack-cores3.upload.extra_flags=
+m5stack-cores3.upload.use_1200bps_touch=false
+m5stack-cores3.upload.wait_for_upload_port=false
+
+m5stack-cores3.serial.disableDTR=false
+m5stack-cores3.serial.disableRTS=false
+
+m5stack-cores3.build.tarch=xtensa
+m5stack-cores3.build.bootloader_addr=0x0
+m5stack-cores3.build.target=esp32s3
+m5stack-cores3.build.mcu=esp32s3
+m5stack-cores3.build.core=esp32
+m5stack-cores3.build.variant=m5stack_cores3
+m5stack-cores3.build.board=M5STACK_CORES3
+
+m5stack-cores3.build.usb_mode=1
+m5stack-cores3.build.cdc_on_boot=0
+m5stack-cores3.build.msc_on_boot=0
+m5stack-cores3.build.dfu_on_boot=0
+m5stack-cores3.build.f_cpu=240000000L
+m5stack-cores3.build.flash_size=4MB
+m5stack-cores3.build.flash_freq=80m
+m5stack-cores3.build.flash_mode=dio
+m5stack-cores3.build.boot=qio
+m5stack-cores3.build.boot_freq=80m
+m5stack-cores3.build.partitions=default
+m5stack-cores3.build.defines=
+m5stack-cores3.build.loop_core=
+m5stack-cores3.build.event_core=
+m5stack-cores3.build.psram_type=qspi
+m5stack-cores3.build.memory_type={build.boot}_{build.psram_type}
+
+m5stack-cores3.menu.JTAGAdapter.default=Disabled
+m5stack-cores3.menu.JTAGAdapter.default.build.copy_jtag_files=0
+m5stack-cores3.menu.JTAGAdapter.builtin=Integrated USB JTAG
+m5stack-cores3.menu.JTAGAdapter.builtin.build.openocdscript=esp32s3-builtin.cfg
+m5stack-cores3.menu.JTAGAdapter.builtin.build.copy_jtag_files=1
+m5stack-cores3.menu.JTAGAdapter.external=FTDI Adapter
+m5stack-cores3.menu.JTAGAdapter.external.build.openocdscript=esp32s3-ftdi.cfg
+m5stack-cores3.menu.JTAGAdapter.external.build.copy_jtag_files=1
+m5stack-cores3.menu.JTAGAdapter.bridge=ESP USB Bridge
+m5stack-cores3.menu.JTAGAdapter.bridge.build.openocdscript=esp32s3-bridge.cfg
+m5stack-cores3.menu.JTAGAdapter.bridge.build.copy_jtag_files=1
+
+m5stack-cores3.menu.PSRAM.disabled=Disabled
+m5stack-cores3.menu.PSRAM.disabled.build.defines=
+m5stack-cores3.menu.PSRAM.disabled.build.psram_type=qspi
+m5stack-cores3.menu.PSRAM.enabled=QSPI PSRAM
+m5stack-cores3.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
+m5stack-cores3.menu.PSRAM.enabled.build.psram_type=qspi
+m5stack-cores3.menu.PSRAM.opi=OPI PSRAM
+m5stack-cores3.menu.PSRAM.opi.build.defines=-DBOARD_HAS_PSRAM
+m5stack-cores3.menu.PSRAM.opi.build.psram_type=opi
+
+m5stack-cores3.menu.FlashMode.qio=QIO 80MHz
+m5stack-cores3.menu.FlashMode.qio.build.flash_mode=dio
+m5stack-cores3.menu.FlashMode.qio.build.boot=qio
+m5stack-cores3.menu.FlashMode.qio.build.boot_freq=80m
+m5stack-cores3.menu.FlashMode.qio.build.flash_freq=80m
+m5stack-cores3.menu.FlashMode.qio120=QIO 120MHz
+m5stack-cores3.menu.FlashMode.qio120.build.flash_mode=dio
+m5stack-cores3.menu.FlashMode.qio120.build.boot=qio
+m5stack-cores3.menu.FlashMode.qio120.build.boot_freq=120m
+m5stack-cores3.menu.FlashMode.qio120.build.flash_freq=80m
+m5stack-cores3.menu.FlashMode.dio=DIO 80MHz
+m5stack-cores3.menu.FlashMode.dio.build.flash_mode=dio
+m5stack-cores3.menu.FlashMode.dio.build.boot=dio
+m5stack-cores3.menu.FlashMode.dio.build.boot_freq=80m
+m5stack-cores3.menu.FlashMode.dio.build.flash_freq=80m
+m5stack-cores3.menu.FlashMode.opi=OPI 80MHz
+m5stack-cores3.menu.FlashMode.opi.build.flash_mode=dout
+m5stack-cores3.menu.FlashMode.opi.build.boot=opi
+m5stack-cores3.menu.FlashMode.opi.build.boot_freq=80m
+m5stack-cores3.menu.FlashMode.opi.build.flash_freq=80m
+
+m5stack-cores3.menu.FlashSize.4M=4MB (32Mb)
+m5stack-cores3.menu.FlashSize.4M.build.flash_size=4MB
+m5stack-cores3.menu.FlashSize.8M=8MB (64Mb)
+m5stack-cores3.menu.FlashSize.8M.build.flash_size=8MB
+m5stack-cores3.menu.FlashSize.8M.build.partitions=default_8MB
+m5stack-cores3.menu.FlashSize.16M=16MB (128Mb)
+m5stack-cores3.menu.FlashSize.16M.build.flash_size=16MB
+#m5stack-cores3.menu.FlashSize.32M=32MB (256Mb)
+#m5stack-cores3.menu.FlashSize.32M.build.flash_size=32MB
+
+m5stack-cores3.menu.LoopCore.1=Core 1
+m5stack-cores3.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
+m5stack-cores3.menu.LoopCore.0=Core 0
+m5stack-cores3.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
+
+m5stack-cores3.menu.EventsCore.1=Core 1
+m5stack-cores3.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
+m5stack-cores3.menu.EventsCore.0=Core 0
+m5stack-cores3.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
+
+m5stack-cores3.menu.USBMode.hwcdc=Hardware CDC and JTAG
+m5stack-cores3.menu.USBMode.hwcdc.build.usb_mode=1
+m5stack-cores3.menu.USBMode.default=USB-OTG (TinyUSB)
+m5stack-cores3.menu.USBMode.default.build.usb_mode=0
+
+m5stack-cores3.menu.CDCOnBoot.default=Disabled
+m5stack-cores3.menu.CDCOnBoot.default.build.cdc_on_boot=0
+m5stack-cores3.menu.CDCOnBoot.cdc=Enabled
+m5stack-cores3.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
+
+m5stack-cores3.menu.MSCOnBoot.default=Disabled
+m5stack-cores3.menu.MSCOnBoot.default.build.msc_on_boot=0
+m5stack-cores3.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
+m5stack-cores3.menu.MSCOnBoot.msc.build.msc_on_boot=1
+
+m5stack-cores3.menu.DFUOnBoot.default=Disabled
+m5stack-cores3.menu.DFUOnBoot.default.build.dfu_on_boot=0
+m5stack-cores3.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
+m5stack-cores3.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
+
+m5stack-cores3.menu.UploadMode.default=UART0 / Hardware CDC
+m5stack-cores3.menu.UploadMode.default.upload.use_1200bps_touch=false
+m5stack-cores3.menu.UploadMode.default.upload.wait_for_upload_port=false
+m5stack-cores3.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
+m5stack-cores3.menu.UploadMode.cdc.upload.use_1200bps_touch=true
+m5stack-cores3.menu.UploadMode.cdc.upload.wait_for_upload_port=true
+
+m5stack-cores3.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
+m5stack-cores3.menu.PartitionScheme.default.build.partitions=default
+m5stack-cores3.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
+m5stack-cores3.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
+m5stack-cores3.menu.PartitionScheme.default_8MB=8M with spiffs (3MB APP/1.5MB SPIFFS)
+m5stack-cores3.menu.PartitionScheme.default_8MB.build.partitions=default_8MB
+m5stack-cores3.menu.PartitionScheme.default_8MB.upload.maximum_size=3342336
+
+m5stack-cores3.menu.CPUFreq.240=240MHz (WiFi)
+m5stack-cores3.menu.CPUFreq.240.build.f_cpu=240000000L
+m5stack-cores3.menu.CPUFreq.160=160MHz (WiFi)
+m5stack-cores3.menu.CPUFreq.160.build.f_cpu=160000000L
+m5stack-cores3.menu.CPUFreq.80=80MHz (WiFi)
+m5stack-cores3.menu.CPUFreq.80.build.f_cpu=80000000L
+m5stack-cores3.menu.CPUFreq.40=40MHz
+m5stack-cores3.menu.CPUFreq.40.build.f_cpu=40000000L
+m5stack-cores3.menu.CPUFreq.20=20MHz
+m5stack-cores3.menu.CPUFreq.20.build.f_cpu=20000000L
+m5stack-cores3.menu.CPUFreq.10=10MHz
+m5stack-cores3.menu.CPUFreq.10.build.f_cpu=10000000L
+
+m5stack-cores3.menu.UploadSpeed.921600=921600
+m5stack-cores3.menu.UploadSpeed.921600.upload.speed=921600
+m5stack-cores3.menu.UploadSpeed.115200=115200
+m5stack-cores3.menu.UploadSpeed.115200.upload.speed=115200
+m5stack-cores3.menu.UploadSpeed.256000.windows=256000
+m5stack-cores3.menu.UploadSpeed.256000.upload.speed=256000
+m5stack-cores3.menu.UploadSpeed.230400.windows.upload.speed=256000
+m5stack-cores3.menu.UploadSpeed.230400=230400
+m5stack-cores3.menu.UploadSpeed.230400.upload.speed=230400
+m5stack-cores3.menu.UploadSpeed.460800.linux=460800
+m5stack-cores3.menu.UploadSpeed.460800.macosx=460800
+m5stack-cores3.menu.UploadSpeed.460800.upload.speed=460800
+m5stack-cores3.menu.UploadSpeed.512000.windows=512000
+m5stack-cores3.menu.UploadSpeed.512000.upload.speed=512000
+
+m5stack-cores3.menu.DebugLevel.none=None
+m5stack-cores3.menu.DebugLevel.none.build.code_debug=0
+m5stack-cores3.menu.DebugLevel.error=Error
+m5stack-cores3.menu.DebugLevel.error.build.code_debug=1
+m5stack-cores3.menu.DebugLevel.warn=Warn
+m5stack-cores3.menu.DebugLevel.warn.build.code_debug=2
+m5stack-cores3.menu.DebugLevel.info=Info
+m5stack-cores3.menu.DebugLevel.info.build.code_debug=3
+m5stack-cores3.menu.DebugLevel.debug=Debug
+m5stack-cores3.menu.DebugLevel.debug.build.code_debug=4
+m5stack-cores3.menu.DebugLevel.verbose=Verbose
+m5stack-cores3.menu.DebugLevel.verbose.build.code_debug=5
+
+m5stack-cores3.menu.EraseFlash.none=Disabled
+m5stack-cores3.menu.EraseFlash.none.upload.erase_cmd=
+m5stack-cores3.menu.EraseFlash.all=Enabled
+m5stack-cores3.menu.EraseFlash.all.upload.erase_cmd=-e
+
+##############################################################
+
 m5stack-timer-cam.name=M5Stack-Timer-CAM
 
 m5stack-timer-cam.bootloader.tool=esptool_py
@@ -22259,6 +22452,7 @@ esp32c3m1IKit.menu.EraseFlash.all.upload.erase_cmd=-e
 roboheart_hercules.name=RoboHeart Hercules
 
 roboheart_hercules.upload.tool=esptool_py
+roboheart_hercules.upload.tool.default=esptool_py
 roboheart_hercules.upload.maximum_size=1310720
 roboheart_hercules.upload.maximum_data_size=327680
 roboheart_hercules.upload.wait_for_upload_port=true

cores/esp32/HardwareSerial.cpp

@@ -365,9 +365,6 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
                 }
             break;
 #endif
-            default:
-                log_e("Bad UART Number");
-                return;
         }
     }
 

cores/esp32/WString.h

@@ -34,8 +34,8 @@
 // A pure abstract class forward used as a means to proide a unique pointer type
 // but really is never defined.
 class __FlashStringHelper;
-#define FPSTR(pstr_pointer) (pstr_pointer)
-#define F(string_literal) (string_literal)
+#define FPSTR(str_pointer) (reinterpret_cast<const __FlashStringHelper *>(str_pointer))
+#define F(string_literal) (FPSTR(PSTR(string_literal)))
 
 // An inherited class for holding the result of a concatenation.  These
 // result objects are assumed to be writable by subsequent concatenations.