Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-22 15:24:16 +08:00
Code Issues Actions 49 Packages Projects Releases Wiki Activity

fix(fonts): make built-in fonts work with v9

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2022-07-07 09:05:40 +02:00
parent 27cf84637d
commit ecc8058641
27 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/font/lv_font_dejavu_16_persian_hebrew.c
+3 -3
View File
@@ -6562,7 +6562,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -6578,7 +6578,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 0,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -6589,7 +6589,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_dejavu_16_persian_hebrew = {
#else
lv_font_t lv_font_dejavu_16_persian_hebrew = {
src/font/lv_font_montserrat_10.c
+3 -3
View File
@@ -1611,7 +1611,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1627,7 +1627,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -1638,7 +1638,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_10 = {
#else
lv_font_t lv_font_montserrat_10 = {
src/font/lv_font_montserrat_12.c
+3 -3
View File
@@ -1872,7 +1872,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1888,7 +1888,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -1899,7 +1899,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_12 = {
#else
lv_font_t lv_font_montserrat_12 = {
src/font/lv_font_montserrat_12_subpx.c
+3 -3
View File
@@ -3813,7 +3813,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3829,7 +3829,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -3840,7 +3840,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_12_subpx = {
#else
lv_font_t lv_font_montserrat_12_subpx = {
src/font/lv_font_montserrat_14.c
+3 -3
View File
@@ -2148,7 +2148,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -2164,7 +2164,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -2175,7 +2175,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_14 = {
#else
lv_font_t lv_font_montserrat_14 = {
src/font/lv_font_montserrat_16.c
+3 -3
View File
@@ -2417,7 +2417,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -2433,7 +2433,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -2444,7 +2444,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_16 = {
#else
lv_font_t lv_font_montserrat_16 = {
src/font/lv_font_montserrat_18.c
+3 -3
View File
@@ -2817,7 +2817,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -2833,7 +2833,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -2844,7 +2844,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_18 = {
#else
lv_font_t lv_font_montserrat_18 = {
src/font/lv_font_montserrat_20.c
+3 -3
View File
@@ -3174,7 +3174,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3190,7 +3190,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -3201,7 +3201,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_20 = {
#else
lv_font_t lv_font_montserrat_20 = {
src/font/lv_font_montserrat_22.c
+3 -3
View File
@@ -3603,7 +3603,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3619,7 +3619,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -3630,7 +3630,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_22 = {
#else
lv_font_t lv_font_montserrat_22 = {
src/font/lv_font_montserrat_24.c
+3 -3
View File
@@ -4014,7 +4014,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -4030,7 +4030,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -4041,7 +4041,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_24 = {
#else
lv_font_t lv_font_montserrat_24 = {
src/font/lv_font_montserrat_26.c
+3 -3
View File
@@ -4549,7 +4549,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -4565,7 +4565,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -4576,7 +4576,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_26 = {
#else
lv_font_t lv_font_montserrat_26 = {
src/font/lv_font_montserrat_28.c
+3 -3
View File
@@ -5098,7 +5098,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -5114,7 +5114,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -5125,7 +5125,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_28 = {
#else
lv_font_t lv_font_montserrat_28 = {
src/font/lv_font_montserrat_28_compressed.c
+3 -3
View File
@@ -3228,7 +3228,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -3244,7 +3244,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 1,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -3255,7 +3255,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_28_compressed = {
#else
lv_font_t lv_font_montserrat_28_compressed = {
src/font/lv_font_montserrat_30.c
+3 -3
View File
@@ -5680,7 +5680,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -5696,7 +5696,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -5707,7 +5707,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_30 = {
#else
lv_font_t lv_font_montserrat_30 = {
src/font/lv_font_montserrat_32.c
+3 -3
View File
@@ -6169,7 +6169,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -6185,7 +6185,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -6196,7 +6196,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_32 = {
#else
lv_font_t lv_font_montserrat_32 = {
src/font/lv_font_montserrat_34.c
+3 -3
View File
@@ -6968,7 +6968,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -6984,7 +6984,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -6995,7 +6995,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_34 = {
#else
lv_font_t lv_font_montserrat_34 = {
src/font/lv_font_montserrat_36.c
+3 -3
View File
@@ -7612,7 +7612,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -7628,7 +7628,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -7639,7 +7639,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_36 = {
#else
lv_font_t lv_font_montserrat_36 = {
src/font/lv_font_montserrat_38.c
+3 -3
View File
@@ -8357,7 +8357,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -8373,7 +8373,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -8384,7 +8384,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_38 = {
#else
lv_font_t lv_font_montserrat_38 = {
src/font/lv_font_montserrat_40.c
+3 -3
View File
@@ -9205,7 +9205,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -9221,7 +9221,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -9232,7 +9232,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_40 = {
#else
lv_font_t lv_font_montserrat_40 = {
src/font/lv_font_montserrat_42.c
+3 -3
View File
@@ -10047,7 +10047,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -10063,7 +10063,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -10074,7 +10074,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_42 = {
#else
lv_font_t lv_font_montserrat_42 = {
src/font/lv_font_montserrat_44.c
+3 -3
View File
@@ -10873,7 +10873,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -10889,7 +10889,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -10900,7 +10900,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_44 = {
#else
lv_font_t lv_font_montserrat_44 = {
src/font/lv_font_montserrat_46.c
+3 -3
View File
@@ -11825,7 +11825,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -11841,7 +11841,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -11852,7 +11852,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_46 = {
#else
lv_font_t lv_font_montserrat_46 = {
src/font/lv_font_montserrat_48.c
+3 -3
View File
@@ -12526,7 +12526,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -12542,7 +12542,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -12553,7 +12553,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_48 = {
#else
lv_font_t lv_font_montserrat_48 = {
src/font/lv_font_montserrat_8.c
+3 -3
View File
@@ -1397,7 +1397,7 @@ static const lv_font_fmt_txt_kern_classes_t kern_classes = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -1413,7 +1413,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 1,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -1424,7 +1424,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_montserrat_8 = {
#else
lv_font_t lv_font_montserrat_8 = {
src/font/lv_font_simsun_16_cjk.c
+3 -3
View File
@@ -23729,7 +23729,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -23745,7 +23745,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 4,
.kern_classes = 0,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -23756,7 +23756,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_simsun_16_cjk = {
#else
lv_font_t lv_font_simsun_16_cjk = {
src/font/lv_font_unscii_16.c
+3 -3
View File
@@ -600,7 +600,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -616,7 +616,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -627,7 +627,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_unscii_16 = {
#else
lv_font_t lv_font_unscii_16 = {
src/font/lv_font_unscii_8.c
+3 -3
View File
@@ -436,7 +436,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] = {
* ALL CUSTOM DATA
*--------------------*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
/*Store all the custom data of the font*/
static lv_font_fmt_txt_glyph_cache_t cache;
static const lv_font_fmt_txt_dsc_t font_dsc = {
@@ -452,7 +452,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
.bpp = 1,
.kern_classes = 0,
.bitmap_format = 0,
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
.cache = &cache
#endif
};
@@ -463,7 +463,7 @@ static lv_font_fmt_txt_dsc_t font_dsc = {
*----------------*/
/*Initialize a public general font descriptor*/
#if LV_VERSION_CHECK(8, 0, 0)
#if LVGL_VERSION_MAJOR >= 8
const lv_font_t lv_font_unscii_8 = {
#else
lv_font_t lv_font_unscii_8 = {