From 6b855eae53c257cb895454977949acfcf14fff77 Mon Sep 17 00:00:00 2001 From: Terrence Date: Mon, 24 Feb 2025 15:46:29 +0800 Subject: [PATCH] Fix SpiLcdDisplay --- .../esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc | 4 ++-- .../boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc | 4 ++-- main/boards/magiclick-2p4/magiclick_2p4_board.cc | 4 ++-- main/boards/magiclick-2p5/magiclick_2p5_board.cc | 4 ++-- main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc | 4 ++-- main/boards/magiclick-c3/magiclick_c3_board.cc | 4 ++-- main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc b/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc index f4b2b785..5824777c 100644 --- a/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc +++ b/main/boards/esp32-s3-touch-amoled-1.8/esp32-s3-touch-amoled-1.8.cc @@ -34,7 +34,7 @@ static const sh8601_lcd_init_cmd_t vendor_specific_init[] = { }; // 在waveshare_amoled_1_8类之前添加新的显示类 -class CustomLcdDisplay : public LcdDisplay { +class CustomLcdDisplay : public SpiLcdDisplay { public: CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, esp_lcd_panel_handle_t panel_handle, @@ -47,7 +47,7 @@ public: bool mirror_x, bool mirror_y, 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, { .text_font = &font_puhui_30_4, diff --git a/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc b/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc index 8eea7dff..ebf61e66 100644 --- a/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc +++ b/main/boards/esp32-s3-touch-lcd-1.46/esp32-s3-touch-lcd-1.46.cc @@ -25,7 +25,7 @@ LV_FONT_DECLARE(font_awesome_16_4); // 在waveshare_lcd_1_46类之前添加新的显示类 -class CustomLcdDisplay : public LcdDisplay { +class CustomLcdDisplay : public SpiLcdDisplay { public: static void rounder_event_cb(lv_event_t * e) { @@ -48,7 +48,7 @@ public: bool mirror_x, bool mirror_y, 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, { .text_font = &font_puhui_16_4, diff --git a/main/boards/magiclick-2p4/magiclick_2p4_board.cc b/main/boards/magiclick-2p4/magiclick_2p4_board.cc index c8e815b5..00194065 100644 --- a/main/boards/magiclick-2p4/magiclick_2p4_board.cc +++ b/main/boards/magiclick-2p4/magiclick_2p4_board.cc @@ -19,12 +19,12 @@ LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_awesome_16_4); -class NV3023Display : public LcdDisplay { +class NV3023Display : public SpiLcdDisplay { public: NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, 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) - : 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, { .text_font = &font_puhui_16_4, diff --git a/main/boards/magiclick-2p5/magiclick_2p5_board.cc b/main/boards/magiclick-2p5/magiclick_2p5_board.cc index caaa080a..7a853bd5 100644 --- a/main/boards/magiclick-2p5/magiclick_2p5_board.cc +++ b/main/boards/magiclick-2p5/magiclick_2p5_board.cc @@ -21,12 +21,12 @@ LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_awesome_16_4); -class GC9107Display : public LcdDisplay { +class GC9107Display : public SpiLcdDisplay { public: GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, 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) - : 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, { .text_font = &font_puhui_16_4, diff --git a/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc b/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc index c1cb8321..b5f68a33 100644 --- a/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc +++ b/main/boards/magiclick-c3-v2/magiclick_c3_v2_board.cc @@ -22,12 +22,12 @@ LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_awesome_16_4); -class GC9107Display : public LcdDisplay { +class GC9107Display : public SpiLcdDisplay { public: GC9107Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, 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) - : 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, { .text_font = &font_puhui_16_4, diff --git a/main/boards/magiclick-c3/magiclick_c3_board.cc b/main/boards/magiclick-c3/magiclick_c3_board.cc index 523d6404..a0a6c5cb 100644 --- a/main/boards/magiclick-c3/magiclick_c3_board.cc +++ b/main/boards/magiclick-c3/magiclick_c3_board.cc @@ -20,12 +20,12 @@ LV_FONT_DECLARE(font_puhui_16_4); LV_FONT_DECLARE(font_awesome_16_4); -class NV3023Display : public LcdDisplay { +class NV3023Display : public SpiLcdDisplay { public: NV3023Display(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_handle_t panel, 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) - : 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, { .text_font = &font_puhui_16_4, diff --git a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc index fe543836..beb5c798 100644 --- a/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc +++ b/main/boards/movecall-moji-esp32s3/movecall_moji_esp32s3.cc @@ -26,7 +26,7 @@ LV_FONT_DECLARE(font_puhui_20_4); LV_FONT_DECLARE(font_awesome_20_4); -class CustomLcdDisplay : public LcdDisplay { +class CustomLcdDisplay : public SpiLcdDisplay { public: CustomLcdDisplay(esp_lcd_panel_io_handle_t io_handle, esp_lcd_panel_handle_t panel_handle, @@ -39,7 +39,7 @@ public: bool mirror_x, bool mirror_y, 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, { .text_font = &font_puhui_20_4,