Merge branch 'feature/factory_modify_image' into 'master'

update launchpad and sr load for esp-box-3.

See merge request ae_group/esp-box!87

examples/chatgpt_demo/main/app/app_sr.c

@@ -170,7 +170,7 @@ esp_err_t app_sr_set_language(sr_language_t new_lang)
     if (g_sr_data->model_data) {
         g_sr_data->multinet->destroy(g_sr_data->model_data);
     }
-    char *wn_name = esp_srmodel_filter(models, ESP_WN_PREFIX, "hiesp");
+    char *wn_name = esp_srmodel_filter(models, ESP_WN_PREFIX, "");
     ESP_LOGI(TAG, "load wakenet:%s", wn_name);
     g_sr_data->afe_handle->set_wakenet(g_sr_data->afe_data, wn_name);
     return ESP_OK;

examples/factory_demo/main/app/app_sr.c

@@ -316,10 +316,12 @@ esp_err_t app_sr_set_language(sr_language_t new_lang)
     g_sr_data->cmd_num = 0;
 
     char *wn_name = esp_srmodel_filter(models, ESP_WN_PREFIX, (SR_LANG_EN == g_sr_data->lang ? "hiesp" : "hilexin"));
+    ESP_RETURN_ON_FALSE(NULL != wn_name, ESP_ERR_INVALID_ARG, TAG, "Modifications to the code are required to support the relevant configuration");
     g_sr_data->afe_handle->set_wakenet(g_sr_data->afe_data, wn_name);
     ESP_LOGI(TAG, "load wakenet:%s", wn_name);
 
     char *mn_name = esp_srmodel_filter(models, ESP_MN_PREFIX, ((SR_LANG_EN == g_sr_data->lang) ? ESP_MN_ENGLISH : ESP_MN_CHINESE));
+    ESP_RETURN_ON_FALSE(NULL != mn_name, ESP_ERR_INVALID_ARG, TAG, "Modifications to the code are required to support the relevant configuration");
     esp_mn_iface_t *multinet = esp_mn_handle_from_name(mn_name);
     model_iface_data_t *model_data = multinet->create(mn_name, 5760);
     g_sr_data->multinet = multinet;

examples/factory_demo/main/main.c

@@ -138,7 +138,7 @@ void app_main(void)
 #endif
 
     ESP_LOGI(TAG, "speech recognition start");
-    // vTaskDelay(pdMS_TO_TICKS(4 * 1000));
+    vTaskDelay(pdMS_TO_TICKS(4 * 1000));
     app_sr_start(false);
     app_rmaker_start();
 }

examples/factory_demo/main/main.h

@@ -11,7 +11,7 @@
 /** Minor version number (x.X.x) */
 #define BOX_DEMO_VERSION_MINOR 2
 /** Patch version number (x.x.X) */
-#define BOX_DEMO_VERSION_PATCH 0
+#define BOX_DEMO_VERSION_PATCH 1
 
 /**
  * Macro to convert version number into an integer

launch.toml

@@ -4,6 +4,8 @@ firmware_images_url = "https://dl.espressif.com/AE/esp-box/"
 supported_apps = [
     "ESP-BOX-3_Demo_V1_1_1",
     "ESP-BOX-3_ChatGPT_Demo_V1_0",
+    "ESP-BOX-3_USB_Headset_V0_0_1",
+    "ESP-BOX-3_USB_Camera_V0_0_1",
     "ESP-BOX-3_MATTER_SWITCH_Demo_V1_0",
 
     "ESP-BOX_Demo_CN_V0_3_0",
@@ -82,7 +84,7 @@ ios_app_url = ""
 
 [ESP-BOX-3_Demo_V1_1_1]
 chipsets = ["ESP32-S3"]
-image.esp32-s3 = "ESP-BOX-3_Demo_V1.1.1.bin"
+image.esp32-s3 = "ESP-BOX-3_Demo_V1.2.1.bin"
 android_app_url = ""
 ios_app_url = ""
 
@@ -103,3 +105,15 @@ chipsets = ["ESP32-S3"]
 image.esp32-s3 = "ESP-BOX-3_MATTER_SWITCH_Demo_V1.0.bin"
 android_app_url = ""
 ios_app_url = ""
+
+[ESP-BOX-3_USB_Headset_V0_0_1]
+chipsets = ["ESP32-S3"]
+image.esp32-s3 = "ESP-BOX-3-usb-headset.bin"
+android_app_url = ""
+ios_app_url = ""
+
+[ESP-BOX-3_USB_Camera_V0_0_1]
+chipsets = ["ESP32-S3"]
+image.esp32-s3 = "ESP-BOX-3-usb-camera.bin"
+android_app_url = ""
+ios_app_url = ""