prefect: Optimize the call relationship between objects

Signed-off-by: lbuque <[email protected]>

Author: lbuque

README.md

@@ -27,7 +27,7 @@ Supported boards：
 
 - [LILYGO T-DisplayS3](https://github.com/Xinyuan-LilyGO/T-Display-S3)
 - [LILYGO T-RGB](https://github.com/Xinyuan-LilyGO/T-RGB)
-- [LILYGO T-Displat](https://github.com/Xinyuan-LilyGO/TTGO-T-Display)
+- [LILYGO T-Display](https://github.com/Xinyuan-LilyGO/TTGO-T-Display)
 
 ## Documentation
 

docs/en/index.rst

@@ -40,7 +40,7 @@ esp32
 
 .. note::
 
-    Please prepare esp-idf v4.4.2 before compiling
+    Please prepare `esp-idf release/v4.4 <https://github.com/espressif/esp-idf/tree/release/v4.4>`_ before compiling
 
     For more detailed compilation of esp32, please refer to https://github.com/micropython/micropython/tree/master/ports/esp32
 

docs/en/lcd.ST7789.rst

@@ -34,7 +34,7 @@ Methods
 
         Before calling this method, make sure the LCD panel has finished the reset stage by ST7789.reset().
 
-.. method:: ST7789.bitmap(x_start, y_start, x_end, y_end, color_data)
+.. method:: ST7789.bitmap(x_start: int, y_start: int, x_end: int, y_end: int, color_data: bytes=None)
 
     Draw bitmap on LCD panel.
 
@@ -112,7 +112,7 @@ Methods
 
     Deinitialize the LCD panel.
 
-.. method:: rotation(r: int)
+.. method:: ST7789。rotation(r: int)
 
     Set the rotates the logical display in a counter-clockwise direction.
 

docs/zh_CN/index.rst

@@ -40,9 +40,9 @@ esp32
 
 .. note::
 
-    编译前请准备好esp-idf v4.4.2
+    编译前请准备好`esp-idf release/v4.4 <https://github.com/espressif/esp-idf/tree/release/v4.4>`_
 
-    关于esp32更详细的编译说，请参考 https://github.com/micropython/micropython/tree/master/ports/esp32
+    关于esp32更详细的编译说明，请参考 https://github.com/micropython/micropython/tree/master/ports/esp32
 
 .. code-block:: shell
 

docs/zh_CN/lcd.ST7789.rst

@@ -34,7 +34,7 @@ Methods
 
         在调用此方法之前，请确保 LCD 面板已通过 RGB.reset() 完成重置阶段。
 
-.. method:: ST7789.bitmap(x_start, y_start, x_end, y_end, color_data)
+.. method:: ST7789.bitmap(x_start: int, y_start: int, x_end: int, y_end: int, color_data: bytes=None)
 
     在 LCD 面板上绘制位图。
 

lcd/hal/esp32.c

@@ -1,5 +1,8 @@
 #include "esp32.h"
 
+#include "spi_panel.h"
+#include "i80_panel.h"
+
 #include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_vendor.h"
 #include "esp_lcd_panel_ops.h"
@@ -10,84 +13,130 @@
 
 #define DEBUG_printf(...) // mp_printf(&mp_plat_print, __VA_ARGS__);
 
-void hal_lcd_spi_panel_construct(lcd_spi_panel_obj_t *self) {
-    machine_hw_spi_obj_t *spi_obj = ((machine_hw_spi_obj_t *)self->spi_obj);
-    // if (spi_obj == NULL) {
-    //     mp_raise_msg_varg(&mp_type_OSError, "null");
-    // }
-    // machine_hw_spi_deinit_internal(spi_obj);
-    // spi_bus_config_t buscfg = {
-    //     .sclk_io_num = spi_obj->sck,
-    //     .mosi_io_num = spi_obj->mosi,
-    //     .miso_io_num = -1,
-    //     .quadwp_io_num = -1,
-    //     .quadhd_io_num = -1,
-    //     .max_transfer_sz = self->width * self->height * 2 + 8
-    // };
-    // esp_err_t ret = spi_bus_initialize(spi_obj->host, &buscfg, SPI_DMA_CH_AUTO);
-    // if (ret != 0) {
-    //     mp_raise_msg_varg(&mp_type_OSError, "%d(spi_bus_initialize)", ret);
-    // }
+void hal_lcd_spi_panel_construct(mp_obj_base_t *self) {
+    lcd_spi_panel_obj_t *spi_panel_obj = (lcd_spi_panel_obj_t *)self;
+    machine_hw_spi_obj_t *spi_obj = ((machine_hw_spi_obj_t *)spi_panel_obj->spi_obj);
+    if (spi_obj->state == MACHINE_HW_SPI_STATE_INIT) {
+        spi_obj->state = MACHINE_HW_SPI_STATE_DEINIT;
+        machine_hw_spi_deinit_internal(spi_obj);
+    }
+    spi_bus_config_t buscfg = {
+        .sclk_io_num = spi_obj->sck,
+        .mosi_io_num = spi_obj->mosi,
+        .miso_io_num = -1,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1,
+#if CONFIG_ESP32_SPIRAM_SUPPORT
+        .max_transfer_sz = spi_panel_obj->width * spi_panel_obj->height * 2 + 8,
+#else
+        .max_transfer_sz = spi_panel_obj->width * 2 + 8,
+#endif
+    };
+    esp_err_t ret = spi_bus_initialize(spi_obj->host, &buscfg, SPI_DMA_CH_AUTO);
+    if (ret != 0) {
+        mp_raise_msg_varg(&mp_type_OSError, "%d(spi_bus_initialize)", ret);
+    }
+    spi_obj->state = MACHINE_HW_SPI_STATE_INIT;
 
     esp_lcd_panel_io_spi_config_t io_config = {
-        .dc_gpio_num = mp_hal_get_pin_obj(self->dc),
-        .cs_gpio_num = mp_hal_get_pin_obj(self->cs),
-        .pclk_hz = self->pclk,
-        .lcd_cmd_bits = self->cmd_bits,
-        .lcd_param_bits = self->param_bits,
+        .dc_gpio_num = mp_hal_get_pin_obj(spi_panel_obj->dc),
+        .cs_gpio_num = mp_hal_get_pin_obj(spi_panel_obj->cs),
+        .pclk_hz = spi_panel_obj->pclk,
+        .lcd_cmd_bits = spi_panel_obj->cmd_bits,
+        .lcd_param_bits = spi_panel_obj->param_bits,
         .spi_mode = 0,
-        .trans_queue_depth = 4,
+        .trans_queue_depth = 10,
     };
 
     // Attach the LCD to the SPI bus
-    esp_err_t ret = esp_lcd_new_panel_io_spi((esp_lcd_spi_bus_handle_t)spi_obj->host, &io_config, &self->io_handle);
+    ret = esp_lcd_new_panel_io_spi(
+        (esp_lcd_spi_bus_handle_t)spi_obj->host,
+        &io_config,
+        &spi_panel_obj->io_handle
+    );
     if (ret != 0) {
         mp_raise_msg_varg(&mp_type_OSError, "%d(esp_lcd_new_panel_io_spi)", ret);
     }
 }
 
 
-inline void hal_lcd_spi_panel_tx_param(lcd_spi_panel_obj_t *self, int lcd_cmd, const void *param, size_t param_size) {
+inline void hal_lcd_spi_panel_tx_param(
+    mp_obj_base_t *self,
+    int lcd_cmd,
+    const void *param,
+    size_t param_size
+) {
     DEBUG_printf("tx_param cmd: %x, param_size: %u\n", lcd_cmd, param_size);
-    esp_lcd_panel_io_tx_param(self->io_handle, lcd_cmd, param, param_size);
+
+    lcd_spi_panel_obj_t *spi_panel_obj = (lcd_spi_panel_obj_t *)self;
+    esp_lcd_panel_io_tx_param(spi_panel_obj->io_handle, lcd_cmd, param, param_size);
 }
 
 
-inline void hal_lcd_spi_panel_tx_color(lcd_spi_panel_obj_t *self, int lcd_cmd, const void *color, size_t color_size) {
+inline void hal_lcd_spi_panel_tx_color(
+    mp_obj_base_t *self,
+    int lcd_cmd,
+    const void *color,
+    size_t color_size
+) {
     DEBUG_printf("tx_color cmd: %x, color_size: %u\n", lcd_cmd, color_size);
-    esp_lcd_panel_io_tx_color(self->io_handle, lcd_cmd, color, color_size);
+    lcd_spi_panel_obj_t *spi_panel_obj = (lcd_spi_panel_obj_t *)self;
+
+#if CONFIG_ESP32_SPIRAM_SUPPORT
+    esp_lcd_panel_io_tx_color(spi_panel_obj->io_handle, lcd_cmd, color, color_size);
+#else
+    size_t i = 0;
+    esp_lcd_panel_io_tx_param(spi_panel_obj->io_handle, lcd_cmd, NULL, 0);
+
+    for (i = 0; i < (color_size / (spi_panel_obj->width * 2)); i++) {
+        esp_lcd_panel_io_tx_color(
+            spi_panel_obj->io_handle,
+            -1,
+            (const void *)&((const uint8_t *)color)[i * spi_panel_obj->width * 2],
+            spi_panel_obj->width * 2
+        );
+    }
+    esp_lcd_panel_io_tx_color(
+        spi_panel_obj->io_handle,
+        -1,
+        (const void *)&((const uint8_t *)color)[i * spi_panel_obj->width * 2],
+        color_size - (i * spi_panel_obj->width * 2)
+    );
+#endif
 }
 
 
-inline void hal_lcd_spi_panel_deinit(lcd_spi_panel_obj_t *self) {
-    esp_lcd_panel_io_del(self->io_handle);
+inline void hal_lcd_spi_panel_deinit(mp_obj_base_t *self) {
+    lcd_spi_panel_obj_t *spi_panel_obj = (lcd_spi_panel_obj_t *)self;
+    esp_lcd_panel_io_del(spi_panel_obj->io_handle);
 }
 
 
-void hal_lcd_i80_construct(lcd_i80_obj_t *self) {
+void hal_lcd_i80_construct(mp_obj_base_t *self) {
+    lcd_i80_obj_t *i80_obj = (lcd_i80_obj_t *)self;
     esp_lcd_i80_bus_config_t bus_config = {
-        .dc_gpio_num = mp_hal_get_pin_obj(self->dc),
-        .wr_gpio_num = mp_hal_get_pin_obj(self->wr),
+        .dc_gpio_num = mp_hal_get_pin_obj(i80_obj->dc),
+        .wr_gpio_num = mp_hal_get_pin_obj(i80_obj->wr),
         .clk_src = LCD_CLK_SRC_PLL160M,
         .data_gpio_nums = {
-            mp_hal_get_pin_obj(self->databus[0]),
-            mp_hal_get_pin_obj(self->databus[1]),
-            mp_hal_get_pin_obj(self->databus[2]),
-            mp_hal_get_pin_obj(self->databus[3]),
-            mp_hal_get_pin_obj(self->databus[4]),
-            mp_hal_get_pin_obj(self->databus[5]),
-            mp_hal_get_pin_obj(self->databus[6]),
-            mp_hal_get_pin_obj(self->databus[7]),
+            mp_hal_get_pin_obj(i80_obj->databus[0]),
+            mp_hal_get_pin_obj(i80_obj->databus[1]),
+            mp_hal_get_pin_obj(i80_obj->databus[2]),
+            mp_hal_get_pin_obj(i80_obj->databus[3]),
+            mp_hal_get_pin_obj(i80_obj->databus[4]),
+            mp_hal_get_pin_obj(i80_obj->databus[5]),
+            mp_hal_get_pin_obj(i80_obj->databus[6]),
+            mp_hal_get_pin_obj(i80_obj->databus[7]),
         },
-        .bus_width = self->bus_width,
-        .max_transfer_bytes = self->width * self->height * sizeof(uint16_t)
+        .bus_width = i80_obj->bus_width,
+        .max_transfer_bytes = i80_obj->width * i80_obj->height * sizeof(uint16_t)
     };
-    esp_err_t ret = esp_lcd_new_i80_bus(&bus_config, &self->i80_bus);
+    esp_err_t ret = esp_lcd_new_i80_bus(&bus_config, &i80_obj->i80_bus);
     if (ret != 0) {
         mp_raise_msg_varg(&mp_type_OSError, "%d(esp_lcd_new_i80_bus)", ret);
     }
     esp_lcd_panel_io_i80_config_t io_config = {
-        .pclk_hz = self->pclk,
+        .pclk_hz = i80_obj->pclk,
         .trans_queue_depth = 10,
         .dc_levels = {
             .dc_idle_level = 0,
@@ -96,38 +145,53 @@ void hal_lcd_i80_construct(lcd_i80_obj_t *self) {
             .dc_data_level = 1,
         },
         .flags = {
-            .swap_color_bytes = self->swap_color_bytes,
+            .swap_color_bytes = i80_obj->swap_color_bytes,
         },
-        .lcd_cmd_bits = self->cmd_bits,
-        .lcd_param_bits = self->param_bits,
+        .lcd_cmd_bits = i80_obj->cmd_bits,
+        .lcd_param_bits = i80_obj->param_bits,
     };
-    if (self->cs != MP_OBJ_NULL) {
-        io_config.cs_gpio_num = mp_hal_get_pin_obj(self->cs);
+    if (i80_obj->cs != MP_OBJ_NULL) {
+        io_config.cs_gpio_num = mp_hal_get_pin_obj(i80_obj->cs);
     } else {
         io_config.cs_gpio_num = -1;
     }
-    ret = esp_lcd_new_panel_io_i80(self->i80_bus, &io_config, &self->io_handle);
+    ret = esp_lcd_new_panel_io_i80(i80_obj->i80_bus, &io_config, &i80_obj->io_handle);
     if (ret != 0) {
         mp_raise_msg_varg(&mp_type_OSError, "%d(esp_lcd_new_panel_io_i80)", ret);
     }
 }
 
 
-inline void hal_lcd_i80_tx_param(lcd_i80_obj_t *self, int lcd_cmd, const void *param, size_t param_size) {
+inline void hal_lcd_i80_tx_param(
+    mp_obj_base_t *self,
+    int lcd_cmd,
+    const void *param,
+    size_t param_size
+) {
     DEBUG_printf("tx_param cmd: %x, param_size: %u\n", lcd_cmd, param_size);
-    esp_lcd_panel_io_tx_param(self->io_handle, lcd_cmd, param, param_size);
+
+    lcd_i80_obj_t *i80_obj = (lcd_i80_obj_t *)self;
+    esp_lcd_panel_io_tx_param(i80_obj->io_handle, lcd_cmd, param, param_size);
 }
 
 
-inline void hal_lcd_i80_tx_color(lcd_i80_obj_t *self, int lcd_cmd, const void *color, size_t color_size) {
+inline void hal_lcd_i80_tx_color(
+    mp_obj_base_t *self,
+    int lcd_cmd,
+    const void *color,
+    size_t color_size
+) {
     DEBUG_printf("tx_color cmd: %x, color_size: %u\n", lcd_cmd, color_size);
-    esp_lcd_panel_io_tx_color(self->io_handle, lcd_cmd, color, color_size);
+
+    lcd_i80_obj_t *i80_obj = (lcd_i80_obj_t *)self;
+    esp_lcd_panel_io_tx_color(i80_obj->io_handle, lcd_cmd, color, color_size);
 }
 
 
-inline void hal_lcd_i80_deinit(lcd_i80_obj_t *self) {
-    esp_lcd_panel_io_del(self->io_handle);
-    esp_lcd_del_i80_bus(self->i80_bus);
+inline void hal_lcd_i80_deinit(mp_obj_base_t *self) {
+    lcd_i80_obj_t *i80_obj = (lcd_i80_obj_t *)self;
+    esp_lcd_panel_io_del(i80_obj->io_handle);
+    esp_lcd_del_i80_bus(i80_obj->i80_bus);
 }
 
 
@@ -211,12 +275,30 @@ inline void hal_lcd_rgb_del(lcd_rgb_obj_t *self) {
 }
 
 
-inline void hal_lcd_rgb_bitmap(lcd_rgb_obj_t *self, int x_start, int y_start, int x_end, int y_end, const void *color_data) {
-    esp_lcd_panel_draw_bitmap(self->panel_handle, x_start, y_start, x_end, y_end, color_data);
+inline void hal_lcd_rgb_bitmap(
+    lcd_rgb_obj_t *self,
+    int x_start,
+    int y_start,
+    int x_end,
+    int y_end,
+    const void *color_data
+) {
+    esp_lcd_panel_draw_bitmap(
+        self->panel_handle,
+        x_start,
+        y_start,
+        x_end,
+        y_end,
+        color_data
+    );
 }
 
 
-inline void hal_lcd_rgb_mirror(lcd_rgb_obj_t *self, bool mirror_x, bool mirror_y) {
+inline void hal_lcd_rgb_mirror(
+    lcd_rgb_obj_t *self,
+    bool mirror_x,
+    bool mirror_y
+) {
     esp_lcd_panel_mirror(self->panel_handle, mirror_x, mirror_y);
 }
 
@@ -231,7 +313,10 @@ inline void hal_lcd_rgb_set_gap(lcd_rgb_obj_t *self, int x_gap, int y_gap) {
 }
 
 
-inline void hal_lcd_rgb_invert_color(lcd_rgb_obj_t *self, bool invert_color_data) {
+inline void hal_lcd_rgb_invert_color(
+    lcd_rgb_obj_t *self,
+    bool invert_color_data
+) {
     esp_lcd_panel_invert_color(self->panel_handle, invert_color_data);
 }