Skip to content

Commit 392687a

Browse files
authored
Merge branch 'master' into master
2 parents 61834d7 + b859bdf commit 392687a

Some content is hidden

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

46 files changed

+3592
-153
lines changed

.github/scripts/sketch_utils.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ function build_sketch { # build_sketch <ide_path> <user_path> <path-to-ino> [ext
155155
esp32c3_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
156156
esp32c6_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
157157
esp32h2_opts=$(echo "$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
158-
esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
158+
esp32p4_opts=$(echo "PSRAM=enabled,USBMode=default,ChipVariant=postv3,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
159159
esp32c5_opts=$(echo "PSRAM=enabled,$debug_level,$fqbn_append" | sed 's/^,*//;s/,*$//;s/,\{2,\}/,/g')
160160

161161
# Select the common part of the FQBN based on the target. The rest will be

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ set(ARDUINO_LIBRARY_Matter_SRCS
202202
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
203203
libraries/Matter/src/MatterEndpoints/MatterDimmablePlugin.cpp
204204
libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
205+
libraries/Matter/src/MatterEndpoints/MatterWindowCovering.cpp
205206
libraries/Matter/src/Matter.cpp
206207
libraries/Matter/src/MatterEndPoint.cpp)
207208

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Arduino core for the ESP32, ESP32-C3, ESP32-C5, ESP32-C6, ESP32-H2, ESP32-P4, ESP32-S2 and ESP32-S3.
1+
# Arduino core for the ESP32 family of SoCs
22

33
[![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)
44
[![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)

cores/esp32/MacAddress.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@ MacAddress::MacAddress(const String &macstr) {
3232
fromString(macstr.c_str());
3333
}
3434

35+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
36+
MacAddress::MacAddress(std::initializer_list<uint8_t> list) {
37+
size_t size = list.size();
38+
memset(_mac.bytes, 0, sizeof(_mac.bytes));
39+
if (size == 6) {
40+
_type = MAC6;
41+
} else if (size == 8) {
42+
_type = MAC8;
43+
} else {
44+
// Default to MAC6 and keep the rest of the bytes as 0
45+
_type = MAC6;
46+
return;
47+
}
48+
49+
memcpy(_mac.bytes, list.begin(), size);
50+
}
51+
#endif
52+
3553
MacAddress::MacAddress(uint8_t b1, uint8_t b2, uint8_t b3, uint8_t b4, uint8_t b5, uint8_t b6) {
3654
_type = MAC6;
3755
memset(_mac.bytes, 0, sizeof(_mac.bytes));

cores/esp32/MacAddress.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
#include <stdint.h>
2424
#include <WString.h>
2525
#include <Printable.h>
26+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
27+
#include <initializer_list>
28+
#endif
2629

2730
enum MACType {
2831
MAC6,
@@ -56,6 +59,12 @@ class MacAddress : public Printable {
5659
MacAddress(const char *macstr);
5760
MacAddress(const String &macstr);
5861

62+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
63+
// Initializer list constructor for {0xAA, 0xBB, ...} syntax
64+
// This has higher priority than String conversion, preventing ambiguity
65+
MacAddress(std::initializer_list<uint8_t> list);
66+
#endif
67+
5968
virtual ~MacAddress() {}
6069

6170
bool fromString(const char *buf);

cores/esp32/WString.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,13 @@ String::String(StringSumHelper &&rval) {
5959
init();
6060
move(rval);
6161
}
62+
63+
String::String(std::initializer_list<char> list) {
64+
init();
65+
if (list.size() > 0) {
66+
copy(list.begin(), list.size());
67+
}
68+
}
6269
#endif
6370

6471
String::String(char c) {

cores/esp32/WString.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
#include <stdint.h>
3030
#include <string.h>
3131
#include <ctype.h>
32+
#ifdef __GXX_EXPERIMENTAL_CXX0X__
33+
#include <initializer_list>
34+
#endif
3235

3336
// A pure abstract class forward used as a means to proide a unique pointer type
3437
// but really is never defined.
@@ -58,6 +61,7 @@ class String {
5861
String(const char *cstr, unsigned int length);
5962
#ifdef __GXX_EXPERIMENTAL_CXX0X__
6063
String(const uint8_t *cstr, unsigned int length) : String(reinterpret_cast<const char *>(cstr), length) {}
64+
String(std::initializer_list<char> list);
6165
#endif
6266
String(const String &str);
6367
String(const __FlashStringHelper *str) : String(reinterpret_cast<const char *>(str)) {}

docs/_static/chatbot_widget.css

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#kapa-widget-container {
2-
z-index: 10000 !important;
3-
position: absolute !important;
4-
}
2+
z-index: 10000 !important;
3+
position: absolute !important;
4+
}
55

6-
.mantine-Modal-root {
7-
z-index: 10000;
8-
position: absolute;
9-
}
6+
.mantine-Modal-root {
7+
z-index: 10000;
8+
position: absolute;
9+
}

docs/_static/custom.css

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/* Custom styles for Arduino ESP32 documentation */
2+
3+
/* Wide table support - make content container wider */
4+
/*
5+
.document {
6+
max-width: 1100px !important;
7+
}
8+
9+
.wy-nav-content {
10+
max-width: 1100px !important;
11+
}
12+
*/
13+
14+
/* Make tables scrollable when they exceed page width */
15+
.table-wrap {
16+
overflow-x: auto;
17+
max-width: 100%;
18+
}
19+
20+
.table-wrap table {
21+
font-size: 0.9em;
22+
width: auto !important;
23+
display: table;
24+
}

docs/conf_common.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
rst_prolog = """
77
.. |version| replace:: 3.3.4
88
.. |idf_version| replace:: 5.5
9+
.. |no| replace:: ❌
10+
.. |yes| replace:: ✅
11+
.. |n/a| replace:: ➖
912
"""
1013

1114
languages = ["en"]
@@ -29,7 +32,10 @@
2932
html_static_path = ["../_static"]
3033

3134
html_js_files = ["../_static/chatbot_widget_en.js"]
32-
html_css_files = ["../_static/chatbot_widget.css"]
35+
html_css_files = [
36+
"../_static/chatbot_widget.css",
37+
"../_static/custom.css",
38+
]
3339

3440
# Conditional content
3541

0 commit comments

Comments
 (0)