From 72f56a2dd03bfc45f02d4007d561f6c6a3d7da51 Mon Sep 17 00:00:00 2001 From: moononournation Date: Sun, 3 Nov 2024 14:15:17 +0800 Subject: [PATCH] combine code in different ESP_ARDUINO_VERSION_MAJOR --- src/databus/Arduino_ESP32RGBPanel.cpp | 205 ++++++++------------------ src/databus/Arduino_ESP32RGBPanel.h | 69 ++------- 2 files changed, 69 insertions(+), 205 deletions(-) diff --git a/src/databus/Arduino_ESP32RGBPanel.cpp b/src/databus/Arduino_ESP32RGBPanel.cpp index 230b5f7..061759e 100644 --- a/src/databus/Arduino_ESP32RGBPanel.cpp +++ b/src/databus/Arduino_ESP32RGBPanel.cpp @@ -3,8 +3,6 @@ #include "Arduino_ESP32RGBPanel.h" #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3) -#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) - Arduino_ESP32RGBPanel::Arduino_ESP32RGBPanel( int8_t de, int8_t vsync, int8_t hsync, int8_t pclk, int8_t r0, int8_t r1, int8_t r2, int8_t r3, int8_t r4, @@ -45,143 +43,12 @@ bool Arduino_ESP32RGBPanel::begin(int32_t speed) uint16_t *Arduino_ESP32RGBPanel::getFrameBuffer(int16_t w, int16_t h) { - esp_lcd_rgb_panel_config_t *_panel_config = (esp_lcd_rgb_panel_config_t *)heap_caps_calloc(1, sizeof(esp_lcd_rgb_panel_config_t), MALLOC_CAP_DMA | MALLOC_CAP_INTERNAL); - - _panel_config->clk_src = LCD_CLK_SRC_PLL160M; - _panel_config->timings.pclk_hz = (_prefer_speed == GFX_NOT_DEFINED) ? _speed : _prefer_speed; - _panel_config->timings.h_res = w; - _panel_config->timings.v_res = h; - // The following parameters should refer to LCD spec - _panel_config->timings.hsync_pulse_width = _hsync_pulse_width; - _panel_config->timings.hsync_back_porch = _hsync_back_porch; - _panel_config->timings.hsync_front_porch = _hsync_front_porch; - _panel_config->timings.vsync_pulse_width = _vsync_pulse_width; - _panel_config->timings.vsync_back_porch = _vsync_back_porch; - _panel_config->timings.vsync_front_porch = _vsync_front_porch; - _panel_config->timings.flags.hsync_idle_low = (_hsync_polarity == 0) ? 1 : 0; - _panel_config->timings.flags.vsync_idle_low = (_vsync_polarity == 0) ? 1 : 0; - _panel_config->timings.flags.de_idle_high = _de_idle_high; - _panel_config->timings.flags.pclk_active_neg = _pclk_active_neg; - _panel_config->timings.flags.pclk_idle_high = _pclk_idle_high; - - _panel_config->data_width = 16; // RGB565 in parallel mode, thus 16bit in width - _panel_config->sram_trans_align = 8; - _panel_config->psram_trans_align = 64; - _panel_config->hsync_gpio_num = _hsync; - _panel_config->vsync_gpio_num = _vsync; - _panel_config->de_gpio_num = _de; - _panel_config->pclk_gpio_num = _pclk; - - if (_useBigEndian) - { - _panel_config->data_gpio_nums[0] = _g3; - _panel_config->data_gpio_nums[1] = _g4; - _panel_config->data_gpio_nums[2] = _g5; - _panel_config->data_gpio_nums[3] = _r0; - _panel_config->data_gpio_nums[4] = _r1; - _panel_config->data_gpio_nums[5] = _r2; - _panel_config->data_gpio_nums[6] = _r3; - _panel_config->data_gpio_nums[7] = _r4; - _panel_config->data_gpio_nums[8] = _b0; - _panel_config->data_gpio_nums[9] = _b1; - _panel_config->data_gpio_nums[10] = _b2; - _panel_config->data_gpio_nums[11] = _b3; - _panel_config->data_gpio_nums[12] = _b4; - _panel_config->data_gpio_nums[13] = _g0; - _panel_config->data_gpio_nums[14] = _g1; - _panel_config->data_gpio_nums[15] = _g2; - } - else - { - _panel_config->data_gpio_nums[0] = _b0; - _panel_config->data_gpio_nums[1] = _b1; - _panel_config->data_gpio_nums[2] = _b2; - _panel_config->data_gpio_nums[3] = _b3; - _panel_config->data_gpio_nums[4] = _b4; - _panel_config->data_gpio_nums[5] = _g0; - _panel_config->data_gpio_nums[6] = _g1; - _panel_config->data_gpio_nums[7] = _g2; - _panel_config->data_gpio_nums[8] = _g3; - _panel_config->data_gpio_nums[9] = _g4; - _panel_config->data_gpio_nums[10] = _g5; - _panel_config->data_gpio_nums[11] = _r0; - _panel_config->data_gpio_nums[12] = _r1; - _panel_config->data_gpio_nums[13] = _r2; - _panel_config->data_gpio_nums[14] = _r3; - _panel_config->data_gpio_nums[15] = _r4; - } - - _panel_config->disp_gpio_num = GPIO_NUM_NC; - - _panel_config->flags.disp_active_low = 0; - _panel_config->flags.relax_on_idle = 0; - _panel_config->flags.fb_in_psram = 1; // allocate frame buffer in PSRAM - - ESP_ERROR_CHECK(esp_lcd_new_rgb_panel(_panel_config, &_panel_handle)); - ESP_ERROR_CHECK(esp_lcd_panel_reset(_panel_handle)); - ESP_ERROR_CHECK(esp_lcd_panel_init(_panel_handle)); - - uint16_t color = random(0xffff); - ESP_ERROR_CHECK(_panel_handle->draw_bitmap(_panel_handle, 0, 0, 1, 1, &color)); - - _rgb_panel = __containerof(_panel_handle, esp_rgb_panel_t, base); - - LCD_CAM.lcd_ctrl2.lcd_vsync_idle_pol = _vsync_polarity; - LCD_CAM.lcd_ctrl2.lcd_hsync_idle_pol = _hsync_polarity; - - return (uint16_t *)_rgb_panel->fb; -} - -#else - -// Implementation for ESP32 board version 3.x -// no need to include a copy of core esp32 types any more. - -Arduino_ESP32RGBPanel::Arduino_ESP32RGBPanel( - int8_t de, int8_t vsync, int8_t hsync, int8_t pclk, - int8_t r0, int8_t r1, int8_t r2, int8_t r3, int8_t r4, - int8_t g0, int8_t g1, int8_t g2, int8_t g3, int8_t g4, int8_t g5, - int8_t b0, int8_t b1, int8_t b2, int8_t b3, int8_t b4, - uint16_t hsync_polarity, uint16_t hsync_front_porch, uint16_t hsync_pulse_width, uint16_t hsync_back_porch, - uint16_t vsync_polarity, uint16_t vsync_front_porch, uint16_t vsync_pulse_width, uint16_t vsync_back_porch, - uint16_t pclk_active_neg, int32_t prefer_speed, bool useBigEndian, - uint16_t de_idle_high, uint16_t pclk_idle_high) - : _de(de), _vsync(vsync), _hsync(hsync), _pclk(pclk), - _r0(r0), _r1(r1), _r2(r2), _r3(r3), _r4(r4), - _g0(g0), _g1(g1), _g2(g2), _g3(g3), _g4(g4), _g5(g5), - _b0(b0), _b1(b1), _b2(b2), _b3(b3), _b4(b4), - _hsync_polarity(hsync_polarity), _hsync_front_porch(hsync_front_porch), _hsync_pulse_width(hsync_pulse_width), _hsync_back_porch(hsync_back_porch), - _vsync_polarity(vsync_polarity), _vsync_front_porch(vsync_front_porch), _vsync_pulse_width(vsync_pulse_width), _vsync_back_porch(vsync_back_porch), - _pclk_active_neg(pclk_active_neg), _prefer_speed(prefer_speed), - _de_idle_high(de_idle_high), _pclk_idle_high(pclk_idle_high) -{ -} - -bool Arduino_ESP32RGBPanel::begin(int32_t speed) -{ - if (speed == GFX_NOT_DEFINED) - { -#ifdef CONFIG_SPIRAM_MODE_QUAD - _speed = 6000000L; + esp_lcd_rgb_panel_config_t panel_config = { +#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) + .clk_src = LCD_CLK_SRC_PLL160M, #else - _speed = 12000000L; + .clk_src = LCD_CLK_SRC_DEFAULT, #endif - } - else - { - _speed = speed; - } - - return true; -} - -uint16_t *Arduino_ESP32RGBPanel::getFrameBuffer(int16_t w, int16_t h) -{ - uint32_t buffers = 1; - void *frame_buffer = nullptr; - - esp_lcd_rgb_panel_config_t panel_config = { - .clk_src = LCD_CLK_SRC_DEFAULT, // = LCD_CLK_SRC_PLL160M .timings = { .pclk_hz = (_prefer_speed == GFX_NOT_DEFINED) ? _speed : _prefer_speed, .h_res = w, @@ -198,11 +65,14 @@ uint16_t *Arduino_ESP32RGBPanel::getFrameBuffer(int16_t w, int16_t h) .de_idle_high = _de_idle_high, .pclk_active_neg = _pclk_active_neg, .pclk_idle_high = _pclk_idle_high, - }}, + }, + }, .data_width = 16, // RGB565 in parallel mode, thus 16 bits in width +#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) +#else .bits_per_pixel = 16, .num_fbs = 1, - +#endif .sram_trans_align = 8, .psram_trans_align = 64, .hsync_gpio_num = _hsync, @@ -210,21 +80,66 @@ uint16_t *Arduino_ESP32RGBPanel::getFrameBuffer(int16_t w, int16_t h) .de_gpio_num = _de, .pclk_gpio_num = _pclk, .disp_gpio_num = GPIO_NUM_NC, // -1 - .data_gpio_nums = {_b0, _b1, _b2, _b3, _b4, _g0, _g1, _g2, _g3, _g4, _g5, _r0, _r1, _r2, _r3, _r4}, - .flags = { .fb_in_psram = true, // allocate frame buffer from PSRAM - }}; + }, + }; + + if (_useBigEndian) + { + panel_config.data_gpio_nums[0] = _g3; + panel_config.data_gpio_nums[1] = _g4; + panel_config.data_gpio_nums[2] = _g5; + panel_config.data_gpio_nums[3] = _r0; + panel_config.data_gpio_nums[4] = _r1; + panel_config.data_gpio_nums[5] = _r2; + panel_config.data_gpio_nums[6] = _r3; + panel_config.data_gpio_nums[7] = _r4; + panel_config.data_gpio_nums[8] = _b0; + panel_config.data_gpio_nums[9] = _b1; + panel_config.data_gpio_nums[10] = _b2; + panel_config.data_gpio_nums[11] = _b3; + panel_config.data_gpio_nums[12] = _b4; + panel_config.data_gpio_nums[13] = _g0; + panel_config.data_gpio_nums[14] = _g1; + panel_config.data_gpio_nums[15] = _g2; + } + else + { + panel_config.data_gpio_nums[0] = _b0; + panel_config.data_gpio_nums[1] = _b1; + panel_config.data_gpio_nums[2] = _b2; + panel_config.data_gpio_nums[3] = _b3; + panel_config.data_gpio_nums[4] = _b4; + panel_config.data_gpio_nums[5] = _g0; + panel_config.data_gpio_nums[6] = _g1; + panel_config.data_gpio_nums[7] = _g2; + panel_config.data_gpio_nums[8] = _g3; + panel_config.data_gpio_nums[9] = _g4; + panel_config.data_gpio_nums[10] = _g5; + panel_config.data_gpio_nums[11] = _r0; + panel_config.data_gpio_nums[12] = _r1; + panel_config.data_gpio_nums[13] = _r2; + panel_config.data_gpio_nums[14] = _r3; + panel_config.data_gpio_nums[15] = _r4; + } ESP_ERROR_CHECK(esp_lcd_new_rgb_panel(&panel_config, &_panel_handle)); ESP_ERROR_CHECK(esp_lcd_panel_reset(_panel_handle)); ESP_ERROR_CHECK(esp_lcd_panel_init(_panel_handle)); - ESP_ERROR_CHECK(esp_lcd_rgb_panel_get_frame_buffer(_panel_handle, buffers, &frame_buffer)); +#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) + esp_rgb_panel_t *_rgb_panel; + _rgb_panel = __containerof(_panel_handle, esp_rgb_panel_t, base); + + return (uint16_t *)_rgb_panel->fb; +#else + void *frame_buffer = nullptr; + ESP_ERROR_CHECK(esp_lcd_rgb_panel_get_frame_buffer(_panel_handle, 1, &frame_buffer)); return ((uint16_t *)frame_buffer); -} // getFrameBuffer +#endif +} -#endif // #if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) #endif // #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3) diff --git a/src/databus/Arduino_ESP32RGBPanel.h b/src/databus/Arduino_ESP32RGBPanel.h index 3b2dc8e..098a74a 100644 --- a/src/databus/Arduino_ESP32RGBPanel.h +++ b/src/databus/Arduino_ESP32RGBPanel.h @@ -18,12 +18,17 @@ #include "Arduino_DataBus.h" #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3) -#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) -#include "esp_lcd_panel_io.h" #include "esp_lcd_panel_rgb.h" -#include "esp_lcd_panel_vendor.h" #include "esp_lcd_panel_ops.h" + +#include "esp32s3/rom/cache.h" +// This function is located in ROM (also see esp_rom/${target}/ld/${target}.rom.ld) +extern int Cache_WriteBack_Addr(uint32_t addr, uint32_t size); + +#if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) +#include "esp_lcd_panel_io.h" +#include "esp_lcd_panel_vendor.h" #include "esp_lcd_panel_interface.h" #include "esp_private/gdma.h" #include "esp_pm.h" @@ -32,9 +37,6 @@ #include "hal/lcd_hal.h" #include "hal/lcd_ll.h" -#include "esp32s3/rom/cache.h" -// This function is located in ROM (also see esp_rom/${target}/ld/${target}.rom.ld) -extern int Cache_WriteBack_Addr(uint32_t addr, uint32_t size); // extract from esp-idf esp_lcd_rgb_panel.c struct esp_rgb_panel_t @@ -67,6 +69,7 @@ struct esp_rgb_panel_t } flags; dma_descriptor_t dma_nodes[]; // DMA descriptor pool of size `num_dma_nodes` }; +#endif // #if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) class Arduino_ESP32RGBPanel { @@ -107,60 +110,6 @@ class Arduino_ESP32RGBPanel uint16_t _pclk_idle_high; esp_lcd_panel_handle_t _panel_handle = NULL; - esp_rgb_panel_t *_rgb_panel; }; -#else - -// Implementation for ESP32 board version 3.x -// no need to include a copy of core esp32 types any more. - -#include "esp_lcd_panel_rgb.h" -#include "esp_lcd_panel_ops.h" - -#include "esp32s3/rom/cache.h" -// This function is located in ROM (also see esp_rom/${target}/ld/${target}.rom.ld) -extern int Cache_WriteBack_Addr(uint32_t addr, uint32_t size); - -class Arduino_ESP32RGBPanel -{ -public: - Arduino_ESP32RGBPanel( - int8_t de, int8_t vsync, int8_t hsync, int8_t pclk, - int8_t r0, int8_t r1, int8_t r2, int8_t r3, int8_t r4, - int8_t g0, int8_t g1, int8_t g2, int8_t g3, int8_t g4, int8_t g5, - int8_t b0, int8_t b1, int8_t b2, int8_t b3, int8_t b4, - uint16_t hsync_polarity, uint16_t hsync_front_porch, uint16_t hsync_pulse_width, uint16_t hsync_back_porch, - uint16_t vsync_polarity, uint16_t vsync_front_porch, uint16_t vsync_pulse_width, uint16_t vsync_back_porch, - uint16_t pclk_active_neg = 0, int32_t prefer_speed = GFX_NOT_DEFINED, bool useBigEndian = false, - uint16_t de_idle_high = 0, uint16_t pclk_idle_high = 0); - - bool begin(int32_t speed = GFX_NOT_DEFINED); - - uint16_t *getFrameBuffer(int16_t w, int16_t h); - -protected: -private: - int32_t _speed; - int8_t _de, _vsync, _hsync, _pclk; - int8_t _r0, _r1, _r2, _r3, _r4; - int8_t _g0, _g1, _g2, _g3, _g4, _g5; - int8_t _b0, _b1, _b2, _b3, _b4; - uint16_t _hsync_polarity; - uint16_t _hsync_front_porch; - uint16_t _hsync_pulse_width; - uint16_t _hsync_back_porch; - uint16_t _vsync_polarity; - uint16_t _vsync_front_porch; - uint16_t _vsync_pulse_width; - uint16_t _vsync_back_porch; - uint16_t _pclk_active_neg; - int32_t _prefer_speed; - uint16_t _de_idle_high; - uint16_t _pclk_idle_high; - - esp_lcd_panel_handle_t _panel_handle = NULL; -}; - -#endif // #if (!defined(ESP_ARDUINO_VERSION_MAJOR)) || (ESP_ARDUINO_VERSION_MAJOR < 3) #endif // #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3)