Skip to content

Commit 0b6b6d7

Browse files
authored
Merge branch 'master' into idf-release/v5.5
2 parents f8e8369 + b859bdf commit 0b6b6d7

File tree

88 files changed

+9539
-626
lines changed

Some content is hidden

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

88 files changed

+9539
-626
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ 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)
4645
- v3.3.4
4746
- v3.3.3
@@ -62,26 +61,7 @@ body:
6261
- v3.0.2
6362
- v3.0.1
6463
- v3.0.0
65-
- v2.0.17
66-
- v2.0.16
67-
- v2.0.15
68-
- v2.0.14
69-
- v2.0.13
70-
- v2.0.12
71-
- v2.0.11
72-
- v2.0.10
73-
- v2.0.9
74-
- v2.0.8
75-
- v2.0.7
76-
- v2.0.6
77-
- v2.0.5
78-
- v2.0.4
79-
- v2.0.3
80-
- v2.0.2
81-
- v2.0.1
82-
- v2.0.0
83-
- v1.0.6
84-
- other
64+
- Older versions
8565
validations:
8666
required: true
8767
- type: dropdown

.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: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,18 @@ set(ARDUINO_LIBRARY_Matter_SRCS
191191
libraries/Matter/src/MatterEndpoints/MatterEnhancedColorLight.cpp
192192
libraries/Matter/src/MatterEndpoints/MatterFan.cpp
193193
libraries/Matter/src/MatterEndpoints/MatterTemperatureSensor.cpp
194+
libraries/Matter/src/MatterEndpoints/MatterTemperatureControlledCabinet.cpp
194195
libraries/Matter/src/MatterEndpoints/MatterHumiditySensor.cpp
195196
libraries/Matter/src/MatterEndpoints/MatterContactSensor.cpp
197+
libraries/Matter/src/MatterEndpoints/MatterWaterLeakDetector.cpp
198+
libraries/Matter/src/MatterEndpoints/MatterWaterFreezeDetector.cpp
199+
libraries/Matter/src/MatterEndpoints/MatterRainSensor.cpp
196200
libraries/Matter/src/MatterEndpoints/MatterPressureSensor.cpp
197201
libraries/Matter/src/MatterEndpoints/MatterOccupancySensor.cpp
198202
libraries/Matter/src/MatterEndpoints/MatterOnOffPlugin.cpp
203+
libraries/Matter/src/MatterEndpoints/MatterDimmablePlugin.cpp
199204
libraries/Matter/src/MatterEndpoints/MatterThermostat.cpp
205+
libraries/Matter/src/MatterEndpoints/MatterWindowCovering.cpp
200206
libraries/Matter/src/Matter.cpp
201207
libraries/Matter/src/MatterEndPoint.cpp)
202208

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)

boards.txt

Lines changed: 563 additions & 0 deletions
Large diffs are not rendered by default.

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+
}

0 commit comments

Comments
 (0)