Skip to content

Commit fe1806d

Browse files
authored
Merge branch 'master' into feat/zigbee-extender-endpoint
2 parents 8195468 + 8e9f7c3 commit fe1806d

Some content is hidden

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

60 files changed

+728
-304
lines changed

.github/ISSUE_TEMPLATE/Issue-report.yml

+2
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.2
45+
- v3.1.1
4446
- v3.1.0
4547
- v3.0.7
4648
- v3.0.6

.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ jobs:
245245
# See https://hub.docker.com/r/espressif/idf/tags and
246246
# https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
247247
# for details.
248-
idf_ver: ["release-v5.3"]
248+
idf_ver: ["release-v5.4"]
249249
idf_target:
250250
[
251251
"esp32",

CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# idf.py build
77

88
set(min_supported_idf_version "5.3.0")
9-
set(max_supported_idf_version "5.3.99")
9+
set(max_supported_idf_version "5.4.99")
1010
set(idf_version "${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}.${IDF_VERSION_PATCH}")
1111

1212
if ("${idf_version}" AND NOT "$ENV{ARDUINO_SKIP_IDF_VERSION_CHECK}")
@@ -33,6 +33,7 @@ set(CORE_SRCS
3333
cores/esp32/esp32-hal-dac.c
3434
cores/esp32/esp32-hal-gpio.c
3535
cores/esp32/esp32-hal-i2c.c
36+
cores/esp32/esp32-hal-i2c-ng.c
3637
cores/esp32/esp32-hal-i2c-slave.c
3738
cores/esp32/esp32-hal-ledc.c
3839
cores/esp32/esp32-hal-matrix.c

boards.txt

+81-145
Large diffs are not rendered by default.

cores/esp32/WString.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,8 @@ String &String::operator=(StringSumHelper &&rval) {
290290
#endif
291291

292292
String &String::operator=(const char *cstr) {
293-
return copy(cstr, strlen(cstr));
293+
const uint32_t length = cstr ? strlen(cstr) : 0u;
294+
return copy(cstr, length);
294295
}
295296

296297
/*********************************************/

0 commit comments

Comments
 (0)