working on being able to share the SPI Bus

Author: kdschlosser

builder/esp32.py

@@ -317,7 +317,6 @@ def parse_args(extra_args, lv_cflags, brd):
     else:
         lv_cflags = '-DLV_KCONFIG_IGNORE=1'
 
-
     return extra_args, lv_cflags, board
 
 
@@ -335,9 +334,9 @@ def parse_args(extra_args, lv_cflags, brd):
 SCRIPT_DIR = ''
 
 
-def build_commands(_, extra_args, script_path, lv_cflags, ___):
+def build_commands(_, extra_args, script_dir, lv_cflags, ___):
     global SCRIPT_DIR
-    SCRIPT_DIR = script_path
+    SCRIPT_DIR = script_dir
 
     clean_cmd.extend(esp_cmd[:])
     clean_cmd[1] = 'clean'
@@ -352,7 +351,8 @@ def build_commands(_, extra_args, script_path, lv_cflags, ___):
         f'LV_CFLAGS="{lv_cflags}"',
         f'LV_PORT=esp32',
         f'BOARD={board}',
-        'USER_C_MODULES=../../../../../ext_mod/micropython.cmake'
+        'USER_C_MODULES=../../../../../ext_mod/micropython.cmake',
+        f'"CFLAGS_EXTRA=-I{script_dir}/micropy_updates/common"'
     ])
 
     esp_cmd.extend(extra_args)

builder/macOS.py

@@ -80,8 +80,8 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
             '-Wno-unused-function '
             '-Wno-double-promotion '
             '-Wno-unused-command-line-argument '
-            '-Wno-missing-field-initializers"'
-            # 'export LDFLAGS="-L/opt/homebrew/opt/libffi/lib"
+            '-Wno-missing-field-initializers'
+            f'-I{script_dir}/micropy_updates/common"'
             # 'export CPPFLAGS="-I/opt/homebrew/opt/libffi/include"'
         )
     ])

builder/nrf.py

@@ -48,6 +48,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
 
     compile_cmd.extend(nrf_cmd[:])
     compile_cmd.pop(1)
+    compile_cmd.append(f'"CFLAGS_EXTRA=-I{script_dir}/micropy_updates/common"')
 
     submodules_cmd.extend(nrf_cmd[:])
     submodules_cmd[1] = 'submodules'

builder/renesas.py

@@ -48,6 +48,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
 
     compile_cmd.extend(renesas_cmd[:])
     compile_cmd.pop(1)
+    compile_cmd.append(f'"CFLAGS_EXTRA=-I{script_dir}/micropy_updates/common"')
 
     submodules_cmd.extend(renesas_cmd[:])
     submodules_cmd[1] = 'submodules'

builder/rp2.py

@@ -50,7 +50,7 @@ def parse_args(extra_args, lv_cflags, board):
 submodules_cmd = []
 
 
-def build_commands(_, extra_args, __, lv_cflags, board):
+def build_commands(_, extra_args, script_path, lv_cflags, board):
     rp2_cmd.extend(extra_args)
 
     if lv_cflags:
@@ -71,6 +71,7 @@ def build_commands(_, extra_args, __, lv_cflags, board):
 
     compile_cmd.extend(rp2_cmd[:])
     compile_cmd.pop(1)
+    compile_cmd.append(f'"CFLAGS_EXTRA=-I{script_path}/micropy_updates/common"')
 
     submodules_cmd.extend(rp2_cmd[:])
     submodules_cmd[1] = 'submodules'
@@ -119,6 +120,16 @@ def submodules():
 
 
 def compile():  # NOQA
+    import shutil
+
+    src_path = 'micropy_updates/rp2'
+    dst_path = 'lib/micropython/ports/rp2'
+
+    for file in os.listdir(src_path):
+        src_file = os.path.join(src_path, file)
+        dst_file = os.path.join(dst_path, file)
+        shutil.copyfile(src_file, dst_file)
+
     if 'PICO_SDK_PATH' not in os.environ:
         os.environ['PICO_SDK_PATH'] = (
             f'{os.getcwd()}/lib/micropython/lib/pico-sdk'

builder/stm32.py

@@ -49,6 +49,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
 
     compile_cmd.extend(stm32_cmd[:])
     compile_cmd.pop(1)
+    compile_cmd.append(f'"CFLAGS_EXTRA=-I{script_dir}/micropy_updates/common"')
 
     submodules_cmd.extend(stm32_cmd[:])
     submodules_cmd[1] = 'submodules'
@@ -94,6 +95,16 @@ def submodules():
 
 
 def compile():  # NOQA
+    import shutil
+
+    src_path = 'micropy_updates/stm32'
+    dst_path = 'lib/micropython/ports/stm32'
+
+    for file in os.listdir(src_path):
+        src_file = os.path.join(src_path, file)
+        dst_file = os.path.join(dst_path, file)
+        shutil.copyfile(src_file, dst_file)
+
     return_code, _ = spawn(compile_cmd, cmpl=True)
     if return_code != 0:
         sys.exit(return_code)

builder/unix.py

@@ -72,11 +72,9 @@ def build_commands(_, extra_args, script_dir, lv_cflags, board):
         f'LV_CFLAGS="{lv_cflags}"',
         f'LV_PORT=unix',
         f'USER_C_MODULES="{script_dir}/ext_mod"',
-        (
-            '"CFLAGS_EXTRA='
-            '-Wno-missing-field-initializers"'
-        )
+        f'"CFLAGS_EXTRA=-Wno-missing-field-initializers -I{script_dir}/micropy_updates/common"'
     ])
+
     unix_cmd.extend(extra_args)
 
     clean_cmd.extend(unix_cmd[:])

ext_mod/lcd_bus/common_include/spi_bus.h

@@ -3,6 +3,7 @@
 
     //local_includes
     #include "modlcd_bus.h"
+    #include "mp_spi_common.h"
     #include "mphalport.h"
 
     // micropython includes
@@ -32,7 +33,6 @@
 
             void (*send_cmd)(mp_lcd_spi_bus_obj_t *self, int lcd_cmd);
             void (*send_param)(mp_lcd_spi_bus_obj_t *self, void *param, size_t param_size);
-
         };
 
     #else
@@ -43,13 +43,10 @@
             #include "extmod/machine_spi.h"
         #endif
 
-
         typedef struct _lcd_panel_io_spi_config_t {
-            mp_hal_pin_obj_t cs_gpio_num;
-            mp_hal_pin_obj_t dc_gpio_num;
+            mp_obj_t cs_gpio;
+            mp_hal_pin_obj_t dc_gpio;
             void (*spi_transfer)(mp_obj_base_t *obj, size_t len, const uint8_t *src, uint8_t *dest);
-            int lcd_cmd_bits;
-            int lcd_param_bits;
             struct {
                 unsigned int dc_low_on_data: 1;
                 unsigned int lsb_first: 1;
@@ -89,6 +86,9 @@
             void (*send_param)(mp_lcd_spi_bus_obj_t *self, void *param, size_t param_size);
 
             int host;
+            machine_hw_spi_obj_t *spi_bus;
+            uint8_t firstbit;
+            uint32_t freq;
         };
 
     #endif