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

1
main/boards/m5stack-core-s3/cores3_audio_codec.cc
View File

@@ -4,7 +4,6 @@
#include <driver/i2c_master.h>
#include <driver/i2s_tdm.h>
#define TAG "CoreS3AudioCodec"
CoreS3AudioCodec::CoreS3AudioCodec(void* i2c_master_handle, int input_sample_rate, int output_sample_rate,

15
main/boards/m5stack-core-s3/m5stack_core_s3.cc
View File

@@ -16,12 +16,8 @@
#include <esp_timer.h>
#include "esp32_camera.h"
#define TAG "M5StackCoreS3Board"
LV_FONT_DECLARE(font_puhui_basic_20_4);
LV_FONT_DECLARE(font_awesome_20_4);
class Pmic : public Axp2101 {
public:
// Power Init
@@ -44,7 +40,6 @@ public:
}
};
class CustomBacklight : public Backlight {
public:
CustomBacklight(Pmic *pmic) : pmic_(pmic) {}
@@ -58,7 +53,6 @@ private:
Pmic *pmic_;
};
class Aw9523 : public I2cDevice {
public:
// Exanpd IO Init
@@ -123,7 +117,6 @@ private:
TouchPoint_t tp_;
};
class M5StackCoreS3Board : public WifiBoard {
private:
i2c_master_bus_handle_t i2c_bus_;
@@ -294,8 +287,7 @@ private:
esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
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,
{&font_puhui_basic_20_4, &font_awesome_20_4});
DISPLAY_WIDTH, DISPLAY_HEIGHT, DISPLAY_OFFSET_X, DISPLAY_OFFSET_Y, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y, DISPLAY_SWAP_XY);
}
void InitializeCamera() {
@@ -342,11 +334,6 @@ public:
GetBacklight()->RestoreBrightness();
}
virtual Assets* GetAssets() override {
static Assets assets(ASSETS_XIAOZHI_PUHUI_COMMON_20_4_EMOJI_64);
return &assets;
}
virtual AudioCodec* GetAudioCodec() override {
static CoreS3AudioCodec audio_codec(i2c_bus_,
AUDIO_INPUT_SAMPLE_RATE,