working on being able to share the SPI Bus

Author: kdschlosser

builder/esp32.py

@@ -351,8 +351,7 @@ def build_commands(_, extra_args, script_dir, lv_cflags, ___):
         f'LV_CFLAGS="{lv_cflags}"',
         f'LV_PORT=esp32',
         f'BOARD={board}',
-        'USER_C_MODULES=../../../../../ext_mod/micropython.cmake',
-        f'"IDFPY_FLAGS=-DMICROPY_CPP_INC_EXTRA={script_dir}/micropy_updates/common"'
+        'USER_C_MODULES=../../../../../ext_mod/micropython.cmake'
     ])
 
     esp_cmd.extend(extra_args)

builder/macOS.py

@@ -80,8 +80,7 @@ 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 '
-            f'-I{script_dir}/micropy_updates/common"'
+            '-Wno-missing-field-initializers'
             # 'export CPPFLAGS="-I/opt/homebrew/opt/libffi/include"'
         )
     ])

builder/nrf.py

@@ -48,7 +48,6 @@ 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,7 +48,6 @@ 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

@@ -71,7 +71,6 @@ def build_commands(_, extra_args, script_path, 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'

builder/stm32.py

@@ -49,7 +49,6 @@ 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'

builder/unix.py

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

micropy_updates/stm32/machine_spi.c

@@ -167,14 +167,16 @@ mp_obj_t machine_hard_spi_make_new(const mp_obj_type_t *type, size_t n_args, siz
     // set the SPI configuration values
 
     spi_t *spi = (spi_t *)self->spi_bus->user_data;
-    spi->spi->Init->Mode = SPI_MODE_MASTER;
+    SPI_InitTypeDef *init = spi->spi->Init;
+
+    init->Mode = SPI_MODE_MASTER;
 
     // these parameters are not currently configurable
-    spi->spi->Init->Direction = SPI_DIRECTION_2LINES;
-    spi->spi->Init->NSS = SPI_NSS_SOFT;
-    spi->spi->Init->TIMode = SPI_TIMODE_DISABLE;
-    spi->spi->Init->CRCCalculation = SPI_CRCCALCULATION_DISABLE;
-    spi->spi->Init->CRCPolynomial = 0;
+    init->Direction = SPI_DIRECTION_2LINES;
+    init->NSS = SPI_NSS_SOFT;
+    init->TIMode = SPI_TIMODE_DISABLE;
+    init->CRCCalculation = SPI_CRCCALCULATION_DISABLE;
+    init->CRCPolynomial = 0;
 
     self->polarity = (uint8_t)args[ARG_polarity].u_int;
     self->phase = (uint8_t)args[ARG_phase].u_int;