feature/m5unified: Support VLW font

lbuque · lbuque · commit 3020eab7f9d1 · 2024-01-24T17:26:31.000+08:00
Signed-off-by: lbuque &lt;1102390310@qq.com&gt;
diff --git a/m5stack/components/M5Unified/M5GFX b/m5stack/components/M5Unified/M5GFX
@@ -1 +1 @@
-Subproject commit e2c5427524af488a478794fd218f69591c0f2f1f
+Subproject commit e7ec67372b2365a14ae9301bae83818d05fffc51
diff --git a/m5stack/components/M5Unified/mpy_m5gfx.cpp b/m5stack/components/M5Unified/mpy_m5gfx.cpp
@@ -90,6 +90,7 @@ mp_obj_t gfx_setColorDepth(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw
 }
 
 
+LFS2Wrapper fontWrapper;
 mp_obj_t gfx_loadFont(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
     enum {ARG_font};
     /* *FORMAT-OFF* */
@@ -104,10 +105,9 @@ mp_obj_t gfx_loadFont(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args
     bool ret = false;
     auto gfx = getGfx(&pos_args[0]);
     if (mp_obj_is_str(args[ARG_font].u_obj) && ((size_t)mp_obj_len(args[ARG_font].u_obj) < 128)) { // file
-        // TODO
-        // LFS2Wrapper fontWrapper;
-        // wrapper.open(mp_obj_str_get_str(args[ARG_font].u_obj), LFS2_O_RDONLY);
-        // gfx->loadFont((lgfx::DataWrapper *)&wrapper);
+        gfx->unloadFont();
+        fontWrapper.open(mp_obj_str_get_str(args[ARG_font].u_obj), LFS2_O_RDONLY);
+        ret = gfx->loadFont((lgfx::DataWrapper *)&fontWrapper);
     } else { // buffer
         mp_buffer_info_t bufinfo;
         mp_get_buffer_raise(args[ARG_font].u_obj, &bufinfo, MP_BUFFER_READ);
diff --git a/m5stack/fs/system/common/font/Montserrat-Medium-10.vlw b/m5stack/fs/system/common/font/Montserrat-Medium-10.vlw
diff --git a/m5stack/fs/system/common/font/Montserrat-Medium-14.vlw b/m5stack/fs/system/common/font/Montserrat-Medium-14.vlw
diff --git a/m5stack/fs/system/common/font/Montserrat-Medium-16.vlw b/m5stack/fs/system/common/font/Montserrat-Medium-16.vlw
diff --git a/m5stack/fs/system/common/font/Montserrat-Medium-18.vlw b/m5stack/fs/system/common/font/Montserrat-Medium-18.vlw
diff --git a/m5stack/modules/startup/core2/apps/dev.py b/m5stack/modules/startup/core2/apps/dev.py
@@ -3,6 +3,7 @@
 from widgets.image import Image
 from widgets.label import Label
 import uasyncio as asyncio
+
 try:
     import urequests as requests
 except ImportError:
diff --git a/m5stack/modules/startup/cores3/apps/app_list.py b/m5stack/modules/startup/cores3/apps/app_list.py
@@ -115,7 +115,7 @@ def on_view(self):
             h=36,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
         )
 
         self._label1 = Label(
@@ -126,7 +126,7 @@ def on_view(self):
             h=36,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
         )
 
         self._label2 = Label(
@@ -137,7 +137,7 @@ def on_view(self):
             h=36,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
         )
 
         self._label3 = Label(
@@ -148,7 +148,7 @@ def on_view(self):
             h=36,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
         )
         self._labels = []
         self._labels.append(self._label0)
diff --git a/m5stack/modules/startup/cores3/apps/app_run.py b/m5stack/modules/startup/cores3/apps/app_run.py
@@ -2,8 +2,9 @@
 import M5
 from widgets.label import Label
 from widgets.button import Button
-from common.font import MontserratMedium16
-from common.font import MontserratMedium18
+
+# from common.font import MontserratMedium16
+# from common.font import MontserratMedium18
 import esp32
 import sys
 import machine
@@ -40,7 +41,7 @@ def on_view(self):
             w=312,
             fg_color=0x000000,
             bg_color=0xEEEEEF,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
         )
         self._name_label.setText("main.py")
 
@@ -51,7 +52,7 @@ def on_view(self):
             w=312,
             fg_color=0x000000,
             bg_color=0xDCDDDD,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
         )
         self._mtime_label.setText(self._mtime_text)
 
@@ -62,7 +63,7 @@ def on_view(self):
             w=312,
             fg_color=0x000000,
             bg_color=0xDCDDDD,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
         )
         self._account_label.setText(self._account_text)
 
@@ -73,7 +74,7 @@ def on_view(self):
             w=312,
             fg_color=0x000000,
             bg_color=0xDCDDDD,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
         )
         self._ver_label.setText(self._ver_text)
 
diff --git a/m5stack/modules/startup/cores3/apps/dev.py b/m5stack/modules/startup/cores3/apps/dev.py
@@ -3,11 +3,12 @@
 from widgets.image import Image
 from widgets.label import Label
 import uasyncio as asyncio
+
 try:
     import urequests as requests
 except ImportError:
     import requests
-from common.font import MontserratMedium18
+# from common.font import MontserratMedium18
 import os
 import binascii
 import machine
@@ -69,7 +70,7 @@ def on_view(self):
             w=177,
             fg_color=0x000000,
             bg_color=0xEEEEEF,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
             parent=self._lcd,
         )
         self._mac_label.setText(self._mac_text)
@@ -82,7 +83,7 @@ def on_view(self):
             h=60,
             fg_color=0x000000,
             bg_color=0xEEEEEF,
-            font=MontserratMedium18.FONT,
+            font="/system/common/font/Montserrat-Medium-18.vlw",
             parent=self._lcd,
         )
         self._account_label.setText(self._account_text)
diff --git a/m5stack/modules/startup/cores3/apps/settings.py b/m5stack/modules/startup/cores3/apps/settings.py
@@ -35,7 +35,7 @@ def on_view(self):
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
             parent=self._lcd,
         )
         self._ssid_label.setLongMode(Label.LONG_DOT)
@@ -49,7 +49,7 @@ def on_view(self):
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
             parent=self._lcd,
         )
         self._psk_label.setLongMode(Label.LONG_DOT)
@@ -66,7 +66,7 @@ def on_view(self):
             font_align=Label.LEFT_ALIGNED,
             fg_color=0x000000,
             bg_color=0xFEFEFE,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
             parent=self._lcd,
         )
         self._server_label.setLongMode(Label.LONG_DOT)
diff --git a/m5stack/modules/startup/cores3/apps/status_bar.py b/m5stack/modules/startup/cores3/apps/status_bar.py
@@ -1,8 +1,9 @@
 from ..app import AppBase
 from widgets.label import Label
 from widgets.image import Image
-from common.font import MontserratMedium10
-from common.font import MontserratMedium16
+
+# from common.font import MontserratMedium10
+# from common.font import MontserratMedium16
 import time
 import M5
 import network
@@ -69,7 +70,7 @@ def on_view(self):
             font_align=Label.CENTER_ALIGNED,
             fg_color=0x534D4C,
             bg_color=0xEEEEEF,
-            font=MontserratMedium16.FONT,
+            font="/system/common/font/Montserrat-Medium-16.vlw",
         )
         self._time_label.setText(self._time_text)
 
@@ -96,7 +97,7 @@ def on_view(self):
             font_align=Label.CENTER_ALIGNED,
             fg_color=0x534D4C,
             bg_color=0xFEFEFE,
-            font=MontserratMedium10.FONT,
+            font="/system/common/font/Montserrat-Medium-10.vlw",
         )
         self._battery_label.setText(self._battery_text)
 
diff --git a/m5stack/modules/widgets/label.py b/m5stack/modules/widgets/label.py
@@ -129,7 +129,8 @@ def _load_font(self):
             self._parent.unloadFont()
             self._parent.loadFont(self._font)
         else:
-            self._parent.setFont(self._font)
+            self._parent.loadFont(self._font)
+            # self._parent.setFont(self._font)
 
     def setLongMode(self, mode):
         if mode is self.LONG_DOT:
