diff --git a/Kconfig.projbuild b/Kconfig.projbuild index 886fb8c..1259325 100644 --- a/Kconfig.projbuild +++ b/Kconfig.projbuild @@ -141,7 +141,7 @@ endchoice choice SR_MN_MODE_SEL prompt "speech commands recognition model" - default SR_MN_CN_MULTINET5_SINGLE_RECOGNITION + default SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION depends on USE_MULTINET help Select the model to be used. @@ -174,8 +174,8 @@ choice SR_MN_MODE_SEL bool "chinese single recognition (MultiNet4)" depends on SR_MN_CHINESE && IDF_TARGET_ESP32S3 - config SR_MN_CN_MULTINET5_SINGLE_RECOGNITION - bool "chinese single recognition (MultiNet5)" + config SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION + bool "chinese single recognition (MultiNet4.5)" depends on SR_MN_CHINESE && IDF_TARGET_ESP32S3 endchoice diff --git a/include/esp32s3/esp_mn_models.h b/include/esp32s3/esp_mn_models.h index 8214422..2ead4d4 100644 --- a/include/esp32s3/esp_mn_models.h +++ b/include/esp32s3/esp_mn_models.h @@ -39,9 +39,9 @@ extern const esp_mn_iface_t esp_sr_multinet5_quantized8; #elif CONFIG_SR_MN_CN_MULTINET3_CONTINUOUS_RECOGNITION #define MULTINET_MODEL esp_sr_multinet3_continuous_quantized_cn #define MULTINET_COEFF "mn3cn" -#elif CONFIG_SR_MN_CN_MULTINET5_SINGLE_RECOGNITION +#elif CONFIG_SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION #define MULTINET_MODEL esp_sr_multinet4_single_quantized_cn -#define MULTINET_COEFF "mn5cn" +#define MULTINET_COEFF "mn4_5cn" #elif CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION #define MULTINET_MODEL esp_sr_multinet5_quantized #define MULTINET_COEFF "mn5en" diff --git a/lib/esp32s3/libmultinet.a b/lib/esp32s3/libmultinet.a index 18d9a8d..8afdf5b 100644 Binary files a/lib/esp32s3/libmultinet.a and b/lib/esp32s3/libmultinet.a differ diff --git a/libversion b/libversion index 3934b59..2c8bee3 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -4949e6c67e2bde9ac4978345623dcc098f34c404 \ No newline at end of file +2ff2713a9e508f2160f5b318374925d6c12af917 \ No newline at end of file diff --git a/model/movemodel.py b/model/movemodel.py index 49072c0..23dc561 100644 --- a/model/movemodel.py +++ b/model/movemodel.py @@ -62,8 +62,8 @@ def calculate_total_size(folder_path): multinet_model = 'mn3cn' elif "CONFIG_SR_MN_CN_MULTINET4_SINGLE_RECOGNITION" in MN_STRING: multinet_model = 'mn4cn' -elif "CONFIG_SR_MN_CN_MULTINET5_SINGLE_RECOGNITION" in MN_STRING: - multinet_model = 'mn5cn' +elif "CONFIG_SR_MN_CN_MULTINET4_5_SINGLE_RECOGNITION" in MN_STRING: + multinet_model = 'mn4_5cn' elif "CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION_QUANT8" in MN_STRING: multinet_model = 'mn5q8en' elif "CONFIG_SR_MN_EN_MULTINET5_SINGLE_RECOGNITION" in MN_STRING: diff --git a/model/multinet_model/mn5cn/_MODEL_INFO_ b/model/multinet_model/mn4_5cn/_MODEL_INFO_ similarity index 100% rename from model/multinet_model/mn5cn/_MODEL_INFO_ rename to model/multinet_model/mn4_5cn/_MODEL_INFO_ diff --git a/model/multinet_model/mn5cn/mn5cn_data b/model/multinet_model/mn4_5cn/mn4_5cn_data similarity index 100% rename from model/multinet_model/mn5cn/mn5cn_data rename to model/multinet_model/mn4_5cn/mn4_5cn_data diff --git a/model/multinet_model/mn5cn/mn5cn_index b/model/multinet_model/mn4_5cn/mn4_5cn_index similarity index 100% rename from model/multinet_model/mn5cn/mn5cn_index rename to model/multinet_model/mn4_5cn/mn4_5cn_index