Skip to content

Commit 3198de3

Browse files
P-R-O-C-H-YP-R-O-C-H-Y
authored
Merge branch 'master' into feature/zigbee-library
2 parents 2eedc2e + b05f18d commit 3198de3

File tree

110 files changed

+2625
-526
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2625
-526
lines changed

Diff for: ‎.github/workflows/tests_results.yml

+22-4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,24 @@ jobs:
4141
original_sha=$(cat ./artifacts/parent-artifacts/sha.txt)
4242
original_ref=$(cat ./artifacts/parent-artifacts/ref.txt)
4343
original_conclusion=$(cat ./artifacts/parent-artifacts/conclusion.txt)
44+
45+
# Sanitize the values to avoid security issues
46+
47+
# Event: Allow alphabetical characters and underscores
48+
original_event=$(echo "$original_event" | tr -cd '[:alpha:]_')
49+
50+
# Action: Allow alphabetical characters and underscores
51+
original_action=$(echo "$original_action" | tr -cd '[:alpha:]_')
52+
53+
# SHA: Allow alphanumeric characters
54+
original_sha=$(echo "$original_sha" | tr -cd '[:alnum:]')
55+
56+
# Ref: Allow alphanumeric characters, slashes, underscores, dots, and dashes
57+
original_ref=$(echo "$original_ref" | tr -cd '[:alnum:]/_.-')
58+
59+
# Conclusion: Allow alphabetical characters and underscores
60+
original_conclusion=$(echo "$original_conclusion" | tr -cd '[:alpha:]_')
61+
4462
echo "original_event=$original_event" >> $GITHUB_ENV
4563
echo "original_action=$original_action" >> $GITHUB_ENV
4664
echo "original_sha=$original_sha" >> $GITHUB_ENV
@@ -71,10 +89,10 @@ jobs:
7189
uses: actions/github-script@v7
7290
with:
7391
script: |
74-
const ref = '${{ env.original_ref }}';
92+
const ref = process.env.original_ref;
7593
const key_prefix = 'tests-' + ref + '-';
7694
77-
if ('${{ env.original_event }}' == 'pull_request' && '${{ env.original_action }}' != 'closed') {
95+
if (process.env.original_event == 'pull_request' && process.env.original_action != 'closed') {
7896
console.log('Skipping cache cleanup for open PR');
7997
return;
8098
}
@@ -104,12 +122,12 @@ jobs:
104122
script: |
105123
const owner = '${{ github.repository_owner }}';
106124
const repo = '${{ github.repository }}'.split('/')[1];
107-
const sha = '${{ env.original_sha }}';
125+
const sha = process.env.original_sha;
108126
core.debug(`owner: ${owner}`);
109127
core.debug(`repo: ${repo}`);
110128
core.debug(`sha: ${sha}`);
111129
const { context: name, state } = (await github.rest.repos.createCommitStatus({
112-
context: 'Runtime Tests / Report results (${{ env.original_event }} -> workflow_run -> workflow_run)',
130+
context: `Runtime Tests / Report results (${process.env.original_event} -> workflow_run -> workflow_run)`,
113131
owner: owner,
114132
repo: repo,
115133
sha: sha,

Diff for: ‎.github/workflows/upload-idf-component.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,25 @@ on:
66
types:
77
- completed
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
upload_components:
1114
runs-on: ubuntu-latest
1215
steps:
1316
- name: Get the release tag
17+
env:
18+
head_branch: ${{ github.event.workflow_run.head_branch }}
1419
run: |
1520
if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then
1621
echo "Release workflow failed. Exiting..."
1722
exit 1
1823
fi
1924
20-
branch=${{ github.event.workflow_run.head_branch }}
25+
# Read and sanitize the branch/tag name
26+
branch=$(echo "$head_branch" | tr -cd '[:alnum:]/_.-')
27+
2128
if [[ $branch == refs/tags/* ]]; then
2229
tag="${branch#refs/tags/}"
2330
elif [[ $branch =~ ^[0-9]+\.[0-9]+\.[0-9]+.*$ ]]; then

Diff for: ‎.pre-commit-config.yaml

+9
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ repos:
2525
args: [--fix=lf]
2626
- id: trailing-whitespace
2727
args: [--markdown-linebreak-ext=md]
28+
- id: pretty-format-json
29+
args: [--autofix]
30+
types_or: [json]
31+
exclude: |
32+
(?x)(
33+
diagram\..*\.json$|
34+
package\.json$|
35+
^package\/.*$
36+
)
2837
- repo: https://github.com/codespell-project/codespell
2938
rev: "v2.3.0"
3039
hooks:

Diff for: ‎boards.txt

+202
Original file line numberDiff line numberDiff line change
@@ -41426,3 +41426,205 @@ jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_mode=-DZIGBEE_MODE_ZCZR
4142641426
jczn_2432s028r.menu.ZigbeeMode.zczr.build.zigbee_libs=-lesp_zb_api_zczr -lesp_zb_cli_command -lzboss_stack.zczr -lzboss_port
4142741427

4142841428
##############################################################
41429+
41430+
waveshare_esp32_s3_touch_amoled_241.name=Waveshare ESP32-S3-Touch-AMOLED-2.41
41431+
waveshare_esp32_s3_touch_amoled_241.vid.0=0x303a
41432+
waveshare_esp32_s3_touch_amoled_241.pid.0=0x8242
41433+
waveshare_esp32_s3_touch_amoled_241.upload_port.0.vid=0x303a
41434+
waveshare_esp32_s3_touch_amoled_241.upload_port.0.pid=0x8242
41435+
41436+
waveshare_esp32_s3_touch_amoled_241.bootloader.tool=esptool_py
41437+
waveshare_esp32_s3_touch_amoled_241.bootloader.tool.default=esptool_py
41438+
41439+
waveshare_esp32_s3_touch_amoled_241.upload.tool=esptool_py
41440+
waveshare_esp32_s3_touch_amoled_241.upload.tool.default=esptool_py
41441+
waveshare_esp32_s3_touch_amoled_241.upload.tool.network=esp_ota
41442+
41443+
waveshare_esp32_s3_touch_amoled_241.upload.maximum_size=1310720
41444+
41445+
waveshare_esp32_s3_touch_amoled_241.upload.maximum_data_size=327680
41446+
waveshare_esp32_s3_touch_amoled_241.upload.flags=
41447+
waveshare_esp32_s3_touch_amoled_241.upload.extra_flags=
41448+
waveshare_esp32_s3_touch_amoled_241.upload.use_1200bps_touch=false
41449+
waveshare_esp32_s3_touch_amoled_241.upload.wait_for_upload_port=false
41450+
41451+
waveshare_esp32_s3_touch_amoled_241.serial.disableDTR=false
41452+
waveshare_esp32_s3_touch_amoled_241.serial.disableRTS=false
41453+
41454+
waveshare_esp32_s3_touch_amoled_241.build.tarch=xtensa
41455+
waveshare_esp32_s3_touch_amoled_241.build.bootloader_addr=0x0
41456+
waveshare_esp32_s3_touch_amoled_241.build.target=esp32s3
41457+
waveshare_esp32_s3_touch_amoled_241.build.mcu=esp32s3
41458+
waveshare_esp32_s3_touch_amoled_241.build.core=esp32
41459+
waveshare_esp32_s3_touch_amoled_241.build.variant=waveshare_esp32_s3_touch_amoled_241
41460+
waveshare_esp32_s3_touch_amoled_241.build.board=WAVESHARE_ESP32_S3_TOUCH_AMOLED_241
41461+
41462+
waveshare_esp32_s3_touch_amoled_241.build.usb_mode=1
41463+
waveshare_esp32_s3_touch_amoled_241.build.cdc_on_boot=0
41464+
waveshare_esp32_s3_touch_amoled_241.build.msc_on_boot=0
41465+
waveshare_esp32_s3_touch_amoled_241.build.dfu_on_boot=0
41466+
waveshare_esp32_s3_touch_amoled_241.build.f_cpu=240000000L
41467+
waveshare_esp32_s3_touch_amoled_241.build.flash_size=16MB
41468+
41469+
waveshare_esp32_s3_touch_amoled_241.build.flash_freq=80m
41470+
waveshare_esp32_s3_touch_amoled_241.build.flash_mode=dio
41471+
waveshare_esp32_s3_touch_amoled_241.build.boot=qio
41472+
waveshare_esp32_s3_touch_amoled_241.build.boot_freq=80m
41473+
waveshare_esp32_s3_touch_amoled_241.build.partitions=default
41474+
waveshare_esp32_s3_touch_amoled_241.build.defines=
41475+
waveshare_esp32_s3_touch_amoled_241.build.loop_core=
41476+
waveshare_esp32_s3_touch_amoled_241.build.event_core=
41477+
waveshare_esp32_s3_touch_amoled_241.build.psram_type=qspi
41478+
waveshare_esp32_s3_touch_amoled_241.build.memory_type={build.boot}_{build.psram_type}
41479+
41480+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled=Disabled
41481+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled.build.defines=
41482+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.disabled.build.psram_type=qspi
41483+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled=Enabled
41484+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled.build.defines=-DBOARD_HAS_PSRAM
41485+
waveshare_esp32_s3_touch_amoled_241.menu.PSRAM.enabled.build.psram_type=opi
41486+
41487+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio=QIO 80MHz
41488+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.flash_mode=dio
41489+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.boot=qio
41490+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.boot_freq=80m
41491+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio.build.flash_freq=80m
41492+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120=QIO 120MHz
41493+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.flash_mode=dio
41494+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.boot=qio
41495+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.boot_freq=120m
41496+
waveshare_esp32_s3_touch_amoled_241.menu.FlashMode.qio120.build.flash_freq=80m
41497+
41498+
waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.1=Core 1
41499+
waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.1.build.loop_core=-DARDUINO_RUNNING_CORE=1
41500+
waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.0=Core 0
41501+
waveshare_esp32_s3_touch_amoled_241.menu.LoopCore.0.build.loop_core=-DARDUINO_RUNNING_CORE=0
41502+
41503+
waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.1=Core 1
41504+
waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.1.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=1
41505+
waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.0=Core 0
41506+
waveshare_esp32_s3_touch_amoled_241.menu.EventsCore.0.build.event_core=-DARDUINO_EVENT_RUNNING_CORE=0
41507+
41508+
waveshare_esp32_s3_touch_amoled_241.menu.USBMode.hwcdc=Hardware CDC and JTAG
41509+
waveshare_esp32_s3_touch_amoled_241.menu.USBMode.hwcdc.build.usb_mode=1
41510+
waveshare_esp32_s3_touch_amoled_241.menu.USBMode.default=USB-OTG (TinyUSB)
41511+
waveshare_esp32_s3_touch_amoled_241.menu.USBMode.default.build.usb_mode=0
41512+
41513+
waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.default=Disabled
41514+
waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.default.build.cdc_on_boot=0
41515+
waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.cdc=Enabled
41516+
waveshare_esp32_s3_touch_amoled_241.menu.CDCOnBoot.cdc.build.cdc_on_boot=1
41517+
41518+
waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.default=Disabled
41519+
waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.default.build.msc_on_boot=0
41520+
waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.msc=Enabled (Requires USB-OTG Mode)
41521+
waveshare_esp32_s3_touch_amoled_241.menu.MSCOnBoot.msc.build.msc_on_boot=1
41522+
41523+
waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.default=Disabled
41524+
waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.default.build.dfu_on_boot=0
41525+
waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.dfu=Enabled (Requires USB-OTG Mode)
41526+
waveshare_esp32_s3_touch_amoled_241.menu.DFUOnBoot.dfu.build.dfu_on_boot=1
41527+
41528+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default=UART0 / Hardware CDC
41529+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default.upload.use_1200bps_touch=false
41530+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.default.upload.wait_for_upload_port=false
41531+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc=USB-OTG CDC (TinyUSB)
41532+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc.upload.use_1200bps_touch=true
41533+
waveshare_esp32_s3_touch_amoled_241.menu.UploadMode.cdc.upload.wait_for_upload_port=true
41534+
41535+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
41536+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.default=Default 4MB with spiffs (1.2MB APP/1.5MB SPIFFS)
41537+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.default.build.partitions=default
41538+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.defaultffat=Default 4MB with ffat (1.2MB APP/1.5MB FATFS)
41539+
41540+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.defaultffat.build.partitions=default_ffat
41541+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota=No OTA (2MB APP/2MB SPIFFS)
41542+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota.build.partitions=no_ota
41543+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.no_ota.upload.maximum_size=2097152
41544+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g=No OTA (1MB APP/3MB SPIFFS)
41545+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g.build.partitions=noota_3g
41546+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3g.upload.maximum_size=1048576
41547+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat=No OTA (2MB APP/2MB FATFS)
41548+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat.build.partitions=noota_ffat
41549+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_ffat.upload.maximum_size=2097152
41550+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat=No OTA (1MB APP/3MB FATFS)
41551+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat.build.partitions=noota_3gffat
41552+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.noota_3gffat.upload.maximum_size=1048576
41553+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app=Huge APP (3MB No OTA/1MB SPIFFS)
41554+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app.build.partitions=huge_app
41555+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.huge_app.upload.maximum_size=3145728
41556+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs=Minimal SPIFFS (1.9MB APP with OTA/190KB SPIFFS)
41557+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs.build.partitions=min_spiffs
41558+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
41559+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker=RainMaker 4MB
41560+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker.build.partitions=rainmaker
41561+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker.upload.maximum_size=1966080
41562+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB=RainMaker 8MB
41563+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.build.partitions=rainmaker_8MB
41564+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.rainmaker_8MB.upload.maximum_size=4116480
41565+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash=16M Flash (2MB APP/12.5MB FATFS)
41566+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash.build.partitions=ffat
41567+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.fatflash.upload.maximum_size=2097152
41568+
41569+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB=16M Flash (3MB APP/9.9MB FATFS)
41570+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.build.partitions=app3M_fat9M_16MB
41571+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.app3M_fat9M_16MB.upload.maximum_size=3145728
41572+
41573+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs=OTA no FS (2MB APP with OTA)
41574+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs.build.custom_partitions=partitions_otanofs_4MB
41575+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.otanofs.upload.maximum_size=2031616
41576+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app=Max APP (4MB APP no OTA)
41577+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app.build.custom_partitions=partitions_all_app_4MB
41578+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.all_app.upload.maximum_size=4128768
41579+
41580+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom=Custom
41581+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom.build.partitions=
41582+
waveshare_esp32_s3_touch_amoled_241.menu.PartitionScheme.custom.upload.maximum_size=16777216
41583+
41584+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.240=240MHz (WiFi)
41585+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.240.build.f_cpu=240000000L
41586+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.160=160MHz (WiFi)
41587+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.160.build.f_cpu=160000000L
41588+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.80=80MHz (WiFi)
41589+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.80.build.f_cpu=80000000L
41590+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.40=40MHz
41591+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.40.build.f_cpu=40000000L
41592+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.20=20MHz
41593+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.20.build.f_cpu=20000000L
41594+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.10=10MHz
41595+
waveshare_esp32_s3_touch_amoled_241.menu.CPUFreq.10.build.f_cpu=10000000L
41596+
41597+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.921600=921600
41598+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.921600.upload.speed=921600
41599+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.115200=115200
41600+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.115200.upload.speed=115200
41601+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.256000.windows=256000
41602+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.256000.upload.speed=256000
41603+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400.windows.upload.speed=256000
41604+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400=230400
41605+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.230400.upload.speed=230400
41606+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.linux=460800
41607+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.macosx=460800
41608+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.460800.upload.speed=460800
41609+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.512000.windows=512000
41610+
waveshare_esp32_s3_touch_amoled_241.menu.UploadSpeed.512000.upload.speed=512000
41611+
41612+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.none=None
41613+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.none.build.code_debug=0
41614+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.error=Error
41615+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.error.build.code_debug=1
41616+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.warn=Warn
41617+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.warn.build.code_debug=2
41618+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.info=Info
41619+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.info.build.code_debug=3
41620+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.debug=Debug
41621+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.debug.build.code_debug=4
41622+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.verbose=Verbose
41623+
waveshare_esp32_s3_touch_amoled_241.menu.DebugLevel.verbose.build.code_debug=5
41624+
41625+
waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.none=Disabled
41626+
waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.none.upload.erase_cmd=
41627+
waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.all=Enabled
41628+
waveshare_esp32_s3_touch_amoled_241.menu.EraseFlash.all.upload.erase_cmd=-e
41629+
41630+
##############################################################

Diff for: ‎cores/esp32/Arduino.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@
142142
#endif
143143
#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS // All GPIOs
144144
#define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (analogChannelToDigitalPin(p)) : -1)
145-
#define digitalPinToInterrupt(p) ((((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS) ? digitalPinToGPIONumber(p) : NOT_AN_INTERRUPT)
145+
#define digitalPinToInterrupt(p) ((((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS) ? (p) : NOT_AN_INTERRUPT)
146146
#define digitalPinHasPWM(p) (((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS)
147147

148148
typedef bool boolean;

0 commit comments

Comments
 (0)