Skip to content

Commit 778e87c

Browse files
authored
Merge branch 'master' into release/v5.5
2 parents 05c563f + ddfab9d commit 778e87c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

configs/defconfig.esp32s3

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ CONFIG_ULP_COPROC_TYPE_FSM=y
1919
CONFIG_ULP_COPROC_RESERVE_MEM=512
2020

2121
# RGB Display Optimizations
22-
CONFIG_LCD_RGB_ISR_IRAM_SAFE=y
22+
# CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set
2323
CONFIG_LCD_RGB_RESTART_IN_VSYNC=y

main/idf_component.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies:
1717
rules:
1818
- if: "target in [esp32s3]"
1919
espressif/esp_matter:
20-
version: "^1.4.0"
20+
version: "1.4.1"
2121
require: public
2222
rules:
2323
- if: "target not in [esp32c2, esp32h2, esp32p4, esp32c5]"

0 commit comments

Comments
 (0)