diff options
| author | Gabor Kiss-Vamosi <kisvegabor@gmail.com> | 2021-05-30 13:51:14 +0200 |
|---|---|---|
| committer | Gabor Kiss-Vamosi <kisvegabor@gmail.com> | 2021-05-30 13:51:14 +0200 |
| commit | b7da7c1b1a30fdad4b880d11b419c0bc638cffdf (patch) | |
| tree | 48521b104c71b957ea57f1bf461bd03794f31946 | |
| parent | 9efb99d177f9c398fef0e240134da82f64f1cc07 (diff) | |
| download | lvgl-b7da7c1b1a30fdad4b880d11b419c0bc638cffdf.tar.gz lvgl-b7da7c1b1a30fdad4b880d11b419c0bc638cffdf.zip | |
fix(font gen) revert test code
| -rwxr-xr-x | scripts/built_in_font/built_in_font_gen.py | 2 | ||||
| -rwxr-xr-x | scripts/built_in_font/generate_all.py | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/scripts/built_in_font/built_in_font_gen.py b/scripts/built_in_font/built_in_font_gen.py index fa1014b0e..ce3e0a84f 100755 --- a/scripts/built_in_font/built_in_font_gen.py +++ b/scripts/built_in_font/built_in_font_gen.py @@ -59,5 +59,5 @@ if args.subpx: subpx = "--lcd" syms = "61441,61448,61451,61452,61452,61453,61457,61459,61461,61465,61468,61473,61478,61479,61480,61502,61507,61512,61515,61516,61517,61521,61522,61523,61524,61543,61544,61550,61552,61553,61556,61559,61560,61561,61563,61587,61589,61636,61637,61639,61641,61664,61671,61674,61683,61724,61732,61787,61931,62016,62017,62018,62019,62020,62087,62099,62212,62189,62810,63426,63650" #Run the command (Add degree and bbullet symbol) -cmd = "lv_font_conv {} {} --bpp {} --size {} --font {} -r {} {} --font FontAwesome5-Solid+Brands+Regular.woff -r {} --format lvgl -o {} --force-fast-kern-format".format(subpx, compr, args.bpp, args.size, args.font, args.range[0], args.symbols[0], syms, args.output) +cmd = "lv_font_conv {} {} --bpp {} --size {} --font {} -r {} {} --font FontAwesome5-Solid+Brands+Regular.woff -r {} --format bin -o {} --force-fast-kern-format".format(subpx, compr, args.bpp, args.size, args.font, args.range[0], args.symbols[0], syms, args.output) os.system(cmd) diff --git a/scripts/built_in_font/generate_all.py b/scripts/built_in_font/generate_all.py index 8a6831221..94d4e0e5f 100755 --- a/scripts/built_in_font/generate_all.py +++ b/scripts/built_in_font/generate_all.py @@ -2,12 +2,6 @@ import os -print("\nGenerating 12 px subpx") -os.system("./built_in_font_gen.py --size 12 -o lv_font_montserrat_12_subpx.c --bpp 4 --subpx") -os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_montserrat_12_subpx.c') - -exit(1); - print("Generating 8 px") os.system("./built_in_font_gen.py --size 8 -o lv_font_montserrat_8.c --bpp 4") os.system('sed -i \'s|#include "lvgl/lvgl.h"|#include "../../lvgl.h"|\' lv_font_montserrat_8.c') |