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

set gfx core to cpu1

Browse Source
This commit is contained in:
Terrence
2025-09-16 01:41:21 +08:00
parent 38157aa180
commit add271f0c1
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
main/boards/echoear/EchoEar.cc
View File

@@ -519,12 +519,13 @@ private:
void InitializeSpi() void InitializeSpi()
{ {
const spi_bus_config_t bus_config = TAIJIPI_ST77916_PANEL_BUS_QSPI_CONFIG(QSPI_PIN_NUM_LCD_PCLK, spi_bus_config_t bus_config = TAIJIPI_ST77916_PANEL_BUS_QSPI_CONFIG(QSPI_PIN_NUM_LCD_PCLK,
QSPI_PIN_NUM_LCD_DATA0, QSPI_PIN_NUM_LCD_DATA0,
QSPI_PIN_NUM_LCD_DATA1, QSPI_PIN_NUM_LCD_DATA1,
QSPI_PIN_NUM_LCD_DATA2, QSPI_PIN_NUM_LCD_DATA2,
QSPI_PIN_NUM_LCD_DATA3, QSPI_PIN_NUM_LCD_DATA3,
QSPI_LCD_H_RES * 80 * sizeof(uint16_t)); QSPI_LCD_H_RES * 80 * sizeof(uint16_t));
// bus_config.isr_cpu_id = ESP_INTR_CPU_AFFINITY_1;
ESP_ERROR_CHECK(spi_bus_initialize(QSPI_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO)); ESP_ERROR_CHECK(spi_bus_initialize(QSPI_LCD_HOST, &bus_config, SPI_DMA_CH_AUTO));
} }
@@ -562,11 +563,7 @@ private:
#if USE_LVGL_DEFAULT #if USE_LVGL_DEFAULT
display_ = new SpiLcdDisplay(panel_io, panel, display_ = new SpiLcdDisplay(panel_io, panel,
DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY, { DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
.text_font = &font_puhui_20_4,
.icon_font = &font_awesome_20_4,
.emoji_font = font_emoji_64_init(),
});
#else #else
display_ = new anim::EmoteDisplay(panel, panel_io); display_ = new anim::EmoteDisplay(panel, panel_io);
#endif #endif

3
main/boards/echoear/config.json
View File

@@ -4,8 +4,7 @@
{ {
"name": "echoear", "name": "echoear",
"sdkconfig_append": [ "sdkconfig_append": [
"CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/16m_echoear.csv\"", "CONFIG_PARTITION_TABLE_CUSTOM_FILENAME=\"partitions/v1/16m_echoear.csv\""
"CONFIG_USE_DEVICE_AEC=y"
] ]
} }
] ]

6
main/boards/echoear/emote_display.cc
View File

@@ -111,8 +111,8 @@ static void InitializeGraphics(esp_lcd_panel_handle_t panel, gfx_handle_t* engin
}; };
gfx_cfg.task.task_stack_caps = MALLOC_CAP_DEFAULT; gfx_cfg.task.task_stack_caps = MALLOC_CAP_DEFAULT;
gfx_cfg.task.task_affinity = 0; gfx_cfg.task.task_affinity = 1;
gfx_cfg.task.task_priority = 5; gfx_cfg.task.task_priority = 1;
gfx_cfg.task.task_stack = 20 * 1024; gfx_cfg.task.task_stack = 20 * 1024;
*engine_handle = gfx_emote_init(&gfx_cfg); *engine_handle = gfx_emote_init(&gfx_cfg);
@@ -303,6 +303,7 @@ bool EmoteEngine::OnFlushIoReady(esp_lcd_panel_io_handle_t panel_io,
esp_lcd_panel_io_event_data_t* edata, esp_lcd_panel_io_event_data_t* edata,
void* user_ctx) void* user_ctx)
{ {
gfx_emote_flush_ready(user_ctx, true);
return true; return true;
} }
@@ -313,7 +314,6 @@ void EmoteEngine::OnFlush(gfx_handle_t handle, int x_start, int y_start,
if (panel) { if (panel) {
esp_lcd_panel_draw_bitmap(panel, x_start, y_start, x_end, y_end, color_data); esp_lcd_panel_draw_bitmap(panel, x_start, y_start, x_end, y_end, color_data);
} }
gfx_emote_flush_ready(handle, true);
} }
// EmoteDisplay implementation // EmoteDisplay implementation