Skip to content

Commit 2df340f

Browse files
me-no-devme-no-dev
authored
Merge branch 'master' into feature/get_py_verify
2 parents e636e53 + c16a325 commit 2df340f

34 files changed

+539
-488
lines changed

Diff for: ‎.github/ISSUE_TEMPLATE/Issue-report.yml

+4
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v3.0.0
45+
- v2.0.17
46+
- v2.0.16
47+
- v2.0.15
4448
- v2.0.14
4549
- v2.0.13
4650
- v2.0.12

Diff for: ‎.github/scripts/find_new_boards.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ do
5454
break
5555
fi
5656
board_name=$(echo "$line" | cut -d '.' -f1 | cut -d '#' -f1)
57-
if [ "$board_name" != "" ]
57+
if [ "$board_name" != "" ] && [ "$board_name" != "esp32_family" ]
5858
then
5959
if [ "$board_name" != "$previous_board" ]
6060
then

Diff for: ‎.github/scripts/merge_packages.py

+5-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
# Written by Ivan Grokhotkov, 2015
66
#
77
from __future__ import print_function
8-
from distutils.version import LooseVersion
8+
#from distutils.version import LooseVersion
9+
from packaging.version import Version
910
import re
1011
import json
1112
import sys
@@ -33,7 +34,7 @@ def merge_objects(versions, obj):
3334
def pkgVersionNormalized(versionString):
3435

3536
verStr = str(versionString)
36-
verParts = re.split('\.|-rc', verStr, flags=re.IGNORECASE)
37+
verParts = re.split('\.|-rc|-alpha', verStr, flags=re.IGNORECASE)
3738

3839
if len(verParts) == 3:
3940
if (sys.version_info > (3, 0)): # Python 3
@@ -74,7 +75,8 @@ def main(args):
7475
print("Adding platform {0}-{1}".format(name, version), file=sys.stderr)
7576
pkg1['platforms'].append(platforms[name][version])
7677

77-
pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)
78+
#pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: LooseVersion(pkgVersionNormalized(k['version'])), reverse=True)
79+
pkg1['platforms'] = sorted(pkg1['platforms'], key=lambda k: Version(pkgVersionNormalized(k['version'])), reverse=True)
7880

7981
json.dump({'packages':[pkg1]}, sys.stdout, indent=2)
8082

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

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ RVTC_NEW_NAME="esp-rv32"
221221
echo "Generating platform.txt..."
222222
cat "$GITHUB_WORKSPACE/platform.txt" | \
223223
sed "s/version=.*/version=$RELEASE_TAG/g" | \
224+
sed 's/tools\.esp32-arduino-libs\.path\.windows=.*//g' | \
224225
sed 's/{runtime\.platform\.path}.tools.esp32-arduino-libs/\{runtime.tools.esp32-arduino-libs.path\}/g' | \
225226
sed 's/{runtime\.platform\.path}.tools.xtensa-esp-elf-gdb/\{runtime.tools.xtensa-esp-elf-gdb.path\}/g' | \
226227
sed 's/{runtime\.platform\.path}.tools.xtensa-esp32-elf/\{runtime.tools.xtensa-esp32-elf-gcc.path\}/g' | \

Diff for: ‎.github/scripts/tests_run.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function run_test() {
77
local erase_flash=$4
88
local sketchdir=$(dirname $sketch)
99
local sketchname=$(basename $sketchdir)
10+
local result=0
1011

1112
if [[ -f "$sketchdir/.skip.$platform" ]] || [[ -f "$sketchdir/.skip.$target" ]] || [[ -f "$sketchdir/.skip.$platform.$target" ]]; then
1213
echo "Skipping $sketchname test for $target, platform: $platform"
@@ -61,11 +62,18 @@ function run_test() {
6162
extra_args="--embedded-services esp,arduino"
6263
fi
6364

65+
result=0
6466
echo "pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args"
65-
bash -c "pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args"
67+
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
6668
result=$?
6769
if [ $result -ne 0 ]; then
68-
return $result
70+
result=0
71+
echo "Retrying test: $sketchname -- Config: $i"
72+
bash -c "set +e; pytest tests --build-dir $build_dir -k test_$sketchname --junit-xml=$report_file $extra_args; exit \$?" || result=$?
73+
result=$?
74+
if [ $result -ne 0 ]; then
75+
exit $result
76+
fi
6977
fi
7078
done
7179
}

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

+6-10
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ jobs:
5959
echo "test_folder=${test_folder}" >> $GITHUB_OUTPUT
6060
echo "test_type=${test_type}" >> $GITHUB_OUTPUT
6161
62+
- name: Upload Event file
63+
uses: actions/upload-artifact@v4
64+
with:
65+
name: event_file
66+
path: ${{github.event_path}}
67+
6268
build:
6369
needs: gen_chunks
6470
name: ${{matrix.chip}}-Build#${{matrix.chunks}}
@@ -267,13 +273,3 @@ jobs:
267273
path: |
268274
tests/**/*.xml
269275
tests/**/result_*.json
270-
271-
event_file:
272-
name: "Event File"
273-
runs-on: ubuntu-latest
274-
steps:
275-
- name: Upload
276-
uses: actions/upload-artifact@v4
277-
with:
278-
name: event_file
279-
path: ${{github.event_path}}

Diff for: ‎.github/workflows/lib.json

+9-1
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,13 @@
6262
"sketch_path": [
6363
"~/Arduino/libraries/WS2812FX/examples/ws2812fx_spi/ws2812fx_spi.ino"
6464
]
65+
},
66+
{
67+
"name": "ZACwire for TSic",
68+
"exclude_targets": [],
69+
"sketch_path": [
70+
"~/Arduino/libraries/ZACwire_for_TSic/examples/ReadingTwoTSICs/ReadingTwoTSICs.ino",
71+
"~/Arduino/libraries/ZACwire_for_TSic/examples/ReadSingleTSIC206/ReadSingleTSIC206.ino"
72+
]
6573
}
66-
]
74+
]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
IFS=$'\t' read name url <<< "$artifact"
3333
gh api $url > "$name.zip"
3434
unzip -j "$name.zip" -d "temp_$name"
35-
if [[ "$name" == "pr_num" ]]; then
35+
if [[ "$name" == "pr_number" ]]; then
3636
mv "temp_$name"/* workflows
3737
else
3838
mv "temp_$name"/* libraries-report

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
IFS=$'\t' read name url <<< "$artifact"
4747
gh api $url > "$name.zip"
4848
unzip -j "$name.zip" -d "temp_$name"
49-
if [[ "$name" == "pr_num" ]]; then
49+
if [[ "$name" == "pr_number" ]]; then
5050
mv "temp_$name"/* sizes-report
5151
elif [[ "$name" == "pr_cli"* ]]; then
5252
mv "temp_$name"/* sizes-report/pr

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

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
- uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.x'
19+
- run: pip install packaging
1920
- name: Build Release
2021
env:
2122
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

+3
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ jobs:
9595
- name: Install Wokwi CLI
9696
run: curl -L https://wokwi.com/ci/install.sh | sh
9797

98+
- name: Wokwi CI Server
99+
uses: wokwi/wokwi-ci-server-action@v1
100+
98101
- name: Install dependencies
99102
run: |
100103
pip install -U pip

Diff for: ‎Kconfig.projbuild

+2-2
Original file line numberDiff line numberDiff line change
@@ -311,8 +311,8 @@ config ARDUINO_SELECTIVE_FFat
311311
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
312312
default y
313313

314-
config ARDUINO_SELECTIVE_LITTLEFS
315-
bool "Enable LITTLEFS"
314+
config ARDUINO_SELECTIVE_LittleFS
315+
bool "Enable LittleFS"
316316
depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_FS
317317
default y
318318

Diff for: ‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ Here are the ESP32 series supported by the Arduino-ESP32 project:
5757
| ESP32-S2 | Yes | Yes | [ESP32-S2](https://www.espressif.com/sites/default/files/documentation/esp32-s2_datasheet_en.pdf) |
5858
| ESP32-C3 | Yes | Yes | [ESP32-C3](https://www.espressif.com/sites/default/files/documentation/esp32-c3_datasheet_en.pdf) |
5959
| ESP32-S3 | Yes | Yes | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
60-
| ESP32-C6 | No | Yes | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
61-
| ESP32-H2 | No | Yes | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
60+
| ESP32-C6 | Yes | Yes | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
61+
| ESP32-H2 | Yes | Yes | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
6262

6363
> [!NOTE]
6464
> ESP32-C2 is also supported by Arduino-ESP32 but requires rebuilding the static libraries. This is not trivial and requires a good understanding of the ESP-IDF

0 commit comments

Comments
 (0)