Skip to content

Commit 047be2d

Browse files
authored
Merge branch 'release/v5.5' into i2c_patch_test
2 parents a0df99f + 778e87c commit 047be2d

File tree

4 files changed

+4
-123
lines changed

4 files changed

+4
-123
lines changed

configs/defconfig.esp32s3

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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]"

patches/lwip_max_tcp_pcb.diff

Lines changed: 0 additions & 118 deletions
This file was deleted.

tools/install-esp-idf.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
3737
export IDF_COMMIT=$(git -C "$IDF_PATH" rev-parse --short HEAD)
3838
export IDF_BRANCH=$(git -C "$IDF_PATH" symbolic-ref --short HEAD || git -C "$IDF_PATH" tag --points-at HEAD)
3939

40-
# Temporarily patch the ESP32-S2 I2C LL driver to keep the clock source
4140
cd $IDF_PATH
42-
patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff
43-
patch -p1 -N -i $AR_PATCHES/lwip_max_tcp_pcb.diff
41+
# Temporarily patch the ESP32-S2 I2C LL driver to keep the clock source
42+
#patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff
4443
patch -p1 -N -i $AR_PATCHES/0001-fix-i2c-optimization-performance-on-esp32.diff
4544
cd -
4645
fi

0 commit comments

Comments
 (0)