Merge 2b601a2303 into 8598142c27

The submodule isn't used anymore. Remove the submodule reference
completely.

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "src/libs/littlefs"]
 	path = src/libs/littlefs
 	url = https://github.com/littlefs-project/littlefs.git
-[submodule "src/libs/QCBOR"]
-	path = src/libs/QCBOR
-	url = https://github.com/laurencelundblade/QCBOR.git
 [submodule "src/libs/arduinoFFT"]
 	path = src/libs/arduinoFFT
 	url = https://github.com/kosme/arduinoFFT.git

src/displayapp/fonts/generate.py

@@ -18,8 +18,10 @@ class Source(object):
         self.symbols = d.get('symbols')
 
 
-def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, sources: typing.List[Source], compress:bool=False):
+def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, sources: typing.List[Source], compress:bool=False, subpixel:bool=False):
     args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', 'lvgl']
+    if subpixel:
+        args.append('--lcd')
     if not compress:
         args.append('--no-compress')
     for source in sources:

src/libs/QCBOR

@@ -1 +0,0 @@
-Subproject commit 56b17bf9f74096774944bcac0829adcd887d391e

src/libs/lv_conf.h

@@ -432,7 +432,7 @@ typedef void* lv_indev_drv_user_data_t;            /*Type of user data in the in
 #define LV_USE_FONT_COMPRESSED 1
 
 /* Enable subpixel rendering */
-#define LV_USE_FONT_SUBPX 0
+#define LV_USE_FONT_SUBPX 1
 #if LV_USE_FONT_SUBPX
 /* Set the pixel order of the display.
  * Important only if "subpx fonts" are used.

src/resources/generate-fonts.py

@@ -18,11 +18,13 @@ class Source(object):
         self.symbols = d.get('symbols')
 
 
-def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, format: str, sources: typing.List[Source], compress:bool=False):
+def gen_lvconv_line(lv_font_conv: str, dest: str, size: int, bpp: int, format: str, sources: typing.List[Source], compress:bool=False, subpixel: bool=False):
     if format != "lvgl" and format != "bin":
         format = "bin" if dest.lower().endswith(".bin") else "lvgl"
 
     args = [lv_font_conv, '--size', str(size), '--output', dest, '--bpp', str(bpp), '--format', format]
+    if subpixel:
+        args.append('--lcd')
     if not compress:
         args.append('--no-compress')
     for source in sources: