libs/m5ui: Use software timer for LVGL rendering tasks.

Signed-off-by: lbuque <[email protected]>

Author: lbuque

m5stack/cmodules/m5unified/m5unified_lvgl.c

@@ -51,11 +51,11 @@ mp_obj_t gfx_lvgl_init(mp_obj_t self) {
     #endif
 
     lv_init();
-    lvgl_timer = xTimerCreate("lvgl_timer", 10, pdTRUE, NULL, vTimerCallback);
+    // lvgl_timer = xTimerCreate("lvgl_timer", pdMS_TO_TICKS(10), pdTRUE, NULL, vTimerCallback);
 
-    if (lvgl_timer == NULL || xTimerStart(lvgl_timer, 0) != pdPASS) {
-        ESP_LOGE("LVGL", "Failed creating or starting LVGL timer!");
-    }
+    // if (lvgl_timer == NULL || xTimerStart(lvgl_timer, 0) != pdPASS) {
+    //     ESP_LOGE("LVGL", "Failed creating or starting LVGL timer!");
+    // }
     return mp_const_none;
 }
 

m5stack/libs/m5ui/__init__.py

@@ -5,6 +5,7 @@
 _attrs = {
     "init": "port",
     "deinit": "port",
+    "event_loop": "port",
     "M5Arc": "arc",
     "M5Bar": "bar",
     "M5Button": "button",

m5stack/libs/m5ui/port.py

@@ -5,10 +5,64 @@
 import lvgl as lv
 import sys
 import lv_utils
+import m5utils
+import micropython
 
 _event_loop_instance = None
 
 
+class event_loop:
+    _instance = None
+    _initialized = False
+
+    def __new__(cls, freq=33, max_scheduled=2):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    def __init__(self, freq=33, max_scheduled=2):
+        # 防止重复初始化
+        if self._initialized:
+            return
+
+        self._initialized = True
+        self.delay = 1000 // freq
+        self.timer = m5utils.Timer(
+            0, mode=m5utils.Timer.PERIODIC, period=self.delay, callback=self.timer_cb
+        )
+        self.max_scheduled = max_scheduled
+        self.scheduled = 0
+
+    def timer_cb(self, t):
+        lv.tick_inc(self.delay)
+        if self.scheduled < self.max_scheduled:
+            micropython.schedule(self.task_handler, 0)
+            self.scheduled += 1
+
+    def task_handler(self, _):
+        if lv._nesting.value == 0:
+            lv.task_handler()
+        self.scheduled -= 1
+
+    def deinit(self):
+        if hasattr(self, "timer"):
+            self.timer.deinit()
+        event_loop._initialized = False
+        event_loop._instance = None
+
+    @classmethod
+    def get_instance(cls):
+        """获取单例实例"""
+        if cls._instance is None:
+            cls._instance = cls()
+        return cls._instance
+
+    @classmethod
+    def is_initialized(cls):
+        """检查是否已经初始化"""
+        return cls._instance is not None and cls._initialized
+
+
 def _sdl_init(width=320, height=240):
     global _event_loop_instance
 
@@ -71,6 +125,8 @@ def _m5_init():
     fs_drv = lv.fs_drv_t()
     lv_utils.fs_register(fs_drv, "S", 500)
 
+    event_loop()
+
 
 def init():
     if sys.platform == "esp32":
@@ -83,6 +139,7 @@ def deinit():
     if sys.platform == "esp32":
         import M5
 
+        event_loop().deinit()
         M5.Lcd.lvgl_deinit()
         lv.mp_lv_deinit_gc()
     else:

m5stack/modules/startup/tab5/__init__.py

@@ -8,6 +8,7 @@
 import lv_utils
 from .launcher import Launcher, set_hal
 from .hal_tab5 import HALTab5
+import m5ui
 
 
 class Tab5_Startup:
@@ -50,3 +51,5 @@ def _init_lvgl(self):
 
         fs_drv = lv.fs_drv_t()
         lv_utils.fs_register(fs_drv, "S", 500)
+
+        m5ui.event_loop()  # start event loop

m5stack/modules/startup/tab5/launcher/launcher.py

@@ -19,6 +19,7 @@
 import lvgl as lv
 import asyncio
 import M5
+import m5ui
 
 
 class Launcher:
@@ -31,7 +32,7 @@ def __init__(self):
             asyncio.run(self._main())
         finally:
             print("Launcher cleanup complete")
-            M5.Lcd.lvgl_deinit()
+            m5ui.deinit()
 
     def _init_background(self):
         screen = lv.screen_active()