Merge branch 'bugfix/tts' into 'master'

bugfix: fix cpp error in esp-tts

See merge request speech-recognition-framework/esp-sr!113

.gitlab-ci.yml

@@ -176,8 +176,6 @@ test_esp_sr:
       optional: true
   parallel:
     matrix:
-      - TEST_TARGET: esp32p4
-        TEST_ENV: esp32p4
       - TEST_TARGET: esp32s3
         TEST_ENV: esp32s3
   tags: 
@@ -197,8 +195,6 @@ test_esp_tts:
       optional: true
   parallel:
     matrix:
-      - TEST_TARGET: esp32p4
-        TEST_ENV: esp32p4
       - TEST_TARGET: esp32s3
         TEST_ENV: esp32s3
   tags: 

esp-tts/esp_tts_chinese/include/esp_tts.h

@@ -129,7 +129,7 @@ void esp_tts_stream_reset(esp_tts_handle_t tts_handle);
 void esp_tts_destroy(esp_tts_handle_t tts_handle);
 
 #ifdef __cplusplus
-extern "C" {
+}
 #endif
 
-#endif
+#endif

esp-tts/esp_tts_chinese/include/esp_tts_player.h

@@ -61,7 +61,7 @@ unsigned char* esp_tts_stream_play_by_concat(esp_tts_player_handle_t player, con
 void esp_tts_player_destroy(esp_tts_player_handle_t player);
 
 #ifdef __cplusplus
-extern "C" {
+}
 #endif
 
-#endif
+#endif

test_apps/esp-tts/pytest_esp_tts.py

@@ -7,7 +7,7 @@ from pytest_embedded import Dut
 @pytest.mark.parametrize(
     'config',
     [
-        'xiaoxin',
+        's3',
     ],
 )
 def test_tts(dut: Dut)-> None:
@@ -28,4 +28,4 @@ def test_tts_p4(dut: Dut)-> None:
     # dut.run_all_single_board_cases(group="tts")
     dut.expect_exact('Press ENTER to see the list of tests.')
     dut.write('[tts]')
-    dut.expect_unity_test_output(timeout = 1000)
+    dut.expect_unity_test_output(timeout = 1000)

test_apps/esp-tts/sdkconfig.defaults

@@ -0,0 +1,8 @@
+# This file was generated using idf.py save-defconfig. It can be edited manually.
+# Espressif IoT Development Framework (ESP-IDF) 5.3.0 Project Minimal Configuration
+#
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SPIRAM=y
+CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=n
+CONFIG_ESP_INT_WDT=n
+CONFIG_ESP_TASK_WDT_EN=n

test_apps/esp-tts/sdkconfig.defaults.esp32s3

@@ -0,0 +1,22 @@
+# This file was generated using idf.py save-defconfig. It can be edited manually.
+# Espressif IoT Development Framework (ESP-IDF) 5.3.0 Project Minimal Configuration
+#
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_SPIRAM=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_80M=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB=y
+CONFIG_ESP32S3_DATA_CACHE_64KB=y
+CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
+CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=n
+CONFIG_ESP_INT_WDT=n
+CONFIG_ESP_TASK_WDT_EN=n
+CONFIG_ESP_WIFI_GMAC_SUPPORT=n
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
+CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_UNITY_CRITICAL_LEAK_LEVEL_GENERAL=1024