Switch to 2.0 branch (#1152)

* Adapt boards to v2 partition tables

* fix esp log error

* fix display style

* reset emotion after download assets

* fix compiling

* update assets default url

* Add user only tools

* Add image cache

* smaller cache and buffer, more heap

* use MAIN_EVENT_CLOCK_TICK to avoid audio glitches

* bump to 2.0.0

* fix compiling errors

---------

Co-authored-by: Xiaoxia <[email protected]>

Author: 78

.gitignore

@@ -13,7 +13,6 @@ main/assets/lang_config.h
 main/mmap_generate_emoji.h
 .DS_Store
 .cache
-main/mmap_generate_emoji.h
 *.pyc
 *.bin
 mmap_generate_*.h

CMakeLists.txt

@@ -4,7 +4,7 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "1.9.0")
+set(PROJECT_VER "2.0.0")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)

main/CMakeLists.txt

@@ -14,6 +14,7 @@ set(SOURCES "audio/audio_codec.cc"
             "display/display.cc"
             "display/lcd_display.cc"
             "display/oled_display.cc"
+            "display/emoji_collection.cc"
             "protocols/protocol.cc"
             "protocols/mqtt_protocol.cc"
             "protocols/websocket_protocol.cc"
@@ -23,6 +24,7 @@ set(SOURCES "audio/audio_codec.cc"
             "ota.cc"
             "settings.cc"
             "device_state_event.cc"
+            "assets.cc"
             "main.cc"
             )
 

main/Kconfig.projbuild

@@ -6,6 +6,11 @@ config OTA_URL
     help
         The application will access this URL to check for new firmwares and server address.
 
+config DEFAULT_ASSETS_URL_PREFIX
+    string "Default Assets URL Prefix"
+    default "https://files.xiaozhi.me/assets/default/"
+    help
+        The assets will be downloaded from this URL.
 
 choice
     prompt "Default Language"

main/application.cc

@@ -7,6 +7,8 @@
 #include "websocket_protocol.h"
 #include "assets/lang_config.h"
 #include "mcp_server.h"
+#include "assets.h"
+#include "settings.h"
 
 #include <cstring>
 #include <esp_log.h>
@@ -67,6 +69,65 @@ Application::~Application() {
     vEventGroupDelete(event_group_);
 }
 
+void Application::CheckAssetsVersion() {
+    auto& board = Board::GetInstance();
+    auto display = board.GetDisplay();
+    auto assets = board.GetAssets();
+    if (!assets) {
+        ESP_LOGE(TAG, "Assets is not set for board %s", BOARD_NAME);
+        return;
+    }
+
+    if (!assets->partition_valid()) {
+        ESP_LOGE(TAG, "Assets partition is not valid for board %s", BOARD_NAME);
+        return;
+    }
+    
+    Settings settings("assets", true);
+    // Check if there is a new assets need to be downloaded
+    std::string download_url = settings.GetString("download_url");
+    if (!download_url.empty()) {
+        settings.EraseKey("download_url");
+    }
+    if (download_url.empty() && !assets->checksum_valid()) {
+        download_url = assets->default_assets_url();
+    }
+
+    if (!download_url.empty()) {
+        char message[256];
+        snprintf(message, sizeof(message), Lang::Strings::FOUND_NEW_ASSETS, download_url.c_str());
+        Alert(Lang::Strings::LOADING_ASSETS, message, "cloud_arrow_down", Lang::Sounds::OGG_UPGRADE);
+        
+        // Wait for the audio service to be idle for 3 seconds
+        vTaskDelay(pdMS_TO_TICKS(3000));
+        SetDeviceState(kDeviceStateUpgrading);
+        board.SetPowerSaveMode(false);
+        display->SetChatMessage("system", Lang::Strings::PLEASE_WAIT);
+
+        bool success = assets->Download(download_url, [display](int progress, size_t speed) -> void {
+            std::thread([display, progress, speed]() {
+                char buffer[32];
+                snprintf(buffer, sizeof(buffer), "%d%% %uKB/s", progress, speed / 1024);
+                display->SetChatMessage("system", buffer);
+            }).detach();
+        });
+
+        board.SetPowerSaveMode(true);
+        vTaskDelay(pdMS_TO_TICKS(1000));
+
+        if (!success) {
+            Alert(Lang::Strings::ERROR, Lang::Strings::DOWNLOAD_ASSETS_FAILED, "circle_xmark", Lang::Sounds::OGG_EXCLAMATION);
+            vTaskDelay(pdMS_TO_TICKS(2000));
+            return;
+        }
+    }
+
+    // Apply assets
+    assets->Apply();
+    display->SetChatMessage("system", "");
+    display->SetEmotion("microchip_ai");
+}
+
 void Application::CheckNewVersion(Ota& ota) {
     const int MAX_RETRY = 10;
     int retry_count = 0;
@@ -358,6 +419,9 @@ void Application::Start() {
     // Update the status bar immediately to show the network state
     display->UpdateStatusBar(true);
 
+    // Check for new assets version
+    CheckAssetsVersion();
+
     // Check for new firmware version or get the MQTT broker address
     Ota ota;
     CheckNewVersion(ota);
@@ -366,7 +430,9 @@ void Application::Start() {
     display->SetStatus(Lang::Strings::LOADING_PROTOCOL);
 
     // Add MCP common tools before initializing the protocol
-    McpServer::GetInstance().AddCommonTools();
+    auto& mcp_server = McpServer::GetInstance();
+    mcp_server.AddCommonTools();
+    mcp_server.AddUserOnlyTools();
 
     if (ota.HasMqttConfig()) {
         protocol_ = std::make_unique<MqttProtocol>();
@@ -496,7 +562,6 @@ void Application::Start() {
     });
     bool protocol_started = protocol_->Start();
 
-    // Print heap stats
     SystemInfo::PrintHeapStats();
     SetDeviceState(kDeviceStateIdle);
 
@@ -541,7 +606,7 @@ void Application::MainEventLoop() {
 
         if (bits & MAIN_EVENT_SEND_AUDIO) {
             while (auto packet = audio_service_.PopPacketFromSendQueue()) {
-                if (!protocol_->SendAudio(std::move(packet))) {
+                if (protocol_ && !protocol_->SendAudio(std::move(packet))) {
                     break;
                 }
             }
@@ -623,7 +688,9 @@ void Application::OnWakeWordDetected() {
 void Application::AbortSpeaking(AbortReason reason) {
     ESP_LOGI(TAG, "Abort speaking");
     aborted_ = true;
-    protocol_->SendAbortSpeaking(reason);
+    if (protocol_) {
+        protocol_->SendAbortSpeaking(reason);
+    }
 }
 
 void Application::SetListeningMode(ListeningMode mode) {
@@ -695,6 +762,12 @@ void Application::SetDeviceState(DeviceState state) {
 
 void Application::Reboot() {
     ESP_LOGI(TAG, "Rebooting...");
+    // Disconnect the audio channel
+    if (protocol_ && protocol_->IsAudioChannelOpened()) {
+        protocol_->CloseAudioChannel();
+    }
+    protocol_.reset();
+    audio_service_.Stop();
     esp_restart();
 }
 

main/application.h

@@ -85,6 +85,7 @@ class Application {
 
     void OnWakeWordDetected();
     void CheckNewVersion(Ota& ota);
+    void CheckAssetsVersion();
     void ShowActivationCode(const std::string& code, const std::string& message);
     void SetListeningMode(ListeningMode mode);
 };