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

# Conflicts:
#	builder/esp32.py
#	ext_mod/lcd_bus/esp32_src/rgb_bus.c

Author: kdschlosser

README.md

@@ -663,6 +663,7 @@ Compiling for ESP32
     * cmake
     * ninja-build
     * python
+    * libusb-1.0-0-dev
 
   * macOS
     * `xcode-select -–install`
@@ -1260,4 +1261,13 @@ Bit orders are a tuple of durations. The first 2 numbers define a bit as 0 and t
 | WS2812B                                                                     |           400           |         -850         |          800          |         -450         | -5000 |   GRB   |
 | SK6813                                                                      |           240           |         -800         |          740          |         -200         | -800  |   GRB   |
 
+<br>
+
+# Projects made with this Binding...
+
+-----------------------------------------------------------
+
+https://github.com/fabse-hack/temp_humidity_micropython_lvgl
+
+
 

api_drivers/common_api_drivers/display/st7789/st7789.py

@@ -1,6 +1,7 @@
 from micropython import const  # NOQA
 import display_driver_framework
 import lcd_bus
+import lvgl as lv
 
 
 STATE_HIGH = display_driver_framework.STATE_HIGH

builder/__init__.py

@@ -1,3 +1,4 @@
+import shutil
 import sys
 import os
 import subprocess
@@ -8,6 +9,106 @@
 _windows_env = None
 
 
+def scrub_build_folder():
+    for f in os.listdir('build'):
+        f = os.path.join('build', f)
+        for pattern in ('.h', 'manifest.py', '.board'):
+            if f.endswith(pattern):
+                os.remove(f)
+
+
+def revert_files(port):
+    if port in ('macOS', 'raspberry_pi'):
+        revert_files('unix')
+
+    src_path = f'micropy_updates/originals/{port}'
+
+    if port in ('raspberry_pi', 'macOS'):
+        port = 'unix'
+
+    dst_path = f'lib/micropython/ports/{port}'
+
+    if not os.path.exists(src_path) or not os.listdir(src_path):
+        return
+
+    def iter_path(src_p, dst_p):
+        for file in os.listdir(src_p):
+            src_file = os.path.join(src_p, file)
+            dst_file = os.path.join(dst_p, file)
+
+            if os.path.isdir(src_file):
+                iter_path(src_file, dst_file)
+                os.rmdir(src_file)
+            else:
+                shutil.copyfile(src_file, dst_file)
+                os.remove(src_file)
+
+    iter_path(src_path, dst_path)
+
+
+def copy_micropy_updates(port):
+
+    src_path = f'micropy_updates/{port}'
+    org_path = f'micropy_updates/originals/{port}'
+
+    if port in ('raspberry_pi', 'macOS'):
+        port = 'unix'
+
+    dst_path = f'lib/micropython/ports/{port}'
+
+    def iter_files(s_path, d_path, o_path):
+        for file in os.listdir(s_path):
+            src_file = os.path.join(s_path, file)
+            dst_file = os.path.join(d_path, file)
+            org_file = os.path.join(o_path, file)
+
+            if os.path.isdir(src_file):
+                if not os.path.exists(org_file):
+                    os.makedirs(org_file)
+
+                iter_files(src_file, dst_file, org_file)
+            else:
+                shutil.copyfile(dst_file, org_file)
+                shutil.copyfile(src_file, dst_file)
+
+    iter_files(src_path, dst_path, org_path)
+
+
+def write_file(file, data):
+    with open(file, 'wb') as f:
+        f.write(data.encode('utf-8'))
+
+
+def read_file(port, file):
+    org_path = f'micropy_updates/originals/{port}'
+
+    filepath, filename = os.path.split(file)
+
+    if port in ('raspberry_pi', 'macOS'):
+        port = 'unix'
+
+    head, tail = os.path.split(filepath)
+    save_path = []
+    while tail != port:
+        save_path.insert(0, tail)
+        head, tail = os.path.split(head)
+
+    if save_path:
+        org_path = os.path.join(org_path, *save_path)
+
+    if not os.path.exists(org_path):
+        os.makedirs(org_path)
+
+    org_file = os.path.join(org_path, filename)
+    if not os.path.exists(org_file):
+        shutil.copyfile(file, org_file)
+
+    with open(file, 'rb') as f:
+        data = f.read()
+
+    return data.decode('utf-8')
+
+
 def setup_windows_build():
 
     global _windows_env
@@ -63,13 +164,7 @@ def set_mp_version(port):
 
 
 def update_mphalport(target):
-    if target == 'esp8266':
-        mphalport_path = f'lib/micropython/ports/{target}/esp_mphal.h'
-    elif target == 'pic16bit':
-        mphalport_path = f'lib/micropython/ports/{target}/pic16bit_mphal.h'
-    elif target == 'teensy':
-        mphalport_path = f'lib/micropython/ports/{target}/teensy_hal.h'
-    elif target == 'macOS':
+    if target in ('macOS', 'raspberry_pi'):
         mphalport_path = f'lib/micropython/ports/unix/mphalport.h'
     elif target == 'windows':
         mphalport_path = f'lib/micropython/ports/{target}/windows_mphal.h'
@@ -79,18 +174,17 @@ def update_mphalport(target):
     if not os.path.exists(mphalport_path):
         raise RuntimeError(mphalport_path)
 
-    with open(mphalport_path, 'rb') as f:
-        data = f.read().decode('utf-8')
+    data = read_file(target, mphalport_path)
 
-    if '#ifndef _MPHALPORT_H_' not in data:
+    if '__MPHALPORT_H__' not in data:
         data = (
-            f'#ifndef _MPHALPORT_H_\n'
-            f'#define _MPHALPORT_H_\n'
+            f'#ifndef __MPHALPORT_H__\n'
+            f'#define __MPHALPORT_H__\n'
             f'{data}\n'
-            f'#endif /* _MPHALPORT_H_ */\n'
+            f'#endif /* __MPHALPORT_H__ */\n'
         )
-        with open(mphalport_path, 'wb') as f:
-            f.write(data.encode('utf-8'))
+
+        write_file(mphalport_path, data)
 
 
 def generate_manifest(
@@ -157,7 +251,7 @@ def generate_manifest(
     for file in indevs:
         if not os.path.exists(file):
             tmp_file = (
-                f'{script_dir}/api_drivers/common_api_drivers/indev/{file}.py'
+                f'{script_dir}/api_drivers/common_api_drivers/indev/{file.lower()}.py'
             )
 
             if not os.path.exists(tmp_file):
@@ -176,11 +270,11 @@ def generate_manifest(
             file = tmp_file
 
         directory, file_name = os.path.split(file)
-        extension_file = file_name.rsplit('.')[0] + '_extension.py'
+        extension_file = file_name.rsplit('.', 1)[0] + '_extension.py'
         extension = os.path.join(directory, extension_file)
 
         if os.path.exists(extension):
-            print(extension_file)
+            print(extension)
             entry = f"freeze('{directory}', '{extension_file}')"
             manifest_files.append(entry)
 
@@ -194,7 +288,7 @@ def generate_manifest(
     for file in displays:
         if not os.path.exists(file):
             tmp_file = (
-                f'{script_dir}/api_drivers/common_api_drivers/display/{file}'
+                f'{script_dir}/api_drivers/common_api_drivers/display/{file.lower()}'
             )
 
             if not os.path.exists(tmp_file):
@@ -205,7 +299,7 @@ def generate_manifest(
                 if not file_name.endswith('.py'):
                     continue
 
-                print(file_name)
+                print(os.path.join(tmp_file, file_name))
 
                 entry = f"freeze('{tmp_file}', '{file_name}')"
                 manifest_files.append(entry)
@@ -225,13 +319,7 @@ def generate_manifest(
 
 def get_lvgl():
     cmd_ = [
-        'git',
-        'submodule',
-        'update',
-        '--init',
-        '--depth=1',
-        '--',
-        f'lib/lvgl'
+        'git submodule update --init --depth=1 -- lib/lvgl'
     ]
     print()
     print('collecting LVGL')
@@ -244,13 +332,7 @@ def get_lvgl():
 def get_micropython():
 
     cmd_ = [
-        'git',
-        'submodule',
-        'update',
-        '--init',
-        '--depth=1',
-        '--',
-        f'lib/micropython'
+        'git submodule update --init --depth=1 -- lib/micropython',
     ]
     print()
     print('collecting MicroPython 1.23.0')