Adds support for passing CONFIG_* settings to the ESP32 build.

Places critical LVGL function in IRAM for faster execution.
Changes SPI Bus

Author: kdschlosser

builder/unix.py

@@ -31,9 +31,9 @@ def parse_args(extra_args, lv_cflags, board):
     unix_argParser.add_argument(
         '--heap-size',
         dest='heap_size',
-        help="heap size to use in bytes. Default is 4mb (4,194,304 bytes). "
-             "Must be more than 100k (102,104 bytes)",
-        default=4194304,
+        help="heap size to use in bytes. Default is 8MiB (8,388,608 bytes). "
+             "Must be more than 100KiB (102,104 bytes)",
+        default=(2 ** 20) * 8,
         type=int,
         action='store'
     )
@@ -88,7 +88,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
         )
     ])
 
-    unix_cmd.extend(extra_args)
+    # unix_cmd.extend(extra_args)
 
     clean_cmd.extend(unix_cmd[:])
     clean_cmd[1] = 'clean'
@@ -98,6 +98,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
 
     submodules_cmd.extend(unix_cmd[:])
     submodules_cmd[1] = 'submodules'
+    return extra_args
 
 
 def build_manifest(
@@ -174,15 +175,15 @@ def submodules():
         ]
         _run(cmd_)
 
-    cmd_ = ['cd lib/SDL && git checkout  release-2.30.2']
+    cmd_ = ['cd lib/SDL && git checkout release-2.30.2']
     _run(cmd_)
 
     return_code, _ = spawn(submodules_cmd)
     if return_code != 0:
         sys.exit(return_code)
 
 
-def compile():  # NOQA
+def compile(*args):  # NOQA
     main_path = 'lib/micropython/ports/unix/main.c'
 
     with open(main_path, 'rb') as f:
@@ -242,7 +243,10 @@ def compile():  # NOQA
 
     build_sdl()
 
-    return_code, _ = spawn(compile_cmd)
+    cmd_ = compile_cmd[:]
+    cmd_.extend(list(args))
+
+    return_code, _ = spawn(cmd_)
     if return_code != 0:
         sys.exit(return_code)
 

ext_mod/lcd_bus/esp32_include/spi_bus.h

@@ -3,6 +3,7 @@
 
     //local_includes
     #include "lcd_types.h"
+    #include "../../../micropy_updates/common/mp_spi_common.h"
 
     // esp-idf includes
     #include "esp_lcd_panel_io.h"
@@ -34,7 +35,7 @@
         esp_lcd_spi_bus_handle_t bus_handle;
 
         spi_host_device_t host;
-
+        machine_hw_spi_device_obj_t spi_device;
     } mp_lcd_spi_bus_obj_t;
 
     extern const mp_obj_type_t mp_lcd_spi_bus_type;

ext_mod/lcd_bus/esp32_src/spi_bus.c

@@ -62,6 +62,7 @@ typedef struct _machine_hw_spi_obj_t {
 mp_lcd_err_t spi_del(mp_obj_t obj);
 mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp, uint32_t buffer_size, bool rgb565_byte_swap, uint8_t cmd_bits, uint8_t param_bits);
 mp_lcd_err_t spi_get_lane_count(mp_obj_t obj, uint8_t *lane_count);
+void spi_deinit_callback(machine_hw_spi_device_obj_t *device);
 
 
 static mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args)
@@ -105,11 +106,11 @@ static mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
     mp_lcd_spi_bus_obj_t *self = m_new_obj(mp_lcd_spi_bus_obj_t);
     self->base.type = &mp_lcd_spi_bus_type;
 
-    machine_hw_spi_obj_t *spi_bus = MP_OBJ_TO_PTR(args[ARG_spi_bus].u_obj);
+    machine_hw_spi_bus_obj_t *spi_bus = MP_OBJ_TO_PTR(args[ARG_spi_bus].u_obj);
 
     self->callback = mp_const_none;
 
-    self->host = (spi_host_device_t)spi_bus->spi_bus->host;
+    self->host = (spi_host_device_t)spi_bus->host;
     self->panel_io_handle.panel_io = NULL;
     self->bus_handle = (esp_lcd_spi_bus_handle_t)self->host;
 
@@ -129,6 +130,12 @@ static mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
     self->panel_io_handle.init = &spi_init;
     self->panel_io_handle.get_lane_count = &spi_get_lane_count;
 
+    self->spi_device.active = true;
+    self->spi_device.base.type = &machine_hw_spi_device_type;
+    self->spi_device.spi_bus = spi_bus;
+    self->spi_device.deinit = &spi_deinit_callback;
+    self->spi_device.user_data = self;
+
 #if CONFIG_LCD_ENABLE_DEBUG_LOG
     printf("host=%d\n", self->host);
     printf("cs_gpio_num=%d\n", self->panel_io_config.cs_gpio_num);
@@ -145,18 +152,34 @@ static mp_obj_t mp_lcd_spi_bus_make_new(const mp_obj_type_t *type, size_t n_args
     return MP_OBJ_FROM_PTR(self);
 }
 
+void spi_deinit_callback(machine_hw_spi_device_obj_t *device)
+{
+    mp_lcd_spi_bus_obj_t *self = (mp_lcd_spi_bus_obj_t *)device->user_data;
+    spi_del(MP_OBJ_FROM_PTR(self));
+}
+
 
 mp_lcd_err_t spi_del(mp_obj_t obj)
 {
     mp_lcd_spi_bus_obj_t *self = (mp_lcd_spi_bus_obj_t *)obj;
 #if CONFIG_LCD_ENABLE_DEBUG_LOG
     printf("spi_del(self)\n");
 #endif
+
+    if (!self->spi_device.active) return ESP_OK;
+
     mp_lcd_err_t ret = esp_lcd_panel_io_del(self->panel_io_handle.panel_io);
     if (ret != ESP_OK) {
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_panel_io_del)"), ret);
     }
 
+    machine_hw_spi_bus_remove_device(&self->spi_device);
+    self->spi_device.active = false;
+
+    if (self->spi_device.spi_bus->device_count == 0) {
+        self->spi_device.spi_bus->deinit(self->spi_device.spi_bus);
+    }
+
     return ret;
 }
 
@@ -168,6 +191,10 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
 #endif
     mp_lcd_spi_bus_obj_t *self = (mp_lcd_spi_bus_obj_t *)obj;
 
+    if (self->spi_device.spi_bus->state == MP_SPI_STATE_STOPPED) {
+        machine_hw_spi_bus_initilize(self->spi_device.spi_bus);
+    }
+
     if (bpp == 16) {
         self->rgb565_byte_swap = rgb565_byte_swap;
     } else {
@@ -190,6 +217,7 @@ mp_lcd_err_t spi_init(mp_obj_t obj, uint16_t width, uint16_t height, uint8_t bpp
         mp_raise_msg_varg(&mp_type_ValueError, MP_ERROR_TEXT("%d(esp_lcd_new_panel_io_spi)"), ret);
     }
 
+    machine_hw_spi_bus_add_device(&self->spi_device);
     return ret;
 }
 

micropy_updates/common/mp_spi_common.h

@@ -12,20 +12,25 @@
         MP_SPI_STATE_SENDING
     } mp_spi_state_t;
 
-    typedef struct _machine_hw_spi_bus_obj_t {
+    typedef struct _machine_hw_spi_bus_obj_t machine_hw_spi_bus_obj_t;
+    typedef struct _machine_hw_spi_device_obj_t machine_hw_spi_device_obj_t;
+
+    struct _machine_hw_spi_bus_obj_t {
+        mp_obj_base_t base;
         uint8_t host;
         mp_obj_t sck;
         mp_obj_t mosi;
         mp_obj_t miso;
-        int16_t active_devices;
+        uint8_t device_count;
+        machine_hw_spi_device_obj_t **devices;
         mp_spi_state_t state;
         const void *user_data;
-    } machine_hw_spi_bus_obj_t;
-
+        void (*deinit)(machine_hw_spi_bus_obj_t *bus);
+    };
 
-    typedef struct _machine_hw_spi_obj_t {
+    struct _machine_hw_spi_device_obj_t {
         mp_obj_base_t base;
-        uint32_t baudrate;
+        uint32_t freq;
         uint8_t polarity;
         uint8_t phase;
         uint8_t bits;
@@ -34,7 +39,15 @@
         mp_obj_t cs;
         machine_hw_spi_bus_obj_t *spi_bus;
         void *user_data;
-    } machine_hw_spi_obj_t;
+        void (*deinit)(machine_hw_spi_device_obj_t *device);
+    };
+
+    void machine_hw_spi_bus_initilize(machine_hw_spi_bus_obj_t *bus);
+    void machine_hw_spi_bus_add_device(machine_hw_spi_device_obj_t *device);
+    void machine_hw_spi_bus_remove_device(machine_hw_spi_device_obj_t *device);
+
+    extern const mp_obj_type_t machine_hw_spi_device_type;
+    extern const mp_obj_type_t machine_hw_spi_bus_type;
 
 #endif /* __MP_SPI_COMMON_H__ */