Skip to content

Commit cce458a

Browse files
authored
Merge branch 'espressif:master' into master
2 parents 5de08d0 + 11bc7ac commit cce458a

File tree

1,364 files changed

+71221
-10678
lines changed

Some content is hidden

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

1,364 files changed

+71221
-10678
lines changed

.flake8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
doctests = True
66
# W503 and W504 are mutually exclusive. PEP 8 recommends line break before.
77
ignore = W503,E203
8-
max-complexity = 20
8+
max-complexity = 30
99
max-line-length = 120
1010
select = E,W,F,C,N

.github/CODEOWNERS

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
# CI
1313
/.github/ @lucasssvaz @me-no-dev @P-R-O-C-H-Y
14+
/.github/codeql/ @lucasssvaz
15+
/.gitlab/ @lucasssvaz
1416
/tests/ @lucasssvaz @P-R-O-C-H-Y
1517

1618
# Tools
@@ -52,11 +54,13 @@
5254
/libraries/ArduinoOTA/ @me-no-dev
5355
/libraries/AsyncUDP/ @me-no-dev
5456
/libraries/BLE/ @lucasssvaz @SuGlider
57+
/libraries/ESP_HostedOTA/ @me-no-dev
5558
/libraries/ESP_I2S/ @me-no-dev
5659
/libraries/ESP_NOW/ @P-R-O-C-H-Y @lucasssvaz
5760
/libraries/ESP_SR/ @me-no-dev
5861
/libraries/ESPmDNS/ @me-no-dev
5962
/libraries/Ethernet/ @me-no-dev
63+
/libraries/Hash/ @lucasssvaz
6064
/libraries/Matter/ @SuGlider
6165
/libraries/NetBIOS/ @me-no-dev
6266
/libraries/Network/ @me-no-dev
@@ -70,9 +74,9 @@
7074
/libraries/Wire/ @me-no-dev
7175
/libraries/Zigbee/ @P-R-O-C-H-Y
7276

73-
# CI JSON
77+
# CI YAML
7478
# Keep this after other libraries and tests to avoid being overridden.
75-
**/ci.json @lucasssvaz
79+
**/ci.yml @lucasssvaz
7680

7781
# The CODEOWNERS file should be owned by the developers of the ESP32 Arduino Core.
7882
# Leave this entry as the last one to avoid being overridden.

.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,14 @@ body:
4040
label: Version
4141
description: What version of Arduino ESP32 are you running? If possible, consider updating to the latest version.
4242
options:
43-
- latest stable Release (if not listed below)
44-
- latest development Release Candidate (RC-X)
43+
- Please select a version from the list below
4544
- latest master (checkout manually)
45+
- v3.3.5
46+
- v3.3.4
47+
- v3.3.3
48+
- v3.3.2
49+
- v3.3.1
50+
- v3.3.0
4651
- v3.2.1
4752
- v3.2.0
4853
- v3.1.3
@@ -57,26 +62,18 @@ body:
5762
- v3.0.2
5863
- v3.0.1
5964
- v3.0.0
60-
- v2.0.17
61-
- v2.0.16
62-
- v2.0.15
63-
- v2.0.14
64-
- v2.0.13
65-
- v2.0.12
66-
- v2.0.11
67-
- v2.0.10
68-
- v2.0.9
69-
- v2.0.8
70-
- v2.0.7
71-
- v2.0.6
72-
- v2.0.5
73-
- v2.0.4
74-
- v2.0.3
75-
- v2.0.2
76-
- v2.0.1
77-
- v2.0.0
78-
- v1.0.6
79-
- other
65+
- Older versions
66+
validations:
67+
required: true
68+
- type: dropdown
69+
id: type
70+
attributes:
71+
label: Type
72+
description: How would you define the type of the issue? Please select from the types below.
73+
options:
74+
- "Task"
75+
- "Bug"
76+
- "Question"
8077
validations:
8178
required: true
8279
- type: input

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,3 @@ contact_links:
33
- name: Arduino Core for Espressif Discord Server
44
url: https://discord.gg/8xY6e9crwv
55
about: Community Discord server for questions and help
6-
- name: ESP32 Forum - Arduino
7-
url: https://esp32.com/viewforum.php?f=19
8-
about: Official Forum for questions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
## Description of Change
1414
Please describe your proposed Pull Request and it's impact.
1515

16-
## Tests scenarios
16+
## Test Scenarios
1717
Please describe on what Hardware and Software combinations you have tested this Pull Request and how.
1818

1919
(*eg. I have tested my Pull Request on Arduino-esp32 core v2.0.2 with ESP32 and ESP32-S2 Board with this scenario*)

.github/codeql/codeql-config.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: "CodeQL config"
2+
3+
packs:
4+
- trailofbits/cpp-queries
5+
- githubsecuritylab/codeql-cpp-queries
6+
- githubsecuritylab/codeql-python-queries
7+
8+
queries:
9+
- uses: security-extended
10+
- uses: security-and-quality
11+
12+
query-filters:
13+
- exclude:
14+
query path:
15+
- /^experimental\/.*/
16+
- exclude:
17+
tags contain:
18+
- experimental
19+
- exclude:
20+
problem.severity:
21+
- recommendation
22+
- exclude:
23+
id: tob/cpp/use-of-legacy-algorithm # We use legacy algorithms in many places for integrity checks
24+
- exclude:
25+
id: cpp/dead-code-goto # Too many false positives in no-build mode
26+
27+
paths-ignore:
28+
- tests/**

.github/pytools/Sign-File.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function FindSignTool {
1919
if (Test-Path -Path $SignTool -PathType Leaf) {
2020
return $SignTool
2121
}
22-
$sdkVers = "10.0.22000.0", "10.0.20348.0", "10.0.19041.0", "10.0.17763.0"
22+
$sdkVers = "10.0.22000.0", "10.0.20348.0", "10.0.19041.0", "10.0.17763.0", "10.0.14393.0", "10.0.15063.0", "10.0.16299.0", "10.0.17134.0", "10.0.26100.0"
2323
Foreach ($ver in $sdkVers)
2424
{
2525
$SignTool = "${env:ProgramFiles(x86)}\Windows Kits\10\bin\${ver}\x64\signtool.exe"

.github/scripts/find_all_boards.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ boards_list=$(grep '.tarch=' boards.txt)
88
while read -r line; do
99
board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
1010
# skip esp32c2 as we dont build libs for it
11-
if [ "$board_name" == "esp32c2" ]; then
11+
if [ "$board_name" == "esp32c2" ] || [ "$board_name" == "esp32c61" ]; then
1212
echo "Skipping 'espressif:esp32:$board_name'"
1313
continue
1414
fi

.github/scripts/find_new_boards.sh

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,25 @@ echo "$modified_lines"
2727
boards_array=()
2828
previous_board=""
2929

30+
# Define excluded entries that are not actual boards
31+
excluded_entries=("" "+" "-" "esp32_family" "menu")
32+
3033
# Extract board names from the modified lines, and add them to the boards_array
3134
while read -r line; do
3235
board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
3336
# remove + or - from the board name at the beginning
3437
board_name=${board_name#[-+]}
35-
if [ "$board_name" != "" ] && [ "$board_name" != "+" ] && [ "$board_name" != "-" ] && [ "$board_name" != "esp32_family" ]; then
38+
39+
# Check if board_name is in excluded entries
40+
is_excluded=false
41+
for excluded in "${excluded_entries[@]}"; do
42+
if [ "$board_name" = "$excluded" ]; then
43+
is_excluded=true
44+
break
45+
fi
46+
done
47+
48+
if [ "$is_excluded" = false ]; then
3649
if [ "$board_name" != "$previous_board" ]; then
3750
boards_array+=("espressif:esp32:$board_name")
3851
previous_board="$board_name"

0 commit comments

Comments
 (0)