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

Fix SpiLcdDisplay

Browse Source
This commit is contained in:
Terrence
2025-02-24 15:46:29 +08:00
parent a23a88cc5d
commit 6b855eae53
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc
View File

@@ -34,7 +34,7 @@ static const sh8601_lcd_init_cmd_t vendor_specific_init[] = {
}; };
// 在waveshare_amoled_1_8类之前添加新的显示类 // 在waveshare_amoled_1_8类之前添加新的显示类
class CustomLcdDisplay : public LcdDisplay { class CustomLcdDisplay : public SpiLcdDisplay {
public: public:
CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle,
esp_lcd_panel_handle_t panel_handle, esp_lcd_panel_handle_t panel_handle,
@@ -47,7 +47,7 @@ public:
bool mirror_x, bool mirror_x,
bool mirror_y, bool mirror_y,
bool swap_xy) bool swap_xy)
: LcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert, : SpiLcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_30_4, .text_font = &font_puhui_30_4,

4
main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc
View File

@@ -25,7 +25,7 @@ LV_FONT_DECLARE(font_awesome_16_4);
// 在waveshare_lcd_1_46类之前添加新的显示类 // 在waveshare_lcd_1_46类之前添加新的显示类
class CustomLcdDisplay : public LcdDisplay { class CustomLcdDisplay : public SpiLcdDisplay {
public: public:
static void rounder_event_cb(lv_event_t * e) static void rounder_event_cb(lv_event_t * e)
{ {
@@ -48,7 +48,7 @@ public:
bool mirror_x, bool mirror_x,
bool mirror_y, bool mirror_y,
bool swap_xy) bool swap_xy)
: LcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert, : SpiLcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_16_4, .text_font = &font_puhui_16_4,

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

@@ -19,12 +19,12 @@
LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_puhui_16_4);
LV_FONT_DECLARE(font_awesome_16_4); LV_FONT_DECLARE(font_awesome_16_4);
class NV3023Display : public LcdDisplay { class NV3023Display : public SpiLcdDisplay {
public: public:
NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel,
gpio_num_t backlight_pin, bool backlight_output_invert, gpio_num_t backlight_pin, bool backlight_output_invert,
int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy) int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy)
: LcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert, : SpiLcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_16_4, .text_font = &font_puhui_16_4,

4
main/boards/magiclick-2p5/magiclick_2p5_board.cc
View File

@@ -21,12 +21,12 @@
LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_puhui_16_4);
LV_FONT_DECLARE(font_awesome_16_4); LV_FONT_DECLARE(font_awesome_16_4);
class GC9107Display : public LcdDisplay { class GC9107Display : public SpiLcdDisplay {
public: public:
GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel,
gpio_num_t backlight_pin, bool backlight_output_invert, gpio_num_t backlight_pin, bool backlight_output_invert,
int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy) int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy)
: LcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert, : SpiLcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_16_4, .text_font = &font_puhui_16_4,

4
main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc
View File

@@ -22,12 +22,12 @@
LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_puhui_16_4);
LV_FONT_DECLARE(font_awesome_16_4); LV_FONT_DECLARE(font_awesome_16_4);
class GC9107Display : public LcdDisplay { class GC9107Display : public SpiLcdDisplay {
public: public:
GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel,
gpio_num_t backlight_pin, bool backlight_output_invert, gpio_num_t backlight_pin, bool backlight_output_invert,
int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy) int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy)
: LcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert, : SpiLcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_16_4, .text_font = &font_puhui_16_4,

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

@@ -20,12 +20,12 @@
LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_puhui_16_4);
LV_FONT_DECLARE(font_awesome_16_4); LV_FONT_DECLARE(font_awesome_16_4);
class NV3023Display : public LcdDisplay { class NV3023Display : public SpiLcdDisplay {
public: public:
NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel,
gpio_num_t backlight_pin, bool backlight_output_invert, gpio_num_t backlight_pin, bool backlight_output_invert,
int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy) int width, int height, int offset_x, int offset_y, bool mirror_x, bool mirror_y, bool swap_xy)
: LcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert, : SpiLcdDisplay(panel_io, panel, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_16_4, .text_font = &font_puhui_16_4,

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

@@ -26,7 +26,7 @@ LV_FONT_DECLARE(font_puhui_20_4);
LV_FONT_DECLARE(font_awesome_20_4); LV_FONT_DECLARE(font_awesome_20_4);
class CustomLcdDisplay : public LcdDisplay { class CustomLcdDisplay : public SpiLcdDisplay {
public: public:
CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle,
esp_lcd_panel_handle_t panel_handle, esp_lcd_panel_handle_t panel_handle,
@@ -39,7 +39,7 @@ public:
bool mirror_x, bool mirror_x,
bool mirror_y, bool mirror_y,
bool swap_xy) bool swap_xy)
: LcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert, : SpiLcdDisplay(io_handle, panel_handle, backlight_pin, backlight_output_invert,
width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy, width, height, offset_x, offset_y, mirror_x, mirror_y, swap_xy,
{ {
.text_font = &font_puhui_20_4, .text_font = &font_puhui_20_4,