diff --git a/components/audio_pipeline/audio_element.c b/components/audio_pipeline/audio_element.c index 39b24468e..65ee46bf7 100644 --- a/components/audio_pipeline/audio_element.c +++ b/components/audio_pipeline/audio_element.c @@ -441,7 +441,7 @@ audio_element_err_t audio_element_output(audio_element_handle_t el, char *buffer break; case AEL_IO_DONE: case AEL_IO_OK: - ESP_LOGI(TAG, "OUT-[%s] AEL_IO_DONE,%d", el->tag, output_len); + // ESP_LOGI(TAG, "OUT-[%s] AEL_IO_DONE,%d", el->tag, output_len); break; case AEL_IO_FAIL: ESP_LOGE(TAG, "OUT-[%s] AEL_STATUS_ERROR_OUTPUT", el->tag); diff --git a/components/audio_stream/include/aec_stream.h b/components/audio_stream/include/aec_stream.h index 3642e2f20..93a8e83bd 100644 --- a/components/audio_stream/include/aec_stream.h +++ b/components/audio_stream/include/aec_stream.h @@ -25,6 +25,10 @@ #pragma once +#ifdef __cplusplus +extern "C" { +#endif + #include "audio_element.h" #include "esp_afe_aec.h" @@ -37,8 +41,8 @@ .task_stack = AEC_STREAM_TASK_STACK_SIZE, \ .task_prio = AEC_STREAM_TASK_PERIOD, \ .task_core = AEC_STREAM_PINNED_TO_CORE, \ - .debug_aec = false, \ .stack_in_ext = true, \ + .debug_aec = false, \ .type = AFE_TYPE_VC_8K, \ .mode = AFE_MODE_LOW_COST, \ .filter_length = 4, \ @@ -65,4 +69,8 @@ typedef struct { * * @return The audio element handle */ -audio_element_handle_t aec_stream_init(aec_stream_cfg_t *cfg); \ No newline at end of file +audio_element_handle_t aec_stream_init(aec_stream_cfg_t *cfg); + +#ifdef __cplusplus +} +#endif \ No newline at end of file diff --git a/components/esp-adf-libs b/components/esp-adf-libs index c19e0375e..2c8547799 160000 --- a/components/esp-adf-libs +++ b/components/esp-adf-libs @@ -1 +1 @@ -Subproject commit c19e0375e9f87ada211b52ae919c88c6431a4f0d +Subproject commit 2c8547799f8110c67973b7cb53c94f757a40d51d diff --git a/examples/speech_recognition/wwe/.clangd b/examples/speech_recognition/wwe/.clangd new file mode 100644 index 000000000..437f25545 --- /dev/null +++ b/examples/speech_recognition/wwe/.clangd @@ -0,0 +1,2 @@ +CompileFlags: + Remove: [-f*, -m*] diff --git a/examples/speech_recognition/wwe/main/main.c b/examples/speech_recognition/wwe/main/main.c index 61e4f4931..c6ba4139e 100644 --- a/examples/speech_recognition/wwe/main/main.c +++ b/examples/speech_recognition/wwe/main/main.c @@ -136,7 +136,7 @@ static esp_audio_handle_t setup_player() esp_audio_output_stream_add(player, i2s_stream_writer); // Set default volume - esp_audio_vol_set(player, 60); + esp_audio_vol_set(player, 100); AUDIO_MEM_SHOW(TAG); ESP_LOGI(TAG, "esp_audio instance is:%p\r\n", player); diff --git a/examples/speech_recognition/wwe/partitions.csv b/examples/speech_recognition/wwe/partitions.csv index b8fd6df78..105f6a022 100644 --- a/examples/speech_recognition/wwe/partitions.csv +++ b/examples/speech_recognition/wwe/partitions.csv @@ -1,8 +1,8 @@ # Name, Type, SubType, Offset, Size, Flags # Note: if you change the phy_init or app partition offset, make sure to change the offset in Kconfig.projbuild,,,, -nvs, data, nvs, 0x9000, 0x4000, -otadata, data, ota, 0xd000, 0x2000, -phy_init, data, phy, 0xf000, 0x1000, +nvs, data, nvs, , 0x4000, +otadata, data, ota, , 0x2000, +phy_init, data, phy, , 0x1000, ota_0, app, ota_0, , 2624K, model, data, spiffs, , 5120K, flash_tone, data, 0x27, , 200K, \ No newline at end of file diff --git a/export.bat b/export.bat index cd8272c30..c6ccda25d 100644 --- a/export.bat +++ b/export.bat @@ -5,16 +5,16 @@ set ADF_PATH=%~dp0 set ADF_PATH=%ADF_PATH:~0,-1% :: Check IDF_PATH -if not defined IDF_PATH ( - set IDF_PATH=%ADF_PATH%\esp-idf -) + +set IDF_PATH=%ADF_PATH%\esp-idf + echo ADF_PATH: %ADF_PATH% echo IDF_PATH: %IDF_PATH% call %IDF_PATH%\export.bat if %errorlevel% neq 0 (goto :ErrorHandling) -python.exe "%ADF_PATH%\tools\adf_install_patches.py" apply-patch +python "%ADF_PATH%\tools\adf_install_patches.py" apply-patch if %errorlevel% neq 0 (goto :ErrorHandling) echo.