diff --git a/src/displayapp/fonts/generate.py b/src/displayapp/fonts/generate.py index 88bdacd6..4f0e0e44 100755 --- a/src/displayapp/fonts/generate.py +++ b/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: diff --git a/src/libs/lv_conf.h b/src/libs/lv_conf.h index c23647f2..1b06e8bd 100644 --- a/src/libs/lv_conf.h +++ b/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. diff --git a/src/resources/generate-fonts.py b/src/resources/generate-fonts.py index 20408166..ba6ec44f 100755 --- a/src/resources/generate-fonts.py +++ b/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: