diff --git a/Kconfig.projbuild b/Kconfig.projbuild index bb61777..d02b078 100644 --- a/Kconfig.projbuild +++ b/Kconfig.projbuild @@ -85,8 +85,8 @@ choice SR_WN_MODEL_LOAD bool "nihaoxiaozhi (wn9_nihaoxiaozhi)" depends on IDF_TARGET_ESP32S3 - config SR_WN_CUSTOMIZED_WORD - bool "customized word (wn9_customizedword)" + config SR_WN_WN9_CUSTOMWORD + bool "customized word (wn9_customword)" depends on IDF_TARGET_ESP32S3 config SR_WN_LOAD_MULIT_WORD diff --git a/include/esp32s3/dl_lib_conv_queue.h b/include/esp32s3/dl_lib_conv_queue.h index e0ca0a1..890689d 100644 --- a/include/esp32s3/dl_lib_conv_queue.h +++ b/include/esp32s3/dl_lib_conv_queue.h @@ -20,7 +20,7 @@ typedef float fptp_t; //Flags for matrices -#define DL_MF_FOREIGNDATA (1<<0) /*< Matrix *item data actually points to another matrix and should not be freed */ +// #define DL_MF_FOREIGNDATA (0) /*< Matrix *item data actually points to another matrix and should not be freed */ //Float convolution FIFO queue. typedef struct { diff --git a/include/esp32s3/dl_lib_matrix.h b/include/esp32s3/dl_lib_matrix.h index d046e24..c6590b2 100644 --- a/include/esp32s3/dl_lib_matrix.h +++ b/include/esp32s3/dl_lib_matrix.h @@ -32,7 +32,7 @@ extern multi_heap_handle_t gst_heap; #endif //Flags for matrices -#define DL_MF_FOREIGNDATA (1<<0) /*< Matrix *item data actually points to another matrix and should not be freed */ +#define DL_MF_FOREIGNDATA (0) /*< Matrix *item data actually points to another matrix and should not be freed */ //'Normal' float matrix typedef struct { diff --git a/lib/esp32s3/libc_speech_features.a b/lib/esp32s3/libc_speech_features.a index 8843b35..a5bffe2 100644 Binary files a/lib/esp32s3/libc_speech_features.a and b/lib/esp32s3/libc_speech_features.a differ diff --git a/lib/esp32s3/libdl_lib.a b/lib/esp32s3/libdl_lib.a index 18e3130..cebb577 100644 Binary files a/lib/esp32s3/libdl_lib.a and b/lib/esp32s3/libdl_lib.a differ diff --git a/lib/esp32s3/libesp_audio_front_end.a b/lib/esp32s3/libesp_audio_front_end.a index 29174ad..77f8a19 100644 Binary files a/lib/esp32s3/libesp_audio_front_end.a and b/lib/esp32s3/libesp_audio_front_end.a differ diff --git a/lib/esp32s3/libmultinet.a b/lib/esp32s3/libmultinet.a index 0c2956d..a8063eb 100644 Binary files a/lib/esp32s3/libmultinet.a and b/lib/esp32s3/libmultinet.a differ diff --git a/lib/esp32s3/libwakenet.a b/lib/esp32s3/libwakenet.a index 06fda4f..d4ca86f 100644 Binary files a/lib/esp32s3/libwakenet.a and b/lib/esp32s3/libwakenet.a differ diff --git a/model/movemodel.py b/model/movemodel.py index b8d5519..abaf2c9 100644 --- a/model/movemodel.py +++ b/model/movemodel.py @@ -56,6 +56,8 @@ if "CONFIG_SR_WN_WN9_HIESP" in WN_STRING: wakenet_model.append('wn9_hiesp') if "CONFIG_SR_WN_WN9_NIHAOXIAOZHI" in WN_STRING: wakenet_model.append('wn9_nihaoxiaozhi') +if "CONFIG_SR_WN_WN9_CUSTOMWORD" in WN_STRING: + wakenet_model.append('wn9_customword') multinet_model = [] if "CONFIG_SR_MN_CN_MULTINET3_SINGLE_RECOGNITION" in MN_STRING and len(multinet_model) < 2: diff --git a/model/wakenet_model/wn9_customword/_MODEL_INFO_ b/model/wakenet_model/wn9_customword/_MODEL_INFO_ new file mode 100644 index 0000000..354730c --- /dev/null +++ b/model/wakenet_model/wn9_customword/_MODEL_INFO_ @@ -0,0 +1 @@ +WakeNet9_v1h24_xiaoaitongxue_3_0.620_0.627 \ No newline at end of file diff --git a/model/wakenet_model/wn9_customword/wn9_data b/model/wakenet_model/wn9_customword/wn9_data new file mode 100644 index 0000000..0ce7695 Binary files /dev/null and b/model/wakenet_model/wn9_customword/wn9_data differ diff --git a/model/wakenet_model/wn9_customword/wn9_index b/model/wakenet_model/wn9_customword/wn9_index new file mode 100644 index 0000000..0e86f0a Binary files /dev/null and b/model/wakenet_model/wn9_customword/wn9_index differ