Merge branch 'main' of https://github.com/lvgl-micropython/lvgl_micropython into sw_rotate_for_all_bus_new

# Conflicts:
#	builder/toml_reader.py
#	ext_mod/lcd_bus/esp32_include/rgb565_dither.h
#	ext_mod/lcd_bus/esp32_src/rgb565_dither.c
#	ext_mod/lcd_bus/micropython.cmake
#	make.py

Author: kdschlosser

.github/workflows/macOS.yml

@@ -22,6 +22,7 @@ jobs:
       run: |
         brew install --force ninja 
         brew install --force sdl2
+        brew install --force libffi
         git submodule update --init -- lib/pycparser
         git submodule update --init --jobs 4 -- lib/micropython        
         git submodule update --init --jobs 4 -- lib/lvgl
@@ -57,7 +58,6 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        brew install --force ninja 
         git submodule update --init -- lib/pycparser
         git submodule update --init --jobs 4 -- lib/micropython        
         git submodule update --init --jobs 4 -- lib/lvgl        

README.md

@@ -87,6 +87,8 @@ used to be.
       - [*Model/Variant*](#model/variant)
       - [*Model/Variant specific options*](#model/variant-specific-options)
         - [*ESP32 options*](#esp32-options)
+          - [*Custom Boards*](https://github.com/lvgl-micropython/lvgl_micropython/tree/main/custom_board_and_toml_examples/README.md#custom-boards)
+          - [*TOML Example*](https://github.com/lvgl-micropython/lvgl_micropython/tree/main/custom_board_and_toml_examples/README.md#toml-example)
     - [*Global Options (optional)*](#global-options-(optional))
       - [*Input/Output*](#input/output)
       - [*Other global options*](#other-global-options)
@@ -586,49 +588,9 @@ Options specific to the ESP32-S2, ESP32-S3, ESP32-C3 and ESP32-C6 processors:
 * `--enable-cdc-repl={y/n}`: Enable/disable REPL output over CDC on the USB pins
 * `--enable-jtag-repl={y/n}`: Enable/disable REPL output over JTAG on the USB pins
 
+* `--custom-board-path={path to custom board}`: [Custom Board](https://github.com/lvgl-micropython/lvgl_micropython/tree/main/custom_board_and_toml_examples/README.md#custom-boards) 
+* `--toml={path to .toml file}`: [TOML Example](https://github.com/lvgl-micropython/lvgl_micropython/tree/main/custom_board_and_toml_examples/README.md#toml-example)
 
-This next option is abailable for all ESP32 series MCU's I placed it here instead of above 
-because it is going to need some in depth explaining. This is for advanced users.
-
-* `--custom-board-path`
-
-I added the ability to provide a path to a custom board. There are a few requirememnts for 
-this to work properly. The path needs to point to the folder that holds the board specification 
-files. Here is a list of required files.
-
-* `board.json`: This file outlines what the board is. At a minimum the file needs to contain the following.
-                ```
-                {
-                    "mcu": "{MCU}"
-                }
-                ```
-                where `{MCU}` is one of the follwing:
-
-  * esp32
-  * esp32s2
-  * exp32s3
-  * exp32c3
-  * exp32c6
-
-* `sdkconfig.board`: This file contains all of the ESP-IDF specific config settings. If you don't know 
-                     what needs to be set in here then please ask me for assistance.
-* `mpconfigboard.h`: MicroPython config settings. If you don't know what needs to be set in here then
-                     please ask me for assistance.
-* `mpconfigboard.cmake`: Build script. At a minimum the following should be in the build script.
-                         `{MCU}` is replaced with one of the options from the list of MCU's above.
-                         `{BOARD_CONATINING_FOLDER}` if the name of the folder these files are located in.
-```
-set(IDF_TARGET {MCU})
-
-set(SDKCONFIG_DEFAULTS
-    boards/sdkconfig.base
-    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
-    boards/{BOARD_CONATINING_FOLDER}/sdkconfig.board
-)
-```
-
-* `partition.csv`: This file dictates what the partitions are supposed to be on the ESP32. As for assistance
-                   If you do not know how to create one of these.
 
 <br>
 

builder/esp32.py

@@ -528,31 +528,6 @@ def esp32_args(extra_args):
 
 def parse_args(extra_args, lv_cflags, brd):
     global board
-    global custom_board_path
-
-    esp_argParser = ArgumentParser(prefix_chars='-')
-    esp_argParser.add_argument(
-        '--custom-board-path',
-        dest='custom_board_path',
-        default=None,
-        action='store'
-    )
-    esp_args, extra_args = esp_argParser.parse_known_args(extra_args)
-
-    custom_board_path = esp_args.custom_board_path
-
-    if custom_board_path is not None:
-        if not os.path.exists(custom_board_path):
-            raise RuntimeError(
-                'Supplied custom board path does not exist.'
-            )
-        parent_folder_name = os.path.split(custom_board_path)[-1]
-
-        dst_path = f'lib/micropython/ports/esp32/boards/{parent_folder_name}'
-        shutil.copytree(custom_board_path, dst_path)
-
-        if brd is None:
-            brd = parent_folder_name
 
     if brd is None:
         brd = 'ESP32_GENERIC'
@@ -1120,7 +1095,8 @@ def update_mpconfigport():
                 '#ifdef MICROPY_HW_ESP_USB_SERIAL_JTAG',
                 '#undef MICROPY_HW_ESP_USB_SERIAL_JTAG',
                 '#endif',
-                f'#define MICROPY_HW_ESP_USB_SERIAL_JTAG  ({int(enable_jtag_repl.lower() == "y")})'
+                f'#define MICROPY_HW_ESP_USB_SERIAL_JTAG  ({int(enable_jtag_repl.lower() == "y")})',
+                '#define USB_SERIAL_JTAG_PACKET_SZ_BYTES 	(64)'
             ])
 
         repl_data.extend([

builder/macOS.py

@@ -12,8 +12,8 @@
     mpy_cross as _mpy_cross
 )
 
-
 from . import unix
+from . import spawn
 
 
 unix.REAL_PORT = 'macOS'
@@ -58,7 +58,82 @@ def build_sdl(_):
 unix.build_sdl = build_sdl
 
 
+def is_homebrew_arm(cmd):
+    ret_val, output = spawn(cmd, out_to_screen=False)
+    if ret_val:
+        if cmd[0][0] == '/opt/homebrew/bin/brew':
+            raise RuntimeError('Unable to locate homebrew installation')
+
+        return is_homebrew_arm([['/opt/homebrew/bin/brew', 'config']])
+
+    data = {line.split(':', 1)[0].strip(): line.split(':', 1)[1].strip() for
+            line in output.split('\n')}
+
+    if 'macOS' not in data:
+        raise RuntimeError('Unable to determine Homebrew CPU type')
+
+    if 'arm64' in data['macOS']:
+        if 'Rosetta 2' not in data:
+            if cmd[0][0] != '/opt/homebrew/bin/brew':
+                return is_homebrew_arm([['/opt/homebrew/bin/brew', 'config']])
+
+            raise RuntimeError('Unable to determine Homebrew platform')
+
+        if data['Rosetta 2'] == 'true':
+            if cmd[0][0] != '/opt/homebrew/bin/brew':
+                return is_homebrew_arm([['/opt/homebrew/bin/brew', 'config']])
+
+            raise RuntimeError('Unable to locate Homebrew for Arm processors.')
+
+        return True, cmd[0][0]
+
+    return False, cmd[0][0]
+
+
 def submodules():
+    is_arm, brew_path = is_homebrew_arm([['brew', 'config']])
+
+    if is_arm:
+        ret, out = spawn([[brew_path, 'info', 'libffi']], out_to_screen=False)
+        if ret:
+            print(out)
+            sys.exit(ret)
+
+        if 'Installed\n' not in out:
+            print(out)
+            raise RuntimeError('libffi is not installed')
+
+        out = out.split('Installed\n', 1)[-1]
+        alt_path = out.split('(', 1)[0].strip().split('Cellar', 1)[0]
+
+        if 'export LDFLAGS=' in out:
+            out = out.split('export LDFLAGS="', 1)[-1]
+            ldflags = out.split('"', 1)[0]
+        else:
+            ldflags = f'"-L{alt_path}opt/libffi/lib"'
+
+        if 'export CPPFLAGS=' in out:
+            out = out.split('export CPPFLAGS="', 1)[-1]
+            cflags = out.split('"', 1)[0]
+        else:
+            cflags = f'"-I{alt_path}opt/libffi/include"'
+
+        ret, out = spawn([[brew_path, 'info', 'sdl2']], out_to_screen=False)
+
+        if ret:
+            print(out)
+            sys.exit(ret)
+
+        if 'Installed\n' not in out:
+            print(out)
+            raise RuntimeError('sdl2 is not installed')
+
+        ldflags += f' "-L{alt_path}lib"'
+        cflags += f' "-I{alt_path}include"'
+
+        os.environ['LDFLAGS'] = f'{ldflags}'
+        os.environ['CFLAGS'] = f'{cflags}'
+
     berkeley_db = os.path.abspath('lib/micropython/lib/berkeley-db-1.xx/README')
 
     if not os.path.exists(berkeley_db):

custom_board_and_toml_examples/MY_CUSTOM_BOARD/board.json

@@ -0,0 +1,6 @@
+{
+    "mcu": "esp32s3",
+    "product": "Custom ESP32-S3 display board",
+    "url": "https://www.come_manufacturer.com/board.html",
+    "vendor": "Vendor name of board"
+}

custom_board_and_toml_examples/MY_CUSTOM_BOARD/mpconfigboard.cmake

@@ -0,0 +1,17 @@
+set(IDF_TARGET esp32s3)
+
+set(SDKCONFIG_DEFAULTS
+    boards/sdkconfig.base
+    ${SDKCONFIG_IDF_VERSION_SPECIFIC}
+    boards/sdkconfig.usb
+    boards/sdkconfig.ble
+    boards/sdkconfig.spiram_sx
+    boards/sdkconfig.spiram_oct
+    boards/sdkconfig.240mhz
+    boards/MY_CUSTOM_BOARD/sdkconfig.board
+)
+
+list(APPEND MICROPY_DEF_BOARD
+    MICROPY_HW_BOARD_NAME="custom ESP32 board"
+)
+

custom_board_and_toml_examples/MY_CUSTOM_BOARD/mpconfigboard.h

@@ -0,0 +1,11 @@
+#ifndef MICROPY_HW_BOARD_NAME
+// Can be set by mpconfigboard.cmake.
+#define MICROPY_HW_BOARD_NAME               "Custom ESP32S3 board"
+#endif
+#define MICROPY_HW_MCU_NAME                 "ESP32S3"
+
+// Enable UART REPL for modules that have an external USB-UART and don't use native USB.
+#define MICROPY_HW_ENABLE_UART_REPL         (1)
+
+#define MICROPY_HW_I2C0_SCL                 (9)
+#define MICROPY_HW_I2C0_SDA                 (8)

custom_board_and_toml_examples/MY_CUSTOM_BOARD/my_custom_board.toml

@@ -0,0 +1,59 @@
+
+[MCU.esp32]
+BOARD = "MY_CUSTOM_BOARD"
+
+
+[I80Bus.display_bus]
+data0 = 9
+data1 = 46
+data2 = 3
+data3 = 8
+data4 = 18
+data5 = 17
+data6 = 16
+data7 = 15
+dc = 0
+wr = 47
+cs = -1
+freq = 20000000
+
+
+[I2C.Bus.i2c_bus]
+host = 0
+scl = 5
+sda = 6
+freq = 100000
+
+
+[I2C.Device.indev_device]
+bus = "i2c_bus"
+dev_id = "ft6x36.I2C_ADDR"
+reg_bits = "ft6x36.BITS"
+
+
+[ST7796.display]
+data_bus = "display_bus"
+display_width = 320
+display_height = 480
+backlight_pin = 45
+color_byte_order = "st7789.BYTE_ORDER_BGR"
+color_space = "lv.COLOR_FORMAT.RGB565"
+rgb565_byte_swap = true
+
+[ST7796.display.init]
+params = []
+
+[FT6x36.indev]
+device = "indev_device"
+
+[display.set_color_inversion]
+params = [true]
+
+[display.set_rotation]
+params = ["lv.DISPLAY_ROTATION._90"]
+
+[display.set_backlight]
+params = [100]
+
+[task_handler.TaskHandler]
+params=[]

custom_board_and_toml_examples/MY_CUSTOM_BOARD/partitions.csv

@@ -0,0 +1,7 @@
+# Notes: the offset of the partition table itself is set in
+# $IDF_PATH/components/partition_table/Kconfig.projbuild.
+# Name,   Type, SubType, Offset,  Size, Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x2F0000,
+vfs,      data, fat,     0x300000, 0x1D00000,

custom_board_and_toml_examples/MY_CUSTOM_BOARD/sdkconfig.board

@@ -0,0 +1,29 @@
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+
+CONFIG_FREERTOS_HZ=1000
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+
+CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
+CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+CONFIG_ESPTOOLPY_FLASHSIZE_32MB=y
+
+CONFIG_SPIRAM_SPEED_120M=y
+CONFIG_SPIRAM_IGNORE_NOTFOUND=n
+CONFIG_SPIRAM_RODATA=y
+CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
+
+CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
+CONFIG_COMPILER_OPTIMIZATION_PERF=y
+
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="boards/MY_CUSTOM_BOARD/partitions.csv"
+
+CONFIG_LWIP_LOCAL_HOSTNAME="my_custom_board"
+
+CONFIG_TINYUSB_DESC_USE_ESPRESSIF_VID=n
+CONFIG_TINYUSB_DESC_USE_DEFAULT_PID=n
+CONFIG_TINYUSB_DESC_CUSTOM_VID=0x2341
+CONFIG_TINYUSB_DESC_CUSTOM_PID=0x056B
+CONFIG_TINYUSB_DESC_MANUFACTURER_STRING="MyCustomBoard"
+CONFIG_TINYUSB_DESC_PRODUCT_STRING="Custom ESP32"
+