Merge branch 'main' of https://github.com/lvgl-micropython/lvgl_micropython into swrotate-for-all-busses

Author: kdschlosser

builder/__init__.py

@@ -148,6 +148,23 @@ def setup_windows_build():
     return _windows_env
 
 
+def get_lvgl_version():
+    with open('lib/lvgl/lv_version.h', 'r') as f:
+        data = f.read()
+
+    data = data.split('LVGL_VERSION_MAJOR', 1)[-1]
+    major, data = [item.strip() for item in data.split('\n', 1)]
+    data = data.split('LVGL_VERSION_MINOR', 1)[-1]
+    minor, data = [item.strip() for item in data.split('\n', 1)]
+    data = data.split('LVGL_VERSION_PATCH', 1)[-1]
+    patch, data = [item.strip() for item in data.split('\n', 1)]
+
+    if not patch:
+        patch = '0'
+
+    return f'{major}.{minor}.{patch}'
+
+
 def set_mp_version(port):
     mpconfigport = f'lib/micropython/ports/{port}/mpconfigport.h'
 
@@ -156,9 +173,10 @@ def set_mp_version(port):
 
     if 'MICROPY_BANNER_NAME_AND_VERSION' not in data:
         data += (
-            '\n\n#include "genhdr/mpversion.h"'
-            '\n\n#define MICROPY_BANNER_NAME_AND_VERSION "LVGL MicroPython '
-            '1.23.0 on " MICROPY_BUILD_DATE\n\n'
+            '\n\n#include "genhdr/mpversion.h"\n\n'
+            '\n\n#define MICROPY_BANNER_NAME_AND_VERSION '
+            f'"LVGL ({get_lvgl_version()}) MicroPython (" MICROPY_VERSION_STRING '
+            f'") Binding compiled on " MICROPY_BUILD_DATE\n\n'
         )
 
         with open(mpconfigport, 'wb') as f:

builder/esp32.py

@@ -857,7 +857,7 @@ def submodules():
 
     cmds = [
         [f'export "IDF_PATH={os.path.abspath(idf_path)}"'],
-        ['cd', idf_path],
+        ['cd', os.path.abspath(idf_path)],
         ['./install.sh', 'all']
     ]
 
@@ -870,36 +870,38 @@ def submodules():
     if result != 0:
         sys.exit(result)
 
-    env, cmds = setup_idf_environ()
+    cmds = []
 
-    wifi_lib = os.path.abspath(
-        os.path.join(idf_path, 'components/esp_wifi/lib')
-    )
-    berkeley_db = os.path.abspath('lib/micropython/lib/berkeley-db-1.xx/README')
-
-    if not os.path.exists(berkeley_db) or not os.path.exists(wifi_lib):
-        cmds.append(['cd lib/micropython'])
-        for dep in (
-            'tinyusb',
-            'micropython-lib',
-            'protobuf-c',
-            'wiznet5k',
-            'lwip',
-            'mbedtls',
-            'axtls',
-            'berkeley-db-1.xx',
-            'btstack'
-        ):
-            path = f"lib/{dep}"
+    for name, file in (
+        ('berkeley-db-1.xx', 'README'),
+        ('mbedtls', 'README.md'),
+        ('micropython-lib', 'README.md'),
+        ('tinyusb', 'README.rst')
+    ):
+        file = os.path.join('lib/micropython/lib', name, file)
+        if not os.path.exists(file):
+            cmds.extend([
+                [f'git submodule sync lib/{name}'],
+                [f'git submodule update --init --depth=1 lib/{name}']
+            ])
+    if cmds:
+        cmds.insert(0, ['cd lib/micropython'])
+        cmds.append(['cd ../..'])
+
+    cmds.insert(0, [f'cd {SCRIPT_DIR}'])
+    cmds.insert(0, ['. ./export.sh'])
+    cmds.insert(0, ['cd', os.path.abspath(idf_path)])
+
+    if 'GITHUB_RUN_ID' in os.environ:
+        cmds.insert(0, [f'export "IDF_PATH={os.path.abspath(idf_path)}"'])
+
+    cmds.append(submodules_cmd[:])
+
+    return_code, _ = spawn(cmds, env=env)
+    if return_code != 0:
+        sys.exit(return_code)
 
-            cmds.append([f'git submodule sync {path}'])
-            cmds.append([f'git submodule update --init --depth=1 {path}'])
 
-        return_code, _ = spawn(cmds, env=env)
-        if return_code != 0:
-            sys.exit(return_code)
-            
-            
 def find_esp32_ports(chip):
     from esptool.targets import CHIP_DEFS  # NOQA
     from esptool.util import FatalError  # NOQA
@@ -977,10 +979,7 @@ def update_panic_handler():
     if '"MPY version : "' in data:
         beg, end = data.split('"MPY version : "', 1)
         end = end.split('"\\r\\n"', 1)[1]
-        data = (
-            f'{beg}"LVGL MPY version : 1.23.0 on " '
-            f'MICROPY_BUILD_DATE MICROPY_BUILD_TYPE_PAREN "\\r\\n"{end}'
-        )
+        data = f'{beg}"LVGL MicroPython \\r\\n"{end}'
 
         write_file(PANICHANDLER_PATH, data)