Skip to content

Commit d837e84

Browse files
authored
Merge branch 'master' into master
2 parents ce8c7e9 + 396def3 commit d837e84

File tree

196 files changed

+1852
-496
lines changed

Some content is hidden

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

196 files changed

+1852
-496
lines changed

Diff for: .codespellrc

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
[codespell]
22
# Source: https://github.com/arduino/tooling-project-assets/blob/main/workflow-templates/assets/spell-check/.codespellrc
33
# In the event of a false positive, add the problematic word, in all lowercase, to a comma-separated list here:
4-
ignore-words-list = ba,licence,ot,dout,als,exten,acount,totaly,pasttime
4+
ignore-words-list = ba,licence,ot,dout,als,exten
55
skip = ./.git,./.licenses,__pycache__,.clang-format,.codespellrc,.editorconfig,.flake8,.prettierignore,.yamllint.yml,.gitignore,boards.txt,platform.txt,programmers.txt
66
builtin = clear,informal,en-GB_to_en-US
77
check-filenames =
88
check-hidden =
9-
write-changes =

Diff for: .github/scripts/on-release.sh

+4-72
Original file line numberDiff line numberDiff line change
@@ -279,68 +279,6 @@ echo "Package Uploaded"
279279
echo "Download URL: $PACKAGE_URL"
280280
echo
281281

282-
##
283-
## LIBS PACKAGE ZIP
284-
##
285-
286-
LIBS_PROJ_NAME="esp32-arduino-libs"
287-
LIBS_PKG_DIR="$OUTPUT_DIR/$LIBS_PROJ_NAME"
288-
LIBS_PACKAGE_ZIP="$LIBS_PROJ_NAME-$RELEASE_TAG.zip"
289-
290-
# Get the libs package URL from the template
291-
LIBS_PACKAGE_SRC_ZIP="$OUTPUT_DIR/src-$LIBS_PROJ_NAME.zip"
292-
LIBS_PACKAGE_SRC_URL=`cat $PACKAGE_JSON_TEMPLATE | jq -r ".packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\") | .systems[0].url"`
293-
294-
# Download the libs package
295-
echo "Downloading the libs archive ..."
296-
curl -o "$LIBS_PACKAGE_SRC_ZIP" -LJO --url "$LIBS_PACKAGE_SRC_URL" || exit 1
297-
298-
# Extract the libs package
299-
echo "Extracting the archive ..."
300-
unzip -q -d "$OUTPUT_DIR" "$LIBS_PACKAGE_SRC_ZIP" || exit 1
301-
EXTRACTED_DIR=`ls "$OUTPUT_DIR" | grep "^$LIBS_PROJ_NAME"`
302-
mv "$OUTPUT_DIR/$EXTRACTED_DIR" "$LIBS_PKG_DIR" || exit 1
303-
304-
# Remove unnecessary files in the package folder
305-
echo "Cleaning up folders ..."
306-
find "$LIBS_PKG_DIR" -name '*.DS_Store' -exec rm -f {} \;
307-
find "$LIBS_PKG_DIR" -name '*.git*' -type f -delete
308-
309-
# Compress package folder
310-
echo "Creating ZIP ..."
311-
pushd "$OUTPUT_DIR" >/dev/null
312-
zip -qr "$LIBS_PACKAGE_ZIP" "$LIBS_PROJ_NAME"
313-
if [ $? -ne 0 ]; then echo "ERROR: Failed to create $LIBS_PACKAGE_ZIP ($?)"; exit 1; fi
314-
315-
# Calculate SHA-256
316-
echo "Calculating SHA sum ..."
317-
LIBS_PACKAGE_PATH="$OUTPUT_DIR/$LIBS_PACKAGE_ZIP"
318-
LIBS_PACKAGE_SHA=`shasum -a 256 "$LIBS_PACKAGE_ZIP" | cut -f 1 -d ' '`
319-
LIBS_PACKAGE_SIZE=`get_file_size "$LIBS_PACKAGE_ZIP"`
320-
popd >/dev/null
321-
rm -rf "$LIBS_PKG_DIR"
322-
echo "'$LIBS_PACKAGE_ZIP' Created! Size: $LIBS_PACKAGE_SIZE, SHA-256: $LIBS_PACKAGE_SHA"
323-
echo
324-
325-
# Upload package to release page
326-
echo "Uploading libs package to release page ..."
327-
LIBS_PACKAGE_URL=`git_safe_upload_asset "$LIBS_PACKAGE_PATH"`
328-
echo "Libs Package Uploaded"
329-
echo "Libs Download URL: $LIBS_PACKAGE_URL"
330-
echo
331-
332-
# Construct JQ argument with libs package data
333-
libs_jq_arg="\
334-
(.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].url = \"$LIBS_PACKAGE_URL\" |\
335-
(.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].archiveFileName = \"$LIBS_PACKAGE_ZIP\" |\
336-
(.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].size = \"$LIBS_PACKAGE_SIZE\" |\
337-
(.packages[0].tools[] | select(.name==\"$LIBS_PROJ_NAME\")).systems[].checksum = \"SHA-256:$LIBS_PACKAGE_SHA\""
338-
339-
# Update template values for the libs package and store it in the build folder
340-
cat "$PACKAGE_JSON_TEMPLATE" | jq "$libs_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json"
341-
# Overwrite the template location with the newly edited one
342-
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME.json"
343-
344282
##
345283
## TEMP WORKAROUND FOR RV32 LONG PATH ON WINDOWS
346284
##
@@ -364,8 +302,8 @@ rvtc_jq_arg="\
364302
(.packages[0].platforms[0].toolsDependencies[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\" |\
365303
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).version = \"$RVTC_VERSION\" |\
366304
(.packages[0].tools[] | select(.name==\"$XS3TC_NAME\")).name = \"$XS3TC_NEW_NAME\""
367-
cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json"
368-
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-$LIBS_PROJ_NAME-rvfix.json"
305+
cat "$PACKAGE_JSON_TEMPLATE" | jq "$rvtc_jq_arg" > "$OUTPUT_DIR/package-rvfix.json"
306+
PACKAGE_JSON_TEMPLATE="$OUTPUT_DIR/package-rvfix.json"
369307

370308
##
371309
## PACKAGE JSON
@@ -428,12 +366,9 @@ export PATH="/home/runner/bin:$PATH"
428366
source ./.github/scripts/install-arduino-cli.sh
429367

430368
echo "Testing $PACKAGE_JSON_DEV install ..."
431-
echo "Updating index ..."
432-
arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_DEV"
433-
if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
434369

435370
echo "Installing esp32 ..."
436-
arduino-cli core install esp32:esp32
371+
arduino-cli core install esp32:esp32 --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_DEV"
437372
if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
438373

439374
echo "Compiling example ..."
@@ -448,12 +383,9 @@ echo "Test successful!"
448383

449384
if [ "$RELEASE_PRE" == "false" ]; then
450385
echo "Testing $PACKAGE_JSON_REL install ..."
451-
echo "Updating index ..."
452-
arduino-cli core update-index --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_REL"
453-
if [ $? -ne 0 ]; then echo "ERROR: Failed to update index ($?)"; exit 1; fi
454386

455387
echo "Installing esp32 ..."
456-
arduino-cli core install esp32:esp32
388+
arduino-cli core install esp32:esp32 --additional-urls "file://$OUTPUT_DIR/$PACKAGE_JSON_REL"
457389
if [ $? -ne 0 ]; then echo "ERROR: Failed to install esp32 ($?)"; exit 1; fi
458390

459391
echo "Compiling example ..."

Diff for: .github/scripts/tests_run.sh

+4
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ while [ ! -z "$1" ]; do
132132
-W )
133133
shift
134134
wokwi_timeout=$1
135+
if [[ -z $WOKWI_CLI_TOKEN ]]; then
136+
echo "Wokwi CLI token is not set"
137+
exit 1
138+
fi
135139
platform="wokwi"
136140
;;
137141
-o )

Diff for: .gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
tools/esp32-arduino-libs
2+
tools/xtensa-esp-elf
23
tools/xtensa-esp32-elf
34
tools/xtensa-esp32s2-elf
45
tools/xtensa-esp32s3-elf

Diff for: .pre-commit-config.yaml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
exclude: |
22
(?x)(
33
^\.github\/|
4-
^tests\/performance\/coremark\/.*\.[ch]$
4+
^tests\/performance\/coremark\/.*\.[ch]$|
5+
^tests\/performance\/superpi\/.*\.(cpp|h)$|
6+
LICENSE\.md$
57
)
68
79
default_language_version:
@@ -24,11 +26,10 @@ repos:
2426
- id: trailing-whitespace
2527
args: [--markdown-linebreak-ext=md]
2628
- repo: https://github.com/codespell-project/codespell
27-
rev: "v2.2.4"
29+
rev: "v2.3.0"
2830
hooks:
2931
- id: codespell
3032
exclude: ^.*\.(svd|SVD)$
31-
stages: [manual]
3233
- repo: https://github.com/pre-commit/mirrors-clang-format
3334
rev: "v18.1.3"
3435
hooks:
@@ -64,8 +65,6 @@ repos:
6465
pass_filenames: false
6566
args: [sync]
6667
types_or: [markdown, rst]
67-
stages: [manual]
6868
- id: vale
6969
language_version: "1.21.6"
7070
types_or: [markdown, rst]
71-
stages: [manual]

Diff for: .vale.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ StylesPath = .vale/styles
2323

2424

2525
# Specify the minimum alert severity that Vale will report.
26-
MinAlertLevel = suggestion # "suggestion", "warning", or "error"
26+
MinAlertLevel = error # "suggestion", "warning", or "error"
2727

2828

2929
# Specify vocabulary for special treatment.

Diff for: CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ target_compile_options(${COMPONENT_TARGET} PUBLIC
320320
-DARDUINO_ARCH_ESP32
321321
-DARDUINO_BOARD="${idf_target_caps}_DEV"
322322
-DARDUINO_VARIANT="${CONFIG_ARDUINO_VARIANT}"
323-
-DESP32)
323+
-DESP32=ESP32)
324324

325325
if(CONFIG_AUTOSTART_ARDUINO)
326326
# in autostart mode, arduino-esp32 contains app_main() function and needs to

Diff for: CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
We as members, contributors, and leaders pledge to make participation in our
66
community a harassment-free experience for everyone, regardless of age, body
77
size, visible or invisible disability, ethnicity, sex characteristics, gender
8-
identity and expression, level of experience, education, socio-economic status,
8+
identity and expression, level of experience, education, socioeconomic status,
99
nationality, personal appearance, race, religion, or sexual identity
1010
and orientation.
1111

0 commit comments

Comments
 (0)