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

16
main/boards/sp-esp32-s3-1.28-box/sp-esp32-s3-1.28-box.cc
View File

@@ -27,10 +27,6 @@
#define TAG "Spotpear_ESP32_S3_1_28_BOX"
LV_FONT_DECLARE(font_puhui_basic_16_4);
LV_FONT_DECLARE(font_awesome_16_4);
class Cst816d : public I2cDevice {
public:
struct TouchPoint_t {
@@ -68,7 +64,6 @@ private:
TouchPoint_t tp_;
};
class CustomLcdDisplay : public SpiLcdDisplay {
public:
CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle,
@@ -80,8 +75,7 @@ public:
bool mirror_x,
bool mirror_y,
bool swap_xy)
: SpiLcdDisplay(io_handle, panel_handle, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{&font_puhui_basic_16_4, &font_awesome_16_4}) {
: SpiLcdDisplay(io_handle, panel_handle, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy) {
DisplayLockGuard lock(this);
// 由于屏幕是圆的，所以状态栏需要增加左右内边距
@@ -90,7 +84,6 @@ public:
}
};
class Spotpear_ESP32_S3_1_28_BOX : public WifiBoard {
private:
i2c_master_bus_handle_t codec_i2c_bus_;
@@ -161,7 +154,6 @@ private:
ESP_ERROR_CHECK(i2c_new_master_bus(&i2c_bus_cfg, &i2c_bus_));
}
static void touchpad_timer_callback(void* arg) {
auto& board = (Spotpear_ESP32_S3_1_28_BOX&)Board::GetInstance();
auto touchpad = board.GetTouchpad();
@@ -280,12 +272,6 @@ public:
GetBacklight()->RestoreBrightness();
}
virtual Assets* GetAssets() override {
static Assets assets(ASSETS_XIAOZHI_PUHUI_COMMON_16_4_EMOJI_64);
return &assets;
}
virtual Led* GetLed() override {
static SingleLed led(BUILTIN_LED_GPIO);
return &led;