diff --git a/.gitignore b/.gitignore
index 62655f1c..a1b5d8e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ main/mmap_generate_emoji.h
 *.pyc
 *.bin
 mmap_generate_*.h
+.clangd
diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild
index 6230ea65..cce10acf 100644
--- a/main/Kconfig.projbuild
+++ b/main/Kconfig.projbuild
@@ -213,8 +213,10 @@ choice BOARD_TYPE
         depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ESP32S3_Touch_AMOLED_2_06
         bool "Waveshare ESP32-S3-Touch-AMOLED-2.06"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ESP32S3_Touch_AMOLED_1_75
         bool "Waveshare ESP32-S3-Touch-AMOLED-1.75"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_ESP32S3_Touch_LCD_4B
         bool "Waveshare ESP32-S3-Touch-LCD-4B"
         depends on IDF_TARGET_ESP32S3
@@ -365,6 +367,7 @@ choice BOARD_TYPE
         select LV_GIF_CACHE_DECODE_DATA
     config BOARD_TYPE_JIUCHUAN
         bool "九川智能"
+        depends on IDF_TARGET_ESP32S3
     config BOARD_TYPE_LABPLUS_MPYTHON_V3
         bool "labplus mpython_v3 board"
         depends on IDF_TARGET_ESP32S3
@@ -604,7 +607,7 @@ config RECEIVE_CUSTOM_MESSAGE
     help
         Enable custom message reception, allow the device to receive custom messages from the server (preferably through the MQTT protocol)
 
-menu TAIJIPAI_S3_CONFIG
+menu "TAIJIPAI_S3_CONFIG"
     depends on BOARD_TYPE_ESP32S3_Taiji_Pi
     choice I2S_TYPE_TAIJIPI_S3
         prompt "taiji-pi-S3 I2S Type"
diff --git a/main/audio/codecs/es8311_audio_codec.cc b/main/audio/codecs/es8311_audio_codec.cc
index ea425f35..0a03e87b 100644
--- a/main/audio/codecs/es8311_audio_codec.cc
+++ b/main/audio/codecs/es8311_audio_codec.cc
@@ -50,9 +50,12 @@ Es8311AudioCodec::Es8311AudioCodec(void* i2c_master_handle, i2c_port_t i2c_port,
     es8311_cfg.hw_gain.codec_dac_voltage = 3.3;
     es8311_cfg.pa_reverted = pa_inverted_;
     codec_if_ = es8311_codec_new(&es8311_cfg);
-    assert(codec_if_ != NULL);
 
-    ESP_LOGI(TAG, "Es8311AudioCodec initialized");
+    if (codec_if_ == nullptr) {
+        ESP_LOGE(TAG, "Failed to create Es8311AudioCodec");
+    } else {
+        ESP_LOGI(TAG, "Es8311AudioCodec initialized");
+    }
 }
 
 Es8311AudioCodec::~Es8311AudioCodec() {
@@ -157,6 +160,9 @@ void Es8311AudioCodec::SetOutputVolume(int volume) {
 
 void Es8311AudioCodec::EnableInput(bool enable) {
     std::lock_guard<std::mutex> lock(data_if_mutex_);
+    if (codec_if_ == nullptr) {
+        return;
+    }
     if (enable == input_enabled_) {
         return;
     }
@@ -166,6 +172,9 @@ void Es8311AudioCodec::EnableInput(bool enable) {
 
 void Es8311AudioCodec::EnableOutput(bool enable) {
     std::lock_guard<std::mutex> lock(data_if_mutex_);
+    if (codec_if_ == nullptr) {
+        return;
+    }
     if (enable == output_enabled_) {
         return;
     }
diff --git a/main/idf_component.yml b/main/idf_component.yml
index 615c7ef6..9d153d3b 100644
--- a/main/idf_component.yml
+++ b/main/idf_component.yml
@@ -12,12 +12,12 @@ dependencies:
   espressif/esp_lcd_st7796:
     version: 1.3.5
     rules:
-    - if: target not in [esp32c3, esp32c6]
+    - if: target in [esp32, esp32s2, esp32s3, esp32p4]
   espressif/esp_lcd_spd2010: ==1.0.2
   espressif/esp_io_expander_tca9554: ==2.0.0
   espressif/esp_lcd_panel_io_additions: ^1.0.1
   78/esp_lcd_nv3023: ~1.0.0
-  78/esp-wifi-connect: ~2.5.2
+  78/esp-wifi-connect: ~2.6.0
   78/esp-opus-encoder: ~2.4.1
   78/esp-ml307: ~3.3.6
   78/xiaozhi-fonts: ~1.5.3
@@ -39,7 +39,11 @@ dependencies:
   espressif2022/esp_emote_gfx: ^1.1.0
   espressif/adc_mic: ^0.2.1
   espressif/esp_mmap_assets: '>=1.2'
-  txp666/otto-emoji-gif-component: ~1.0.2
+  txp666/otto-emoji-gif-component:
+    version: 1.0.2
+    rules:
+    - if: target not in [esp32c5]
+  
   espressif/adc_battery_estimation: ^0.2.0
 
   # SenseCAP Watcher Board
@@ -48,11 +52,7 @@ dependencies:
     rules:
     - if: target in [esp32s3]
 
-  tny-robotics/sh1106-esp-idf:
-    version: ^1.0.0
-    rules:
-    - if: idf_version >= "5.4.0"
-
+  tny-robotics/sh1106-esp-idf: ^1.0.0
   waveshare/esp_lcd_jd9365_10_1:
     version: '*'
     rules:
diff --git a/sdkconfig.defaults b/sdkconfig.defaults
index c98f0701..c206b145 100644
--- a/sdkconfig.defaults
+++ b/sdkconfig.defaults
@@ -47,7 +47,6 @@ CONFIG_CAMERA_DMA_BUFFER_SIZE_MAX=8192
 # LVGL 9.2.2
 
 CONFIG_LV_OS_NONE=y
-CONFIG_LV_USE_OS=0
 CONFIG_LV_USE_CLIB_MALLOC=y
 CONFIG_LV_USE_CLIB_STRING=y
 CONFIG_LV_USE_CLIB_SPRINTF=y
diff --git a/sdkconfig.defaults.esp32c5 b/sdkconfig.defaults.esp32c5
new file mode 100644
index 00000000..abc4ffdf
--- /dev/null
+++ b/sdkconfig.defaults.esp32c5
@@ -0,0 +1,11 @@
+
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+
+CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=3
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=6
+CONFIG_ESP_WIFI_RX_BA_WIN=3
+CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=16
+CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y