From 7fc45a20736f34f6debfd8023ec664a3820487c5 Mon Sep 17 00:00:00 2001 From: xysun Date: Wed, 5 Feb 2025 16:59:34 +0800 Subject: [PATCH] release esp-sr v2.0.0 rc1 --- CMakeLists.txt | 222 +--------------------------------------------- idf_component.yml | 2 +- 2 files changed, 3 insertions(+), 221 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e9da512..85db6c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,6 +96,7 @@ if((${IDF_TARGET} STREQUAL "esp32s3") OR (${IDF_TARGET} STREQUAL "esp32p4") OR ( endif() elseif((${IDF_TARGET} STREQUAL "esp32s2") OR (${IDF_TARGET} STREQUAL "esp32c3") OR (${IDF_TARGET} STREQUAL "esp32c6")) +#Only support TTS on esp32s2, esp32c3 and esp32c6 set(requires spiffs @@ -118,223 +119,4 @@ target_link_libraries(${COMPONENT_TARGET} INTERFACE "-Wl,--start-group" voice_set_xiaole "-Wl,--end-group") -endif() - -# elseif(${IDF_TARGET} STREQUAL "esp32s3") -# set(include_dirs -# src/include -# esp-tts/esp_tts_chinese/include -# include/esp32s3 -# ) -# set(srcs -# src/model_path.c -# src/esp_mn_speech_commands.c -# src/esp_process_sdkconfig.c -# ) - -# set(requires -# json -# spiffs -# ) - -# IF (IDF_VERSION_MAJOR GREATER 4) -# list(APPEND requires esp_partition) -# ENDIF (IDF_VERSION_MAJOR GREATER 4) - -# idf_component_register(SRCS ${srcs} -# INCLUDE_DIRS ${include_dirs} -# REQUIRES ${requires} -# PRIV_REQUIRES spi_flash) - -# target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3") -# target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese/esp32s3") - -# add_prebuilt_library(flite_g2p "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libflite_g2p.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(esp_audio_processor "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libesp_audio_processor.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(vadnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libvadnet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(wakenet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libwakenet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(multinet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libmultinet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libesp_audio_front_end.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(hufzip "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libhufzip.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(nsnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32s3/libnsnet.a" PRIV_REQUIRES ${COMPONENT_NAME}) - -# idf_component_get_property(esp_dsp_lib espressif__esp-dsp COMPONENT_LIB) - -# target_link_libraries(${COMPONENT_TARGET} "-Wl,--start-group" -# hufzip -# dl_lib -# fst -# c_speech_features -# $ -# esp_audio_front_end -# esp_audio_processor -# multinet -# flite_g2p -# esp_tts_chinese -# voice_set_xiaole -# nsnet -# vadnet -# wakenet -# "-Wl,--end-group") - -# set(MVMODEL_EXE ${COMPONENT_PATH}/model/movemodel.py) -# idf_build_get_property(build_dir BUILD_DIR) -# set(image_file ${build_dir}/srmodels/srmodels.bin) - -# add_custom_command( -# OUTPUT ${image_file} -# COMMENT "Move and Pack models..." -# COMMAND python ${MVMODEL_EXE} -d1 ${SDKCONFIG} -d2 ${COMPONENT_PATH} -d3 ${build_dir} -# DEPENDS ${SDKCONFIG} -# VERBATIM) - -# add_custom_target(srmodels_bin ALL DEPENDS ${image_file}) -# add_dependencies(flash srmodels_bin) - -# partition_table_get_partition_info(size "--partition-name model" "size") -# partition_table_get_partition_info(offset "--partition-name model" "offset") - -# if("${size}" AND "${offset}") -# esptool_py_flash_to_partition(flash "model" "${image_file}") -# else() -# set(message "Failed to find model in partition table file" -# "Please add a line(Name=model, Size>recommended size in log) to the partition file.") -# endif() -# elseif(${IDF_TARGET} STREQUAL "esp32p4") -# set(include_dirs -# src/include -# esp-tts/esp_tts_chinese/include -# include/esp32p4 -# ) -# set(srcs -# src/model_path.c -# src/esp_mn_speech_commands.c -# src/esp_process_sdkconfig.c -# ) - -# set(requires -# json -# spiffs -# ) - -# IF (IDF_VERSION_MAJOR GREATER 4) -# list(APPEND requires esp_partition) -# ENDIF (IDF_VERSION_MAJOR GREATER 4) - -# idf_component_register(SRCS ${srcs} -# INCLUDE_DIRS ${include_dirs} -# REQUIRES ${requires} -# PRIV_REQUIRES spi_flash) - -# target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4") -# target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese/esp32p4") - -# add_prebuilt_library(flite_g2p "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libflite_g2p.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(esp_audio_processor "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libesp_audio_processor.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(wakenet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libwakenet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(vadnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libvadnet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(multinet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libmultinet.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libesp_audio_front_end.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(hufzip "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libhufzip.a" PRIV_REQUIRES ${COMPONENT_NAME}) -# add_prebuilt_library(nsnet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32p4/libnsnet.a" PRIV_REQUIRES ${COMPONENT_NAME}) - -# idf_component_get_property(esp_dsp_lib espressif__esp-dsp COMPONENT_LIB) - -# target_link_libraries(${COMPONENT_TARGET} "-Wl,--start-group" -# hufzip -# dl_lib -# fst -# c_speech_features -# $ -# esp_audio_front_end -# esp_audio_processor -# multinet -# flite_g2p -# esp_tts_chinese -# voice_set_xiaole -# wakenet -# vadnet -# nsnet -# "-Wl,--end-group") - -# set(MVMODEL_EXE ${COMPONENT_PATH}/model/movemodel.py) -# idf_build_get_property(build_dir BUILD_DIR) -# set(image_file ${build_dir}/srmodels/srmodels.bin) - -# add_custom_command( -# OUTPUT ${image_file} -# COMMENT "Move and Pack models..." -# COMMAND python ${MVMODEL_EXE} -d1 ${SDKCONFIG} -d2 ${COMPONENT_PATH} -d3 ${build_dir} -# DEPENDS ${SDKCONFIG} -# VERBATIM) - -# add_custom_target(srmodels_bin ALL DEPENDS ${image_file}) -# add_dependencies(flash srmodels_bin) - -# partition_table_get_partition_info(size "--partition-name model" "size") -# partition_table_get_partition_info(offset "--partition-name model" "offset") - -# if("${size}" AND "${offset}") -# esptool_py_flash_to_partition(flash "model" "${image_file}") -# else() -# set(message "Failed to find model in partition table file" -# "Please add a line(Name=model, Size>recommended size in log) to the partition file.") -# endif() -# elseif(${IDF_TARGET} STREQUAL "esp32s2") -# set(requires -# spiffs -# ) - -# IF (IDF_VERSION_MAJOR GREATER 4) -# list(APPEND requires esp_partition) -# ENDIF (IDF_VERSION_MAJOR GREATER 4) - -# idf_component_register(SRCS . -# INCLUDE_DIRS esp-tts/esp_tts_chinese/include -# REQUIRES ${requires} -# PRIV_REQUIRES spi_flash) - -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese/esp32s2") -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-Wl,--start-group" -# esp_tts_chinese -# voice_set_xiaole -# "-Wl,--end-group") -# elseif(${IDF_TARGET} STREQUAL "esp32c3") -# set(requires -# spiffs -# ) - -# IF (IDF_VERSION_MAJOR GREATER 4) -# list(APPEND requires esp_partition) -# ENDIF (IDF_VERSION_MAJOR GREATER 4) - -# idf_component_register(SRCS . -# INCLUDE_DIRS esp-tts/esp_tts_chinese/include -# REQUIRES ${requires} -# PRIV_REQUIRES spi_flash) - -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese/esp32c3") -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-Wl,--start-group" -# esp_tts_chinese -# voice_set_xiaole -# "-Wl,--end-group") -# elseif(${IDF_TARGET} STREQUAL "esp32c6") -# set(requires -# spiffs -# ) - -# IF (IDF_VERSION_MAJOR GREATER 4) -# list(APPEND requires esp_partition) -# ENDIF (IDF_VERSION_MAJOR GREATER 4) - -# idf_component_register(SRCS . -# INCLUDE_DIRS esp-tts/esp_tts_chinese/include -# REQUIRES ${requires} -# PRIV_REQUIRES spi_flash) - -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese/esp32c6") -# target_link_libraries(${COMPONENT_TARGET} INTERFACE "-Wl,--start-group" -# esp_tts_chinese -# voice_set_xiaole -# "-Wl,--end-group") -# endif() +endif() \ No newline at end of file diff --git a/idf_component.yml b/idf_component.yml index 145cee4..b846fa6 100644 --- a/idf_component.yml +++ b/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.9.5" +version: "2.0.0~1-rc.1" description: esp_sr provides basic algorithms for Speech Recognition applications url: https://github.com/espressif/esp-sr dependencies: