It compiles now...

Author: kdschlosser

driver/frozen/display/display_driver_framework.py

@@ -200,7 +200,7 @@ def __init__(
  try:
  frame_buffer1 = data_bus.allocate_framebuffer(buf_size, flags)
 
- if flags | lcd_bus.MEMORY_DMA == flags:
+ if (flags | lcd_bus.MEMORY_DMA) == flags:
  frame_buffer2 = data_bus.allocate_framebuffer(buf_size, flags)
 
  break
@@ -210,12 +210,11 @@ def __init__(
 
  if frame_buffer1 is None:
  raise MemoryError(
- f'Unable to allocate memory for '
- f'frame buffer ({buf_size})'
+ f'Unable to allocate memory for frame buffer ({buf_size})'
  )
 
  if frame_buffer2 is None and isinstance(data_bus, lcd_bus.SPIBus):
- buffer_size = data_bus.MAXIMUM_BUFFER_SIZE
+ buffer_size = data_bus.SPI_MAXIMUM_BUFFER_SIZE
 
  elif isinstance(data_bus, lcd_bus.RGBBus):
  buffer_size = int(

ext_mod/lcd_bus/esp32_include/rgb_bus.h

@@ -37,8 +37,8 @@
 
  esp_lcd_panel_handle_t panel_handle;
  uint32_t buffer_size;
- mp_obj_array_t *view1
- mp_obj_array_t *view2
+ mp_obj_array_t *view1;
+ mp_obj_array_t *view2;
  } mp_lcd_rgb_bus_obj_t;
 
 

ext_mod/lcd_bus/esp32_src/rgb_bus.c

@@ -9,8 +9,9 @@
 
  // esp-idf includes
  #include "hal/lcd_hal.h"
- #include "esp_lcd_common.h"
  #include "esp_pm.h"
+ #include "esp_intr_alloc.h"
+ #include "esp_heap_caps.h"
 
  #include "esp_lcd_panel_io.h"
  #include "esp_lcd_panel_ops.h"
@@ -28,7 +29,7 @@
  #include <string.h>
 
 
- struct rgb_panel_t {
+ typedef struct {
  esp_lcd_panel_t base; // Base class of generic lcd panel
  int panel_id; // LCD panel ID
  lcd_hal_context_t hal; // Hal layer object
@@ -43,7 +44,7 @@
  esp_pm_lock_handle_t pm_lock; // Power management lock
  size_t num_dma_nodes; // Number of DMA descriptors that used to carry the frame buffer
  uint8_t *fbs[3]; // Frame buffers
- };
+ } rgb_panel_t;
 
  bool rgb_bus_trans_done_cb(esp_lcd_panel_handle_t panel_io, const esp_lcd_rgb_panel_event_data_t *edata, void *user_ctx)
  {
@@ -252,28 +253,25 @@
  mp_lcd_rgb_bus_obj_t *self = (mp_lcd_rgb_bus_obj_t *)obj;
 
  if (self->panel_handle != NULL) {
- mp_raise_msg(
- &mp_type_ValueError,
- MP_ERROR_TEXT("Frame buffers can not be freed once the display has been initilized"),
- );
+ mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("Unable to free buffer"));
  return mp_const_none;
  }
 
  mp_obj_array_t *array_buf = (mp_obj_array_t *)MP_OBJ_TO_PTR(buf);
- void *buf = array_buf->items;
+ void *item_buf = array_buf->items;
 
  if (array_buf == self->view1) {
- heap_caps_free(buf);
+ heap_caps_free(item_buf);
  self->view1 = NULL;
  } else if (array_buf == self->view2) {
- heap_caps_free(buf);
+ heap_caps_free(item_buf);
  self->view2 = NULL;
  } else {
  mp_raise_msg(&mp_type_MemoryError, MP_ERROR_TEXT("No matching buffer found"));
  }
  return mp_const_none;
  }
- 
+
  mp_obj_t rgb_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t caps)
  {
  mp_lcd_rgb_bus_obj_t *self = (mp_lcd_rgb_bus_obj_t *)obj;
@@ -305,10 +303,7 @@
  self->view2 = view;
  return MP_OBJ_FROM_PTR(view);
  } else {
- mp_raise_msg(
- &mp_type_ValueError,
- MP_ERROR_TEXT("There is a maximum of 2 frame buffers allowed"),
- );
+ mp_raise_msg(&mp_type_ValueError, MP_ERROR_TEXT("There is a maximum of 2 frame buffers allowed"));
  return mp_const_none;
  }
  }
@@ -353,7 +348,7 @@
  return ret;
  }
 
- rgb_panel_t *rgb_panel = __containerof(self->panel_handle, rgb_panel_t, base);
+ rgb_panel_t *rgb_panel = __containerof((esp_lcd_panel_t *)self->panel_handle, rgb_panel_t, base);
 
  void *buf1 = self->view1->items;
  self->view1->items = (void *)rgb_panel->fbs[0];

ext_mod/lcd_bus/esp32_src/spi_bus.c

@@ -448,7 +448,7 @@ STATIC const mp_rom_map_elem_t mp_lcd_spi_bus_locals_dict_table[] = {
  { MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&mp_lcd_bus_init_obj) },
  { MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
  { MP_ROM_QSTR(MP_QSTR___del__), MP_ROM_PTR(&mp_lcd_bus_deinit_obj) },
- { MP_ROM_QSTR(MP_QSTR_MAXIMUM_BUFFER_SIZE), MP_ROM_INT(SOC_SPI_MAXIMUM_BUFFER_SIZE) },
+ { MP_ROM_QSTR(MP_QSTR_SPI_MAXIMUM_BUFFER_SIZE), MP_ROM_INT(SOC_SPI_MAXIMUM_BUFFER_SIZE) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(mp_lcd_spi_bus_locals_dict, mp_lcd_spi_bus_locals_dict_table);

ext_mod/lcd_bus/lcd_types.h

@@ -63,7 +63,7 @@
  mp_lcd_err_t lcd_panel_io_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap);
  mp_lcd_err_t lcd_panel_io_rx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
  mp_lcd_err_t lcd_panel_io_tx_param(mp_obj_t obj, int lcd_cmd, void *param, size_t param_size);
- mp_lcd_err_t lcd_panel_io_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size);
+ mp_lcd_err_t lcd_panel_io_tx_color(mp_obj_t obj, int lcd_cmd, void *color, size_t color_size, int x_start, int y_start, int x_end, int y_end);
  mp_obj_t lcd_panel_io_allocate_framebuffer(mp_obj_t obj, uint32_t size, uint32_t caps);
  mp_obj_t lcd_panel_io_free_framebuffer(mp_obj_t obj, mp_obj_t buf);