speech_recognition/esp-sr
1
0
Fork 0
mirror of https://github.com/espressif/esp-sr.git synced 2025-09-15 15:28:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'feat/default_sdkconfig_path' into 'master'

Browse Source 
feat: use default sdkconfig path

See merge request speech-recognition-framework/esp-sr!81
This commit is contained in:
Sun Xiang Yu 2023-12-06 14:05:50 +08:00
commit 36ec4242d0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -1,5 +1,5 @@
if(IDF_TARGET STREQUAL "esp32")
set(include_dirs
set(include_dirs
src/include
esp-tts/esp_tts_chinese/include
include/esp32
@ -37,14 +37,14 @@ if(IDF_TARGET STREQUAL "esp32")
c_speech_features
wakeword_model
multinet2_ch
esp_audio_processor
esp_audio_processor
esp_audio_front_end
esp_tts_chinese
esp_tts_chinese
voice_set_xiaole
wakenet
"-Wl,--end-group")
elseif(${IDF_TARGET} STREQUAL "esp32s3")
set(include_dirs
set(include_dirs
src/include
esp-tts/esp_tts_chinese/include
include/esp32s3
@ -104,8 +104,8 @@ elseif(${IDF_TARGET} STREQUAL "esp32s3")
add_custom_command(
OUTPUT ${image_file}
COMMENT "Move and Pack models..."
COMMAND python ${MVMODEL_EXE} -d1 ${PROJECT_DIR} -d2 ${COMPONENT_PATH} -d3 ${build_dir}
DEPENDS ${PROJECT_DIR}/sdkconfig
COMMAND python ${MVMODEL_EXE} -d1 ${SDKCONFIG} -d2 ${COMPONENT_PATH} -d3 ${build_dir}
DEPENDS ${SDKCONFIG}
VERBATIM)
add_custom_target(srmodels_bin ALL DEPENDS ${image_file})
@ -152,7 +152,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32c3")
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
@ -171,7 +171,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32c6")
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

4
model/movemodel.py
View File

@ -126,12 +126,12 @@ def copy_nsnet_from_sdkconfig(model_path, sdkconfig_path, target_path):
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Model generator tool')
parser.add_argument('-d1', '--project_path')
parser.add_argument('-d1', '--sdkconfig_path')
parser.add_argument('-d2', '--model_path')
parser.add_argument('-d3', '--build_path')
args = parser.parse_args()
sdkconfig_path = args.project_path + '/sdkconfig'
sdkconfig_path = args.sdkconfig_path
model_path = args.model_path + '/model'
target_path = args.build_path + '/srmodels'
image_file = "srmodels.bin"