fixes build for custom boards

Author: kdschlosser

builder/esp32.py

@@ -1484,8 +1484,9 @@ def compile(*args):  # NOQA
 
             build_name = f'build-{board}'
 
-            if board_variant:
-                build_name += f'-{board_variant}'
+            if custom_board_path is None:
+                if board_variant:
+                    build_name += f'-{board_variant}'
 
             full_file_path = (
                 f'{SCRIPT_DIR}/lib/micropython/ports/esp32/{build_name}'
@@ -1504,9 +1505,12 @@ def compile(*args):  # NOQA
 
             scrub_build_folder()
 
-            build_bin_file = f'build/lvgl_micropy_{build_name[6:]}-{flash_size}'
-            if oct_flash:
-                build_bin_file += '_OCTFLASH'
+            if custom_board_path is None:
+                build_bin_file = f'build/lvgl_micropy_{build_name[6:]}-{flash_size}'
+                if oct_flash:
+                    build_bin_file += '_OCTFLASH'
+            else:
+                build_bin_file = f'build/lvgl_micropy_{build_name[6:]}'
 
             build_bin_file += '.bin'
             build_bin_file = os.path.abspath(build_bin_file)

display_configs/LilyGo-TDeck/LilyGo-TDeck.toml

@@ -1,11 +1,4 @@
 [MCU.esp32]
-BOARD = "ESP32_GENERIC_S3"
-BOARD_VARIANT = "SPIRAM_OCT"
-flash_size = 16
-octal_flash = true
-enable_cdc_repl = "y"
-enable_jtag_repl = "n"
-enable_uart_repl = "n"
 FROZEN_MANIFEST = "display_configs/LilyGo-TDeck/manifest.py"
 
 [SPI.Bus.spi_bus]
@@ -50,11 +43,10 @@ reg_bits = 8
 data_bus = "display_bus"
 display_width = 320
 display_height = 240
-power_pin = 42
 backlight_pin = 42
 backlight_on_state = "st7789.STATE_PWM"
 color_space = "lv.COLOR_FORMAT.RGB565"
-color_byte_order = "ili9341.BYTE_ORDER_BGR"
+color_byte_order = "st7789.BYTE_ORDER_BGR"
 rgb565_byte_swap = true
 
 [display.set_power]
@@ -69,7 +61,7 @@ device = "touch_device"
 [keyboard_s3.Keyboard.keyboard]
 device = "keyboard_device"
 
-[trackball.TrackBall.trackball]
+[trackball.TrackBall.tball]
 up_pin = 3
 down_pin = 2
 left_pin = 15

display_configs/LilyGo-TDeck/power.py

@@ -4,7 +4,7 @@
 import time
 
 
-class PowerButton:
+class Button:
 
     def __init__(self, pin):
         self._pin = machine.Pin(pin, machine.Pin.IN)

make.py

@@ -188,18 +188,6 @@
         raise RuntimeError('Frozen manifest does not exist.')
 
 
-if custom_board_path is not None:
-    board_name = os.path.split(custom_board_path)[-1]
-    dst_path = f'lib/micropython/ports/{target}/boards/{board_name}'
-    if os.path.exists(dst_path):
-        shutil.rmtree(dst_path)
-
-    shutil.copytree(custom_board_path, dst_path)
-
-    if board is None or board != board_name:
-        board = board_name
-
-
 if lv_cflags is None:
     lv_cflags = ''
 
@@ -217,10 +205,12 @@ def get_submodules():
         os.path.join(SCRIPT_DIR, 'lib/micropython/mpy-cross')
     ):
         builder.get_micropython()
+
     if not os.path.exists(
         os.path.join(SCRIPT_DIR, 'lib/lvgl/lvgl.h')
     ):
         builder.get_lvgl()
+
     if not os.path.exists(os.path.join(
         SCRIPT_DIR, 'lib/pycparser/pycparser')
     ):
@@ -273,6 +263,19 @@ def create_lvgl_header():
 
     get_submodules()
 
+    if custom_board_path is not None:
+        board_name = os.path.split(custom_board_path)[-1]
+        dst_path = f'lib/micropython/ports/{target}/boards/{board_name}'
+        if os.path.exists(dst_path):
+            shutil.rmtree(dst_path)
+
+        shutil.copytree(custom_board_path, dst_path)
+
+        if board is None or board != board_name:
+            board = board_name
+
+        mod.custom_board_path = custom_board_path
+
     extra_args, lv_cflags, board = mod.parse_args(extra_args, lv_cflags, board)
     extra_args = mod.build_commands(
         target, extra_args, SCRIPT_DIR, lv_cflags, board)