kanshan/xiaozhi-esp32
1
0
Fork 0
mirror of https://github.com/78/xiaozhi-esp32.git synced 2026-01-14 01:07:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '78:main' into main

Browse Source
This commit is contained in:
pfangzhi 2025-12-19 09:51:25 +08:00 committed by GitHub
commit 8d5b791e7f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/display/emote_display.cc
View File

@ -362,7 +362,11 @@ bool EmoteEngine::OnFlushIoReady(const esp_lcd_panel_io_handle_t panel_io,
esp_lcd_panel_io_event_data_t* const edata,
void* const user_ctx)
{
return true;
gfx_handle_t handle = static_cast<gfx_handle_t>(user_ctx);
if (handle) {
gfx_emote_flush_ready(handle, true);
}
return false;
}
void EmoteEngine::OnFlush(const gfx_handle_t handle, const int x_start, const int y_start,
@ -372,7 +376,6 @@ void EmoteEngine::OnFlush(const gfx_handle_t handle, const int x_start, const in
if (panel) {
esp_lcd_panel_draw_bitmap(panel, x_start, y_start, x_end, y_end, color_data);
}
gfx_emote_flush_ready(handle, true);
}
// ============================================================================

2
main/idf_component.yml
View File

@ -44,7 +44,7 @@ dependencies:
esp_lvgl_port: ~2.6.0
espressif/esp_io_expander_tca95xx_16bit: ^2.0.0
espressif2022/image_player: ^1.1.1
espressif2022/esp_emote_gfx: ^1.1.2
espressif2022/esp_emote_gfx: ==2.0.0
espressif/adc_mic: ^0.2.1
espressif/esp_mmap_assets: '>=1.2'
txp666/otto-emoji-gif-component: