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

fixbug: add virtual

Browse Source
This commit is contained in:
Terrence
2025-01-23 23:50:43 +08:00
parent 633b52238d
commit d75b01984c
3 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/boards/magiclick-2p4/magiclick_2p4_board.cc
View File

@@ -28,7 +28,7 @@ public:
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
&font_puhui_16_4, &font_awesome_16_4) {} &font_puhui_16_4, &font_awesome_16_4) {}
void SetupUI() override { virtual void SetupUI() override {
DisplayLockGuard lock(this); DisplayLockGuard lock(this);
// 调用父类的 SetupUI 来设置基本布局 // 调用父类的 SetupUI 来设置基本布局

9
main/boards/magiclick-c3/magiclick_c3_board.cc
View File

@@ -29,7 +29,7 @@ public:
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
&font_puhui_16_4, &font_awesome_16_4) {} &font_puhui_16_4, &font_awesome_16_4) {}
void SetupUI() override { virtual void SetupUI() override {
DisplayLockGuard lock(this); DisplayLockGuard lock(this);
// 调用父类的 SetupUI 来设置基本布局 // 调用父类的 SetupUI 来设置基本布局
@@ -139,13 +139,6 @@ private:
esp_lcd_panel_disp_on_off(panel, true); esp_lcd_panel_disp_on_off(panel, true);
display_ = new NV3023Display(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT, display_ = new NV3023Display(panel_io, panel, DISPLAY_BACKLIGHT_PIN, DISPLAY_BACKLIGHT_OUTPUT_INVERT,
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);
if (display_) {
display_->SetupUI();
} else {
ESP_LOGE(TAG, "Display is not initialized!");
}
} }
// 物联网初始化，添加对 AI 可见设备 // 物联网初始化，添加对 AI 可见设备

1
main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc
View File

@@ -1,6 +1,5 @@
#include "wifi_board.h" #include "wifi_board.h"
#include "audio_codecs/es8311_audio_codec.h" #include "audio_codecs/es8311_audio_codec.h"
// #include "display/ssd1306_display.h"
#include "display/lcd_display.h" #include "display/lcd_display.h"
#include "display/no_display.h" #include "display/no_display.h"
#include "application.h" #include "application.h"