diff --git a/CMakeLists.txt b/CMakeLists.txt index a48d72f..d965a9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,13 +17,15 @@ register_component() if(IDF_TARGET STREQUAL "esp32") target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32") target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese") - +IF (IDF_VERSION_MAJOR GREATER 3) add_prebuilt_library(esp_audio_processor "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32/libesp_audio_processor.a" PRIV_REQUIRES esp-sr) add_prebuilt_library(wakenet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32/libwakenet.a" PRIV_REQUIRES esp-sr) add_prebuilt_library(multinet "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32/libmultinet.a" PRIV_REQUIRES esp-sr) add_prebuilt_library(esp_audio_front_end "${CMAKE_CURRENT_SOURCE_DIR}/lib/esp32/libesp_audio_front_end.a" PRIV_REQUIRES esp-sr) +ENDIF (IDF_VERSION_MAJOR GREATER 3) target_link_libraries(${COMPONENT_TARGET} "-Wl,--start-group" wakenet + multinet dl_lib c_speech_features hilexin_wn5 @@ -34,13 +36,9 @@ if(IDF_TARGET STREQUAL "esp32") nihaoxiaozhi_wn5X3 nihaoxiaoxin_wn5X3 customized_word_wn5 - multinet multinet2_ch esp_audio_processor esp_audio_front_end - esp_tts_chinese - voice_set_xiaole - voice_set_template "-Wl,--end-group") elseif(${IDF_TARGET} STREQUAL "esp32s2") target_link_libraries(${COMPONENT_TARGET} "-L ${CMAKE_CURRENT_SOURCE_DIR}/esp-tts/esp_tts_chinese") @@ -68,7 +66,6 @@ elseif(${IDF_TARGET} STREQUAL "esp32s3") multinet "-Wl,--end-group") - if(CONFIG_MODEL_IN_SPIFFS AND CONFIG_USE_WAKENET) set(MVMODEL_EXE ${COMPONENT_PATH}/model/movemodel.py) add_custom_command( OUTPUT ${COMPONENT_DIR}/model/target/_MODEL_INFO_ @@ -79,7 +76,7 @@ elseif(${IDF_TARGET} STREQUAL "esp32s3") add_custom_target(model DEPENDS ${COMPONENT_DIR}/model/target/_MODEL_INFO_) add_dependencies(${COMPONENT_LIB} model) - + if(CONFIG_MODEL_IN_SPIFFS AND CONFIG_USE_WAKENET) spiffs_create_partition_image(model ${COMPONENT_DIR}/model/target FLASH_IN_PROJECT DEPENDS ${COMPONENT_DIR}/model/target/_MODEL_INFO_) endif() endif() diff --git a/lib/esp32/libc_speech_features.a b/lib/esp32/libc_speech_features.a index ced10ea..b120332 100644 Binary files a/lib/esp32/libc_speech_features.a and b/lib/esp32/libc_speech_features.a differ diff --git a/lib/esp32/libcustomized_word_wn5.a b/lib/esp32/libcustomized_word_wn5.a index 6fc29aa..7b85a4f 100644 Binary files a/lib/esp32/libcustomized_word_wn5.a and b/lib/esp32/libcustomized_word_wn5.a differ diff --git a/lib/esp32/libdl_lib.a b/lib/esp32/libdl_lib.a index b66cf42..e6403c1 100644 Binary files a/lib/esp32/libdl_lib.a and b/lib/esp32/libdl_lib.a differ diff --git a/lib/esp32/libesp_audio_front_end.a b/lib/esp32/libesp_audio_front_end.a index af525a0..c1fbc85 100644 Binary files a/lib/esp32/libesp_audio_front_end.a and b/lib/esp32/libesp_audio_front_end.a differ diff --git a/lib/esp32/libesp_audio_processor.a b/lib/esp32/libesp_audio_processor.a index f168bc6..74c11d3 100644 Binary files a/lib/esp32/libesp_audio_processor.a and b/lib/esp32/libesp_audio_processor.a differ diff --git a/lib/esp32/libhilexin_wn5.a b/lib/esp32/libhilexin_wn5.a index fc3decf..1690cdf 100644 Binary files a/lib/esp32/libhilexin_wn5.a and b/lib/esp32/libhilexin_wn5.a differ diff --git a/lib/esp32/libhilexin_wn5X2.a b/lib/esp32/libhilexin_wn5X2.a index 5b5200b..b2cb3c1 100644 Binary files a/lib/esp32/libhilexin_wn5X2.a and b/lib/esp32/libhilexin_wn5X2.a differ diff --git a/lib/esp32/libhilexin_wn5X3.a b/lib/esp32/libhilexin_wn5X3.a index 812d083..fa1f5e7 100644 Binary files a/lib/esp32/libhilexin_wn5X3.a and b/lib/esp32/libhilexin_wn5X3.a differ diff --git a/lib/esp32/libmultinet.a b/lib/esp32/libmultinet.a index 1ff6931..073b913 100644 Binary files a/lib/esp32/libmultinet.a and b/lib/esp32/libmultinet.a differ diff --git a/lib/esp32/libmultinet2_ch.a b/lib/esp32/libmultinet2_ch.a index 076be7a..70664fc 100644 Binary files a/lib/esp32/libmultinet2_ch.a and b/lib/esp32/libmultinet2_ch.a differ diff --git a/lib/esp32/libnihaoxiaoxin_wn5X3.a b/lib/esp32/libnihaoxiaoxin_wn5X3.a index 6107a76..1ab173b 100644 Binary files a/lib/esp32/libnihaoxiaoxin_wn5X3.a and b/lib/esp32/libnihaoxiaoxin_wn5X3.a differ diff --git a/lib/esp32/libnihaoxiaozhi_wn5.a b/lib/esp32/libnihaoxiaozhi_wn5.a index 609097d..0e207ef 100644 Binary files a/lib/esp32/libnihaoxiaozhi_wn5.a and b/lib/esp32/libnihaoxiaozhi_wn5.a differ diff --git a/lib/esp32/libnihaoxiaozhi_wn5X2.a b/lib/esp32/libnihaoxiaozhi_wn5X2.a index f4039dd..e6edeb8 100644 Binary files a/lib/esp32/libnihaoxiaozhi_wn5X2.a and b/lib/esp32/libnihaoxiaozhi_wn5X2.a differ diff --git a/lib/esp32/libnihaoxiaozhi_wn5X3.a b/lib/esp32/libnihaoxiaozhi_wn5X3.a index 0b166f8..fe28e3e 100644 Binary files a/lib/esp32/libnihaoxiaozhi_wn5X3.a and b/lib/esp32/libnihaoxiaozhi_wn5X3.a differ diff --git a/lib/esp32/libwakenet.a b/lib/esp32/libwakenet.a index b12c6c6..c0af12e 100644 Binary files a/lib/esp32/libwakenet.a and b/lib/esp32/libwakenet.a differ diff --git a/src/model_path.c b/src/model_path.c index bab5751..ef38d6a 100644 --- a/src/model_path.c +++ b/src/model_path.c @@ -1,5 +1,6 @@ #include "stdio.h" #include "sdkconfig.h" +#include "esp_spiffs.h" char *get_model_base_path(void) { @@ -14,7 +15,6 @@ char *get_model_base_path(void) void srmodel_spiffs_init(void) { - #include "esp_spiffs.h" printf("Initializing SPIFFS\n"); esp_vfs_spiffs_conf_t conf = {