Skip to content

Commit 60946fc

Browse files
lucasssvazlucasssvaz
committed
Merge branch 'master' into test1
2 parents beaa8b4 + 082e31f commit 60946fc

File tree

97 files changed

+3168
-320
lines changed

Some content is hidden

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

97 files changed

+3168
-320
lines changed

‎.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ body:
4141
options:
4242
- latest master (checkout manually)
4343
- latest development Release Candidate (RC-X)
44+
- v3.1.0
45+
- v3.0.7
4446
- v3.0.6
4547
- v3.0.5
4648
- v3.0.4

‎.github/scripts/on-push.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ function build {
99
local chunk_index=$2
1010
local chunks_cnt=$3
1111
local build_log=$4
12-
local sketches_file=$5
13-
shift 5
12+
local log_level=${5:-none}
13+
local sketches_file=$6
14+
shift 6
1415
local sketches=("$@")
1516

1617
local BUILD_SKETCH="${SCRIPTS_DIR}/sketch_utils.sh build"
@@ -19,7 +20,7 @@ function build {
1920
local args=("-ai" "$ARDUINO_IDE_PATH" "-au" "$ARDUINO_USR_PATH" "-t" "$target")
2021

2122
if [ "$OS_IS_LINUX" == "1" ]; then
22-
args+=("-p" "$ARDUINO_ESP32_PATH/libraries" "-i" "$chunk_index" "-m" "$chunks_cnt")
23+
args+=("-p" "$ARDUINO_ESP32_PATH/libraries" "-i" "$chunk_index" "-m" "$chunks_cnt" "-d" "$log_level")
2324
if [ -n "$sketches_file" ]; then
2425
args+=("-f" "$sketches_file")
2526
fi
@@ -54,7 +55,8 @@ fi
5455
CHUNK_INDEX=$1
5556
CHUNKS_CNT=$2
5657
BUILD_LOG=$3
57-
SKETCHES_FILE=$4
58+
LOG_LEVEL=$4
59+
SKETCHES_FILE=$5
5860
if [ "$#" -lt 2 ] || [ "$CHUNKS_CNT" -le 0 ]; then
5961
CHUNK_INDEX=0
6062
CHUNKS_CNT=1
@@ -88,13 +90,13 @@ if [ "$BUILD_LOG" -eq 1 ]; then
8890
fi
8991

9092
#build sketches for different targets
91-
build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
92-
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
93-
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
94-
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
95-
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
96-
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
97-
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
93+
build "esp32p4" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
94+
build "esp32s3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
95+
build "esp32s2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
96+
build "esp32c3" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
97+
build "esp32c6" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
98+
build "esp32h2" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
99+
build "esp32" "$CHUNK_INDEX" "$CHUNKS_CNT" "$BUILD_LOG" "$LOG_LEVEL" "$SKETCHES_FILE" "${SKETCHES_ESP32[@]}"
98100

99101
if [ "$BUILD_LOG" -eq 1 ]; then
100102
#remove last comma from the last JSON object

‎.github/scripts/sketch_utils.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,11 @@ function build_sketches { # build_sketches <ide_path> <user_path> <target> <path
443443
shift
444444
sketches_file=$1
445445
;;
446+
-d )
447+
shift
448+
debug_level="$1"
449+
args+=("-d" "$debug_level")
450+
;;
446451
* )
447452
break
448453
;;

‎.github/workflows/dangerjs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: DangerJS pull request linter
2020
uses: espressif/shared-github-dangerjs@v1
2121
env:
22-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
GITHUB_TOKEN: ${{ secrets.DANGERJS_PAT }}
2323
with:
2424
instructions-cla-link: "https://cla-assistant.io/espressif/arduino-esp32"
2525
instructions-contributions-file: "docs/en/contributing.rst"

‎.github/workflows/push.yml

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,22 @@ name: Compilation Tests
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
log_level:
7+
description: "Log level"
8+
default: "none"
9+
type: "choice"
10+
required: true
11+
options:
12+
- "none"
13+
- "error"
14+
- "warn"
15+
- "info"
16+
- "debug"
17+
- "verbose"
18+
schedule:
19+
# Every Sunday at 2:00 UTC run a build with verbose log level
20+
- cron: "0 2 * * SUN"
521
push:
622
branches:
723
- master
@@ -163,9 +179,19 @@ jobs:
163179
./tools/riscv32-*
164180
./tools/xtensa-*
165181
182+
- name: Set Log Level
183+
run: |
184+
if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
185+
echo "LOG_LEVEL=${{ github.event.inputs.log_level }}" >> $GITHUB_ENV
186+
elif [ "${{ github.event_name }}" == "schedule" ]; then
187+
echo "LOG_LEVEL=verbose" >> $GITHUB_ENV
188+
else
189+
echo "LOG_LEVEL=none" >> $GITHUB_ENV
190+
fi
191+
166192
- name: Build all sketches
167193
if: ${{ needs.gen-chunks.outputs.build_all == 'true' }}
168-
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} ${{ env.MAX_CHUNKS }} 1
194+
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} ${{ env.MAX_CHUNKS }} 1 ${{ env.LOG_LEVEL }}
169195

170196
- name: Download sketches found
171197
if: ${{ needs.gen-chunks.outputs.build_all == 'false' && needs.gen-chunks.outputs.build_libraries == 'true' }}
@@ -175,7 +201,7 @@ jobs:
175201

176202
- name: Build selected sketches
177203
if: ${{ needs.gen-chunks.outputs.build_all == 'false' && needs.gen-chunks.outputs.build_libraries == 'true' }}
178-
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} ${{ needs.gen-chunks.outputs.chunk_count }} 1 sketches_found.txt
204+
run: bash ./.github/scripts/on-push.sh ${{ matrix.chunk }} ${{ needs.gen-chunks.outputs.chunk_count }} 1 ${{ env.LOG_LEVEL }} sketches_found.txt
179205

180206
#Upload cli compile json as artifact
181207
- name: Upload cli compile json

‎.github/workflows/tests_results.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,10 @@ jobs:
149149
uses: jaywcjlove/[email protected]
150150
with:
151151
label: Runtime Tests
152-
status: ${{ job.status }}
152+
status: ${{ job.status == 'success' && 'passing' || 'failing' }}
153153
output: runtime-tests-results/badge.svg
154154
color: ${{ job.status == 'success' && 'green' || 'red' }}
155+
style: flat
155156

156157
- name: Push badge
157158
if: ${{ !cancelled() && (env.original_event == 'schedule' || env.original_event == 'workflow_dispatch') }} # codespell:ignore cancelled

‎.github/workflows/upload-idf-component.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
name: Push components to https://components.espressif.com
22

33
on:
4+
workflow_dispatch:
5+
inputs:
6+
tag:
7+
description: 'Tag to push to the component registry'
8+
required: true
49
workflow_run:
510
workflows: ["ESP32 Arduino Release"]
611
types:
@@ -15,9 +20,9 @@ jobs:
1520
steps:
1621
- name: Get the release tag
1722
env:
18-
head_branch: ${{ github.event.workflow_run.head_branch }}
23+
head_branch: ${{ inputs.tag || github.event.workflow_run.head_branch }}
1924
run: |
20-
if [ "${{ github.event.workflow_run.conclusion }}" != "success" ]; then
25+
if [ "${{ github.event.workflow_run.conclusion }}" != "success" ] && [ "${{ github.event_name }}" == "workflow_run" ]; then
2126
echo "Release workflow failed. Exiting..."
2227
exit 1
2328
fi
@@ -39,6 +44,7 @@ jobs:
3944
4045
- uses: actions/checkout@v4
4146
with:
47+
ref: ${{ env.RELEASE_TAG }}
4248
submodules: "recursive"
4349

4450
- name: Upload components to the component registry

‎CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ set(ARDUINO_LIBRARY_Matter_SRCS
179179
libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp
180180
libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp
181181
libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
182+
libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
183+
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
182184
libraries/Matter/src/Matter.cpp)
183185

184186
set(ARDUINO_LIBRARY_PPP_SRCS
@@ -274,10 +276,15 @@ set(ARDUINO_LIBRARY_Zigbee_SRCS
274276
libraries/Zigbee/src/ZigbeeHandlers.cpp
275277
libraries/Zigbee/src/ep/ZigbeeColorDimmableLight.cpp
276278
libraries/Zigbee/src/ep/ZigbeeColorDimmerSwitch.cpp
279+
libraries/Zigbee/src/ep/ZigbeeDimmableLight.cpp
277280
libraries/Zigbee/src/ep/ZigbeeLight.cpp
278281
libraries/Zigbee/src/ep/ZigbeeSwitch.cpp
279282
libraries/Zigbee/src/ep/ZigbeeTempSensor.cpp
280283
libraries/Zigbee/src/ep/ZigbeeThermostat.cpp
284+
libraries/Zigbee/src/ep/ZigbeeFlowSensor.cpp
285+
libraries/Zigbee/src/ep/ZigbeePressureSensor.cpp
286+
libraries/Zigbee/src/ep/ZigbeeOccupancySensor.cpp
287+
libraries/Zigbee/src/ep/ZigbeeCarbonDioxideSensor.cpp
281288
)
282289

283290
set(ARDUINO_LIBRARY_BLE_SRCS

‎README.md

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Arduino core for the ESP32, ESP32-P4, ESP32-S2, ESP32-S3, ESP32-C3, ESP32-C6 and ESP32-H2
22

3-
[![Build Status](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml/badge.svg?branch=master&event=push)](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml) [![External Libraries Test](https://github.com/espressif/arduino-esp32/actions/workflows/lib.yml/badge.svg?branch=master&event=schedule)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md) [![Hardware Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
3+
[![Build Status](https://img.shields.io/github/actions/workflow/status/espressif/arduino-esp32/push.yml?branch=master&event=push&label=Compilation%20Tests)](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml?query=branch%3Amaster+event%3Apush)
4+
[![Verbose Build Status](https://img.shields.io/github/actions/workflow/status/espressif/arduino-esp32/push.yml?branch=master&event=schedule&label=Compilation%20Tests%20(Verbose))](https://github.com/espressif/arduino-esp32/actions/workflows/push.yml?query=branch%3Amaster+event%3Aschedule)
5+
[![External Libraries Test](https://img.shields.io/github/actions/workflow/status/espressif/arduino-esp32/lib.yml?branch=master&event=schedule&label=External%20Libraries%20Test)](https://github.com/espressif/arduino-esp32/blob/gh-pages/LIBRARIES_TEST.md)
6+
[![Runtime Tests](https://github.com/espressif/arduino-esp32/blob/gh-pages/runtime-tests-results/badge.svg)](https://github.com/espressif/arduino-esp32/actions/workflows/tests_results.yml)
47

58
### Need help or have a question? Join the chat at [Gitter](https://gitter.im/espressif/arduino-esp32) or [open a new Discussion](https://github.com/espressif/arduino-esp32/discussions)
69

@@ -16,9 +19,17 @@
1619

1720
### Development Status
1821

19-
Latest Stable Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/) [![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/latest/)
22+
#### Latest Stable Release
2023

21-
Latest Development Release [![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/) [![Release Date](https://img.shields.io/github/release-date-pre/espressif/arduino-esp32.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/) [![Downloads](https://img.shields.io/github/downloads-pre/espressif/arduino-esp32/latest/total.svg?style=plastic)](https://github.com/espressif/arduino-esp32/releases/)
24+
[![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
25+
[![Release Date](https://img.shields.io/github/release-date/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
26+
[![Downloads](https://img.shields.io/github/downloads/espressif/arduino-esp32/latest/total.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
27+
28+
#### Latest Development Release
29+
30+
[![Release Version](https://img.shields.io/github/release/espressif/arduino-esp32/all.svg)](https://github.com/espressif/arduino-esp32/releases/)
31+
[![Release Date](https://img.shields.io/github/release-date-pre/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/)
32+
[![Downloads](https://img.shields.io/github/downloads-pre/espressif/arduino-esp32/latest/total.svg)](https://github.com/espressif/arduino-esp32/releases/)
2233

2334
### Development Planning
2435

@@ -59,7 +70,7 @@ Here are the ESP32 series supported by the Arduino-ESP32 project:
5970
| ESP32-S3 | Yes | Yes | [ESP32-S3](https://www.espressif.com/sites/default/files/documentation/esp32-s3_datasheet_en.pdf) |
6071
| ESP32-C6 | Yes | Yes | [ESP32-C6](https://www.espressif.com/sites/default/files/documentation/esp32-c6_datasheet_en.pdf) |
6172
| ESP32-H2 | Yes | Yes | [ESP32-H2](https://www.espressif.com/sites/default/files/documentation/esp32-h2_datasheet_en.pdf) |
62-
| ESP32-P4 | No | Yes | [ESP32-P4](https://www.espressif.com/sites/default/files/documentation/esp32-p4_datasheet_en.pdf) |
73+
| ESP32-P4 | Yes | Yes | [ESP32-P4](https://www.espressif.com/sites/default/files/documentation/esp32-p4_datasheet_en.pdf) |
6374

6475
> [!NOTE]
6576
> 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)