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

Move fonts / assets definition from main/boards to CMakeLists.txt (#1174)

Browse Source 
* update surfer-c3-1.14tft font size

* Move fonts / assets definition from main/boards to CMakeLists.txt

* fix c3 compiling errors

---------

Co-authored-by: Xiaoxia <terrence.huang@tenclass.com>
This commit is contained in:
Xiaoxia
2025-09-08 17:30:18 +08:00
committed by GitHub
parent 897239e997
commit d04b08133f
111 changed files with 1193 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main/boards/waveshare-p4-wifi6-touch-lcd-4b/esp32-p4-wifi6-touch-lcd-4b.cc
View File

@@ -19,9 +19,6 @@
#include "esp_lcd_touch_gt911.h"
#define TAG "WaveshareEsp32p44b"
LV_FONT_DECLARE(font_puhui_basic_30_4);
LV_FONT_DECLARE(font_awesome_30_4);
class WaveshareEsp32p44b : public WifiBoard {
private:
i2c_master_bus_handle_t i2c_bus_;
@@ -115,8 +112,7 @@ private:
esp_lcd_panel_init(disp_panel);
display_ = new MipiLcdDisplay(io, disp_panel, DISPLAY_WIDTH, DISPLAY_HEIGHT,
DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY,
{&font_puhui_basic_30_4, &font_awesome_30_4});
DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
}
void InitializeTouch()
{
@@ -194,10 +190,6 @@ public:
return &backlight;
}
virtual Assets* GetAssets() override {
static Assets assets(ASSETS_XIAOZHI_PUHUI_COMMON_30_4_EMOJI_64);
return &assets;
}
};
DECLARE_BOARD(WaveshareEsp32p44b);