devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

Switch to 2.0 branch (#1152)

Browse Source 
* 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 <terrence.huang@tenclass.com>
This commit is contained in:
Xiaoxia
2025-09-04 15:41:28 +08:00
committed by GitHub
parent 3a3dfc003e
commit 83f6f8c703
196 changed files with 3918 additions and 4902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
main/boards/otto-robot/config.json
View File

@@ -4,6 +4,7 @@
{
"name": "otto-robot",
"sdkconfig_append": [
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/16m.csv\""
]
}
]

27
main/boards/otto-robot/otto_emoji_display.cc
View File

@@ -51,9 +51,9 @@ const OttoEmojiDisplay::EmotionMap OttoEmojiDisplay::emotion_maps_[] = {
OttoEmojiDisplay::OttoEmojiDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel,
int width, int height, int offset_x, int offset_y, bool mirror_x,
bool mirror_y, bool swap_xy, DisplayFonts fonts)
bool mirror_y, bool swap_xy, DisplayStyle style)
: SpiLcdDisplay(panel_io, panel, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
fonts),
style),
emotion_gif_(nullptr) {
SetupGifContainer();
};
@@ -146,26 +146,3 @@ void OttoEmojiDisplay::SetChatMessage(const char* role, const char* content) {
ESP_LOGI(TAG, "设置聊天消息 [%s]: %s", role, content);
}
void OttoEmojiDisplay::SetIcon(const char* icon) {
if (!icon) {
return;
}
DisplayLockGuard lock(this);
if (chat_message_label_ != nullptr) {
std::string icon_message = std::string(icon) + " ";
if (strcmp(icon, FONT_AWESOME_DOWNLOAD) == 0) {
icon_message += "正在升级...";
} else {
icon_message += "系统状态";
}
lv_label_set_text(chat_message_label_, icon_message.c_str());
lv_obj_remove_flag(chat_message_label_, LV_OBJ_FLAG_HIDDEN);
ESP_LOGI(TAG, "设置图标: %s", icon);
}
}

5
main/boards/otto-robot/otto_emoji_display.h
View File

@@ -16,7 +16,7 @@ public:
*/
OttoEmojiDisplay(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, int width,
int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y,
bool swap_xy, DisplayFonts fonts);
bool swap_xy, DisplayStyle style);
virtual ~OttoEmojiDisplay() = default;
@@ -26,9 +26,6 @@ public:
// 重写聊天消息设置方法
virtual void SetChatMessage(const char* role, const char* content) override;
// 添加SetIcon方法声明
virtual void SetIcon(const char* icon) override;
private:
void SetupGifContainer();

6
main/boards/otto-robot/otto_robot.cc
View File

@@ -79,11 +79,7 @@ private:
display_ = new OttoEmojiDisplay(
panel_io, panel, DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y,
DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
{
.text_font = &font_puhui_16_4,
.icon_font = &font_awesome_16_4,
.emoji_font = DISPLAY_HEIGHT >= 240 ? font_emoji_64_init() : font_emoji_32_init(),
});
{&font_puhui_16_4, &font_awesome_16_4, new Twemoji64()});
}
void InitializeButtons() {