diff --git a/CHANGELOG.md b/CHANGELOG.md index 34acd925f1..f7e22d3374 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ ## v7.8.0 (20.10.2020) ### New features -- make DMA2D non blocking +- make DMA2D non blocking +- add unscii-16 built-in font ## v7.7.2 (Planned to 28.11.2020) ### Bugfixes diff --git a/lv_conf_template.h b/lv_conf_template.h index 325b141bb8..7e2aeb3a07 100644 --- a/lv_conf_template.h +++ b/lv_conf_template.h @@ -410,6 +410,7 @@ typedef void * lv_indev_drv_user_data_t; /*Type of user data in the i /*Pixel perfect monospace font * http://pelulamu.net/unscii/ */ #define LV_FONT_UNSCII_8 0 +#define LV_FONT_UNSCII_16 0 /* Optionally declare your custom fonts here. * You can use these fonts as default font too diff --git a/src/lv_font/lv_font.h b/src/lv_font/lv_font.h index fbfcb24073..6a72f02cff 100644 --- a/src/lv_font/lv_font.h +++ b/src/lv_font/lv_font.h @@ -24,11 +24,6 @@ extern "C" { /********************* * DEFINES *********************/ -/*Number of fractional digits in the advanced width (`adv_w`) field of `lv_font_glyph_dsc_t`*/ -#define LV_FONT_WIDTH_FRACT_DIGIT 4 - -#define LV_FONT_KERN_POSITIVE 0 -#define LV_FONT_KERN_NEGATIVE 1 /********************** * TYPEDEFS @@ -227,6 +222,10 @@ LV_FONT_DECLARE(lv_font_montserrat_12_subpx) LV_FONT_DECLARE(lv_font_unscii_8) #endif +#if LV_FONT_UNSCII_16 +LV_FONT_DECLARE(lv_font_unscii_16) +#endif + #if LV_FONT_DEJAVU_16_PERSIAN_HEBREW LV_FONT_DECLARE(lv_font_dejavu_16_persian_hebrew) #endif diff --git a/src/lv_font/lv_font_unscii_16.c b/src/lv_font/lv_font_unscii_16.c new file mode 100644 index 0000000000..1d48427f8f --- /dev/null +++ b/src/lv_font/lv_font_unscii_16.c @@ -0,0 +1,636 @@ +#include "lvgl/lvgl.h" + +/******************************************************************************* + * Size: 16 px + * Bpp: 1 + * Opts: + ******************************************************************************/ + +#ifndef LV_FONT_UNSCII_16 +#define LV_FONT_UNSCII_16 1 +#endif + +#if LV_FONT_UNSCII_16 + +/*----------------- + * BITMAPS + *----------------*/ + +/*Store the image of the glyphs*/ +static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { + /* U+20 " " */ + 0x0, + + /* U+21 "!" */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0x0, 0xff, + + /* U+22 "\"" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, + + /* U+23 "#" */ + 0x3c, 0xf0, 0xf3, 0xc3, 0xcf, 0xf, 0x3c, 0xff, + 0xff, 0xff, 0xf3, 0xcf, 0xf, 0x3c, 0xff, 0xff, + 0xff, 0xf3, 0xcf, 0xf, 0x3c, 0x3c, 0xf0, 0xf3, + 0xc0, + + /* U+24 "$" */ + 0xf, 0x0, 0xf0, 0x3f, 0xf3, 0xff, 0xf0, 0xf, + 0x0, 0x3f, 0xc3, 0xfc, 0x0, 0xf0, 0xf, 0xff, + 0xcf, 0xfc, 0xf, 0x0, 0xf0, + + /* U+25 "%" */ + 0xf0, 0x3f, 0xc0, 0xff, 0xf, 0x3c, 0x3c, 0x3, + 0xc0, 0xf, 0x0, 0xf0, 0x3, 0xc0, 0x3c, 0x3c, + 0xf0, 0xff, 0x3, 0xfc, 0xf, + + /* U+26 "&" */ + 0xf, 0xc0, 0x3f, 0x3, 0xcf, 0xf, 0x3c, 0xf, + 0xc0, 0x3f, 0x3, 0xf3, 0xcf, 0xcf, 0xf3, 0xf3, + 0xcf, 0xcf, 0xf, 0x3c, 0x3c, 0x3f, 0x3c, 0xfc, + 0xf0, + + /* U+27 "'" */ + 0x3c, 0xf3, 0xcf, 0xf3, 0xc0, + + /* U+28 "(" */ + 0xf, 0xf, 0x3c, 0x3c, 0xf0, 0xf0, 0xf0, 0xf0, + 0xf0, 0xf0, 0x3c, 0x3c, 0xf, 0xf, + + /* U+29 ")" */ + 0xf0, 0xf0, 0x3c, 0x3c, 0xf, 0xf, 0xf, 0xf, + 0xf, 0xf, 0x3c, 0x3c, 0xf0, 0xf0, + + /* U+2A "*" */ + 0x3c, 0x3c, 0x3c, 0x3c, 0xf, 0xf0, 0xf, 0xf0, + 0xff, 0xff, 0xff, 0xff, 0xf, 0xf0, 0xf, 0xf0, + 0x3c, 0x3c, 0x3c, 0x3c, + + /* U+2B "+" */ + 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xff, 0xff, + 0xff, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, + + /* U+2C "," */ + 0x3c, 0xf3, 0xcf, 0xf3, 0xc0, + + /* U+2D "-" */ + 0xff, 0xff, 0xff, + + /* U+2E "." */ + 0xff, 0xff, + + /* U+2F "/" */ + 0x0, 0xf, 0x0, 0xf, 0x0, 0x3c, 0x0, 0x3c, + 0x0, 0xf0, 0x0, 0xf0, 0x3, 0xc0, 0x3, 0xc0, + 0xf, 0x0, 0xf, 0x0, 0x3c, 0x0, 0x3c, 0x0, + 0xf0, 0x0, 0xf0, 0x0, + + /* U+30 "0" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf3, 0xff, + 0x3f, 0xfc, 0xff, 0xcf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+31 "1" */ + 0xf, 0x0, 0xf0, 0x3f, 0x3, 0xf0, 0xf, 0x0, + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xff, 0xff, 0xff, + + /* U+32 "2" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0x3, 0xc0, + 0x3c, 0xf, 0x0, 0xf0, 0x3c, 0x3, 0xc0, 0xf0, + 0xf, 0x0, 0xff, 0xff, 0xff, + + /* U+33 "3" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0x0, 0xf0, + 0xf, 0xf, 0xc0, 0xfc, 0x0, 0xf0, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+34 "4" */ + 0x3, 0xf0, 0xf, 0xc0, 0xff, 0x3, 0xfc, 0x3c, + 0xf0, 0xf3, 0xcf, 0xf, 0x3c, 0x3c, 0xff, 0xff, + 0xff, 0xf0, 0xf, 0x0, 0x3c, 0x0, 0xf0, 0x3, + 0xc0, + + /* U+35 "5" */ + 0xff, 0xff, 0xff, 0xf0, 0xf, 0x0, 0xff, 0xcf, + 0xfc, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+36 "6" */ + 0xf, 0xc0, 0xfc, 0x3c, 0x3, 0xc0, 0xf0, 0xf, + 0x0, 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+37 "7" */ + 0xff, 0xff, 0xff, 0x0, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x3, 0xc0, 0x3c, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xf, 0x0, 0xf0, + + /* U+38 "8" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+39 "9" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xf3, 0xff, 0x0, 0xf0, 0xf, 0x3, + 0xc0, 0x3c, 0x3f, 0x3, 0xf0, + + /* U+3A ":" */ + 0xff, 0xff, 0x0, 0x0, 0xff, 0xff, + + /* U+3B ";" */ + 0x3c, 0xf3, 0xcf, 0x0, 0x0, 0x0, 0x3c, 0xf3, + 0xcf, 0xf3, 0xc0, + + /* U+3C "<" */ + 0x3, 0xc0, 0xf0, 0xf0, 0x3c, 0x3c, 0xf, 0xf, + 0x3, 0xc0, 0x3c, 0xf, 0x0, 0xf0, 0x3c, 0x3, + 0xc0, 0xf0, + + /* U+3D "=" */ + 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0xff, 0xff, + 0xff, + + /* U+3E ">" */ + 0xf0, 0x3c, 0x3, 0xc0, 0xf0, 0xf, 0x3, 0xc0, + 0x3c, 0xf, 0xf, 0x3, 0xc3, 0xc0, 0xf0, 0xf0, + 0x3c, 0x0, + + /* U+3F "?" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0x0, 0xf0, + 0xf, 0x3, 0xc0, 0x3c, 0xf, 0x0, 0xf0, 0x0, + 0x0, 0x0, 0xf, 0x0, 0xf0, + + /* U+40 "@" */ + 0x3f, 0xf0, 0xff, 0xcf, 0x3, 0xfc, 0xf, 0xf3, + 0xff, 0xcf, 0xff, 0x3f, 0xfc, 0xff, 0xf3, 0xff, + 0xcf, 0xff, 0x0, 0x3c, 0x0, 0x3f, 0xf0, 0xff, + 0xc0, + + /* U+41 "A" */ + 0xf, 0x0, 0xf0, 0x3f, 0xc3, 0xfc, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xff, 0xff, 0xff, 0xf0, + 0xff, 0xf, 0xf0, 0xff, 0xf, + + /* U+42 "B" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0xff, 0xcf, 0xfc, + + /* U+43 "C" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xf, + 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+44 "D" */ + 0xff, 0xf, 0xf0, 0xf3, 0xcf, 0x3c, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf3, + 0xcf, 0x3c, 0xff, 0xf, 0xf0, + + /* U+45 "E" */ + 0xff, 0xff, 0xff, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xff, 0xcf, 0xfc, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, 0xff, 0xff, 0xff, + + /* U+46 "F" */ + 0xff, 0xff, 0xff, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xff, 0xcf, 0xfc, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, 0xf0, 0xf, 0x0, + + /* U+47 "G" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xf, + 0x0, 0xf3, 0xff, 0x3f, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xf3, 0xff, + + /* U+48 "H" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xff, 0xff, 0xff, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0xf0, 0xff, 0xf, + + /* U+49 "I" */ + 0xff, 0xff, 0xff, 0xf, 0x0, 0xf0, 0xf, 0x0, + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xff, 0xff, 0xff, + + /* U+4A "J" */ + 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+4B "K" */ + 0xf0, 0x3f, 0xc0, 0xff, 0xf, 0x3c, 0x3c, 0xf3, + 0xc3, 0xcf, 0xf, 0xf0, 0x3f, 0xc0, 0xf3, 0xc3, + 0xcf, 0xf, 0xf, 0x3c, 0x3c, 0xf0, 0x3f, 0xc0, + 0xf0, + + /* U+4C "L" */ + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, 0xff, 0xff, 0xff, + + /* U+4D "M" */ + 0xf0, 0x3f, 0xc0, 0xff, 0xcf, 0xff, 0x3f, 0xff, + 0xff, 0xff, 0xff, 0x33, 0xfc, 0xcf, 0xf0, 0x3f, + 0xc0, 0xff, 0x3, 0xfc, 0xf, 0xf0, 0x3f, 0xc0, + 0xf0, + + /* U+4E "N" */ + 0xf0, 0x3f, 0xc0, 0xff, 0xc3, 0xff, 0xf, 0xff, + 0x3f, 0xfc, 0xff, 0x3f, 0xfc, 0xff, 0xf0, 0xff, + 0xc3, 0xff, 0x3, 0xfc, 0xf, 0xf0, 0x3f, 0xc0, + 0xf0, + + /* U+4F "O" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+50 "P" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xff, 0xcf, 0xfc, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, 0xf0, 0xf, 0x0, + + /* U+51 "Q" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf3, + 0xcf, 0x3c, 0x3c, 0xf3, 0xcf, + + /* U+52 "R" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xff, 0xcf, 0xfc, 0xf3, 0xcf, 0x3c, 0xf0, + 0xff, 0xf, 0xf0, 0xff, 0xf, + + /* U+53 "S" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xf, + 0x0, 0x3f, 0xc3, 0xfc, 0x0, 0xf0, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+54 "T" */ + 0xff, 0xff, 0xff, 0xf, 0x0, 0xf0, 0xf, 0x0, + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xf, 0x0, 0xf0, + + /* U+55 "U" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+56 "V" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0x3f, + 0xc3, 0xfc, 0xf, 0x0, 0xf0, + + /* U+57 "W" */ + 0xf0, 0x3f, 0xc0, 0xff, 0x3, 0xfc, 0xf, 0xf0, + 0x3f, 0xc0, 0xff, 0x33, 0xfc, 0xcf, 0xff, 0xff, + 0xff, 0xff, 0xcf, 0xff, 0x3f, 0xf0, 0x3f, 0xc0, + 0xf0, + + /* U+58 "X" */ + 0xf0, 0xf, 0xf0, 0xf, 0x3c, 0x3c, 0x3c, 0x3c, + 0xf, 0xf0, 0xf, 0xf0, 0x3, 0xc0, 0x3, 0xc0, + 0xf, 0xf0, 0xf, 0xf0, 0x3c, 0x3c, 0x3c, 0x3c, + 0xf0, 0xf, 0xf0, 0xf, + + /* U+59 "Y" */ + 0xf0, 0xf, 0xf0, 0xf, 0x3c, 0x3c, 0x3c, 0x3c, + 0xf, 0xf0, 0xf, 0xf0, 0x3, 0xc0, 0x3, 0xc0, + 0x3, 0xc0, 0x3, 0xc0, 0x3, 0xc0, 0x3, 0xc0, + 0x3, 0xc0, 0x3, 0xc0, + + /* U+5A "Z" */ + 0xff, 0xff, 0xff, 0x0, 0xf0, 0xf, 0x3, 0xc0, + 0x3c, 0xf, 0x0, 0xf0, 0x3c, 0x3, 0xc0, 0xf0, + 0xf, 0x0, 0xff, 0xff, 0xff, + + /* U+5B "[" */ + 0xff, 0xff, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, 0xf0, + 0xf0, 0xf0, 0xf0, 0xf0, 0xff, 0xff, + + /* U+5C "\\" */ + 0xf0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0x3c, 0x0, + 0xf, 0x0, 0xf, 0x0, 0x3, 0xc0, 0x3, 0xc0, + 0x0, 0xf0, 0x0, 0xf0, 0x0, 0x3c, 0x0, 0x3c, + 0x0, 0xf, 0x0, 0xf, + + /* U+5D "]" */ + 0xff, 0xff, 0xf, 0xf, 0xf, 0xf, 0xf, 0xf, + 0xf, 0xf, 0xf, 0xf, 0xff, 0xff, + + /* U+5E "^" */ + 0x3, 0x0, 0xc, 0x0, 0xfc, 0x3, 0xf0, 0x3c, + 0xf0, 0xf3, 0xcf, 0x3, 0xfc, 0xf, + + /* U+5F "_" */ + 0xff, 0xff, 0xff, 0xff, + + /* U+60 "`" */ + 0xf0, 0xf0, 0x3c, 0x3c, 0xf, 0xf, + + /* U+61 "a" */ + 0x3f, 0xc3, 0xfc, 0x0, 0xf0, 0xf, 0x3f, 0xf3, + 0xff, 0xf0, 0xff, 0xf, 0x3f, 0xf3, 0xff, + + /* U+62 "b" */ + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xff, 0xcf, + 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0xff, 0xcf, 0xfc, + + /* U+63 "c" */ + 0x3f, 0xcf, 0xff, 0x3, 0xc0, 0xf0, 0x3c, 0xf, + 0x3, 0xc0, 0x3f, 0xcf, 0xf0, + + /* U+64 "d" */ + 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x3f, 0xf3, + 0xff, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0x3f, 0xf3, 0xff, + + /* U+65 "e" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xff, 0xff, + 0xff, 0xf0, 0xf, 0x0, 0x3f, 0xc3, 0xfc, + + /* U+66 "f" */ + 0xf, 0xc3, 0xf3, 0xc0, 0xf0, 0xff, 0xff, 0xf3, + 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0, 0xf0, 0x3c, + 0xf, 0x0, + + /* U+67 "g" */ + 0x3f, 0xf3, 0xff, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xf3, 0xff, 0x0, 0xf0, 0xf, 0xff, + 0xcf, 0xfc, + + /* U+68 "h" */ + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xff, 0xcf, + 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, + 0xff, 0xf, 0xf0, 0xff, 0xf, + + /* U+69 "i" */ + 0x3c, 0xf, 0x0, 0x0, 0x0, 0xfc, 0x3f, 0x3, + 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0, 0xf0, 0x3f, + 0xcf, 0xf0, + + /* U+6A "j" */ + 0x3, 0xc0, 0xf0, 0x0, 0x0, 0x3, 0xc0, 0xf0, + 0x3c, 0xf, 0x3, 0xc0, 0xf0, 0x3c, 0xf, 0x3, + 0xc0, 0xff, 0xf3, 0xfc, + + /* U+6B "k" */ + 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xff, + 0xf, 0xf3, 0xcf, 0x3c, 0xff, 0xf, 0xf0, 0xf3, + 0xcf, 0x3c, 0xf0, 0xff, 0xf, + + /* U+6C "l" */ + 0xfc, 0x3f, 0x3, 0xc0, 0xf0, 0x3c, 0xf, 0x3, + 0xc0, 0xf0, 0x3c, 0xf, 0x3, 0xc0, 0xf0, 0x3f, + 0xcf, 0xf0, + + /* U+6D "m" */ + 0xf0, 0xf3, 0xc3, 0xcf, 0xff, 0xff, 0xff, 0xf3, + 0x3f, 0xcc, 0xff, 0x33, 0xfc, 0xcf, 0xf0, 0x3f, + 0xc0, 0xf0, + + /* U+6E "n" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, + + /* U+6F "o" */ + 0x3f, 0xc3, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0x3f, 0xc3, 0xfc, + + /* U+70 "p" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xff, 0xcf, 0xfc, 0xf0, 0xf, 0x0, 0xf0, + 0xf, 0x0, + + /* U+71 "q" */ + 0x3f, 0xf3, 0xff, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xf3, 0xff, 0x0, 0xf0, 0xf, 0x0, + 0xf0, 0xf, + + /* U+72 "r" */ + 0xff, 0xcf, 0xfc, 0xf0, 0xff, 0xf, 0xf0, 0xf, + 0x0, 0xf0, 0xf, 0x0, 0xf0, 0xf, 0x0, + + /* U+73 "s" */ + 0x3f, 0xf3, 0xff, 0xf0, 0xf, 0x0, 0x3f, 0xc3, + 0xfc, 0x0, 0xf0, 0xf, 0xff, 0xcf, 0xfc, + + /* U+74 "t" */ + 0x3c, 0x3, 0xc0, 0x3c, 0x3, 0xc0, 0xff, 0xff, + 0xff, 0x3c, 0x3, 0xc0, 0x3c, 0x3, 0xc0, 0x3c, + 0x3, 0xc0, 0xf, 0xf0, 0xff, + + /* U+75 "u" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0xf0, 0xff, 0xf, 0x3f, 0xf3, 0xff, + + /* U+76 "v" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xc3, 0xfc, 0xf, 0x0, 0xf0, + + /* U+77 "w" */ + 0xf0, 0x3f, 0xc0, 0xff, 0x3, 0xfc, 0xf, 0xf3, + 0x3f, 0xcc, 0xf3, 0xff, 0xf, 0xfc, 0x3c, 0xf0, + 0xf3, 0xc0, + + /* U+78 "x" */ + 0xf0, 0x3f, 0xc0, 0xf3, 0xcf, 0xf, 0x3c, 0xf, + 0xc0, 0x3f, 0x3, 0xcf, 0xf, 0x3c, 0xf0, 0x3f, + 0xc0, 0xf0, + + /* U+79 "y" */ + 0xf0, 0xff, 0xf, 0xf0, 0xff, 0xf, 0xf0, 0xff, + 0xf, 0x3f, 0xf3, 0xff, 0x0, 0xf0, 0xf, 0x3f, + 0xc3, 0xfc, + + /* U+7A "z" */ + 0xff, 0xff, 0xff, 0x3, 0xc0, 0x3c, 0xf, 0x0, + 0xf0, 0x3c, 0x3, 0xc0, 0xff, 0xff, 0xff, + + /* U+7B "{" */ + 0x3, 0xf0, 0x3f, 0xf, 0x0, 0xf0, 0xf, 0x0, + 0xf0, 0xfc, 0xf, 0xc0, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0x3, 0xf0, 0x3f, + + /* U+7C "|" */ + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + + /* U+7D "}" */ + 0xfc, 0xf, 0xc0, 0xf, 0x0, 0xf0, 0xf, 0x0, + 0xf0, 0x3, 0xf0, 0x3f, 0xf, 0x0, 0xf0, 0xf, + 0x0, 0xf0, 0xfc, 0xf, 0xc0, + + /* U+7E "~" */ + 0x3f, 0x3c, 0xfc, 0xff, 0x3f, 0x3c, 0xfc, + + /* U+7F "" */ + 0xf0, 0x3, 0xc0, 0xc, 0xc0, 0x33, 0x0, 0xcc, + 0xff, 0x33, 0xfc, 0xc3, 0x33, 0xc, 0xf0, 0x33, + 0xc0, 0xc0, 0x3, 0x0, 0xc, 0x0, 0x30, 0x0, + 0xc0 +}; + + +/*--------------------- + * GLYPH DESCRIPTION + *--------------------*/ + +static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { + {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */, + {.bitmap_index = 0, .adv_w = 256, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 16}, + {.bitmap_index = 1, .adv_w = 256, .box_w = 4, .box_h = 14, .ofs_x = 6, .ofs_y = 2}, + {.bitmap_index = 8, .adv_w = 256, .box_w = 12, .box_h = 6, .ofs_x = 2, .ofs_y = 10}, + {.bitmap_index = 17, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 42, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 63, .adv_w = 256, .box_w = 14, .box_h = 12, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 84, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 109, .adv_w = 256, .box_w = 6, .box_h = 6, .ofs_x = 4, .ofs_y = 10}, + {.bitmap_index = 114, .adv_w = 256, .box_w = 8, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 128, .adv_w = 256, .box_w = 8, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 142, .adv_w = 256, .box_w = 16, .box_h = 10, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 162, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 4}, + {.bitmap_index = 177, .adv_w = 256, .box_w = 6, .box_h = 6, .ofs_x = 4, .ofs_y = 0}, + {.bitmap_index = 182, .adv_w = 256, .box_w = 12, .box_h = 2, .ofs_x = 2, .ofs_y = 8}, + {.bitmap_index = 185, .adv_w = 256, .box_w = 4, .box_h = 4, .ofs_x = 6, .ofs_y = 2}, + {.bitmap_index = 187, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 215, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 236, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 257, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 278, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 299, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 324, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 345, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 366, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 387, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 408, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 429, .adv_w = 256, .box_w = 4, .box_h = 12, .ofs_x = 6, .ofs_y = 2}, + {.bitmap_index = 435, .adv_w = 256, .box_w = 6, .box_h = 14, .ofs_x = 4, .ofs_y = 0}, + {.bitmap_index = 446, .adv_w = 256, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 464, .adv_w = 256, .box_w = 12, .box_h = 6, .ofs_x = 2, .ofs_y = 6}, + {.bitmap_index = 473, .adv_w = 256, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 491, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 512, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 537, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 558, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 579, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 600, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 621, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 642, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 663, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 684, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 705, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 726, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 747, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 772, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 793, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 818, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 843, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 864, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 885, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 906, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 927, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 948, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 969, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 990, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1011, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1036, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1064, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1092, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1113, .adv_w = 256, .box_w = 8, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 1127, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1155, .adv_w = 256, .box_w = 8, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 1169, .adv_w = 256, .box_w = 14, .box_h = 8, .ofs_x = 0, .ofs_y = 8}, + {.bitmap_index = 1183, .adv_w = 256, .box_w = 16, .box_h = 2, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 1187, .adv_w = 256, .box_w = 8, .box_h = 6, .ofs_x = 6, .ofs_y = 10}, + {.bitmap_index = 1193, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1208, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1229, .adv_w = 256, .box_w = 10, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1242, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1263, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1278, .adv_w = 256, .box_w = 10, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1296, .adv_w = 256, .box_w = 12, .box_h = 12, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 1314, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1335, .adv_w = 256, .box_w = 10, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 1353, .adv_w = 256, .box_w = 10, .box_h = 16, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 1373, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1394, .adv_w = 256, .box_w = 10, .box_h = 14, .ofs_x = 4, .ofs_y = 2}, + {.bitmap_index = 1412, .adv_w = 256, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1430, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1445, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1460, .adv_w = 256, .box_w = 12, .box_h = 12, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 1478, .adv_w = 256, .box_w = 12, .box_h = 12, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 1496, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1511, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1526, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1547, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1562, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1577, .adv_w = 256, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1595, .adv_w = 256, .box_w = 14, .box_h = 10, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 1613, .adv_w = 256, .box_w = 12, .box_h = 12, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 1631, .adv_w = 256, .box_w = 12, .box_h = 10, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1646, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1667, .adv_w = 256, .box_w = 4, .box_h = 14, .ofs_x = 6, .ofs_y = 2}, + {.bitmap_index = 1674, .adv_w = 256, .box_w = 12, .box_h = 14, .ofs_x = 2, .ofs_y = 2}, + {.bitmap_index = 1695, .adv_w = 256, .box_w = 14, .box_h = 4, .ofs_x = 0, .ofs_y = 12}, + {.bitmap_index = 1702, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 0, .ofs_y = 2} +}; + +/*--------------------- + * CHARACTER MAPPING + *--------------------*/ + + + +/*Collect the unicode lists and glyph_id offsets*/ +static const lv_font_fmt_txt_cmap_t cmaps[] = +{ + { + .range_start = 32, .range_length = 96, .glyph_id_start = 1, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY + } +}; + + + +/*-------------------- + * ALL CUSTOM DATA + *--------------------*/ + +/*Store all the custom data of the font*/ +static lv_font_fmt_txt_dsc_t font_dsc = { + .glyph_bitmap = gylph_bitmap, + .glyph_dsc = glyph_dsc, + .cmaps = cmaps, + .kern_dsc = NULL, + .kern_scale = 0, + .cmap_num = 1, + .bpp = 1, + .kern_classes = 0, + .bitmap_format = 0 +}; + + +/*----------------- + * PUBLIC FONT + *----------------*/ + +/*Initialize a public general font descriptor*/ +lv_font_t lv_font_unscii_16 = { + .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ + .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ + .line_height = 17, /*The maximum line height required by the font*/ + .base_line = 0, /*Baseline measured from the bottom of the line*/ +#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) + .subpx = LV_FONT_SUBPX_NONE, +#endif +#if LV_VERSION_CHECK(7, 4, 0) + .underline_position = 0, + .underline_thickness = 0, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ +}; + + + +#endif /*#if LV_FONT_UNSCII_16*/ diff --git a/src/lv_font/lv_font_unscii_8.c b/src/lv_font/lv_font_unscii_8.c index 949bc26337..b08fb00900 100644 --- a/src/lv_font/lv_font_unscii_8.c +++ b/src/lv_font/lv_font_unscii_8.c @@ -7,7 +7,7 @@ ******************************************************************************/ #ifndef LV_FONT_UNSCII_8 - #define LV_FONT_UNSCII_8 1 +#define LV_FONT_UNSCII_8 1 #endif #if LV_FONT_UNSCII_8 @@ -19,288 +19,289 @@ /*Store the image of the glyphs*/ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { /* U+20 " " */ + 0x0, /* U+21 "!" */ - 0xf2, + 0xff, 0xcc, /* U+22 "\"" */ - 0x99, 0x90, + 0xcf, 0x3c, 0xc0, /* U+23 "#" */ - 0x49, 0x2f, 0xd2, 0xfd, 0x24, 0x80, + 0x6c, 0xdb, 0xfb, 0x6f, 0xed, 0x9b, 0x0, /* U+24 "$" */ - 0x23, 0xe8, 0xe2, 0xf8, 0x80, + 0x31, 0xfc, 0x1e, 0xf, 0xe3, 0x0, /* U+25 "%" */ - 0xc7, 0x21, 0x8, 0x4e, 0x30, + 0xc7, 0x98, 0x61, 0x86, 0x78, 0xc0, /* U+26 "&" */ - 0x62, 0x49, 0x18, 0x96, 0x27, 0x40, + 0x38, 0xd8, 0xe3, 0xbd, 0xd9, 0x9d, 0x80, /* U+27 "'" */ - 0x2a, 0x0, + 0x6f, 0x0, /* U+28 "(" */ - 0x2a, 0x48, 0x88, + 0x36, 0xcc, 0xc6, 0x30, /* U+29 ")" */ - 0x88, 0x92, 0xa0, + 0xc6, 0x33, 0x36, 0xc0, /* U+2A "*" */ - 0x25, 0x5c, 0x47, 0x54, 0x80, + 0x66, 0x3c, 0xff, 0x3c, 0x66, /* U+2B "+" */ - 0x21, 0x3e, 0x42, 0x0, + 0x30, 0xcf, 0xcc, 0x30, /* U+2C "," */ - 0x58, + 0x6f, 0x0, /* U+2D "-" */ - 0xf8, + 0xfc, /* U+2E "." */ - 0x80, + 0xf0, /* U+2F "/" */ - 0x2, 0x8, 0x20, 0x82, 0x8, 0x20, 0x0, + 0x3, 0x6, 0xc, 0x18, 0x30, 0x60, 0xc0, /* U+30 "0" */ - 0x74, 0x67, 0x5c, 0xc5, 0xc0, + 0x7b, 0x3d, 0xfb, 0xcf, 0x37, 0x80, /* U+31 "1" */ - 0x23, 0x28, 0x42, 0x13, 0xe0, + 0x31, 0xc3, 0xc, 0x30, 0xcf, 0xc0, /* U+32 "2" */ - 0x74, 0x42, 0x26, 0x43, 0xe0, + 0x7b, 0x31, 0x8c, 0x63, 0xf, 0xc0, /* U+33 "3" */ - 0x74, 0x42, 0x60, 0xc5, 0xc0, + 0x7b, 0x30, 0xce, 0xf, 0x37, 0x80, /* U+34 "4" */ - 0x11, 0x95, 0x2f, 0x88, 0x40, + 0x1c, 0x79, 0xb6, 0x6f, 0xe1, 0x83, 0x0, /* U+35 "5" */ - 0xfc, 0x3c, 0x10, 0xc5, 0xc0, + 0xff, 0xf, 0x83, 0xf, 0x37, 0x80, /* U+36 "6" */ - 0x3a, 0x21, 0xe8, 0xc5, 0xc0, + 0x39, 0x8c, 0x3e, 0xcf, 0x37, 0x80, /* U+37 "7" */ - 0xf8, 0x44, 0x44, 0x21, 0x0, + 0xfc, 0x30, 0xc6, 0x30, 0xc3, 0x0, /* U+38 "8" */ - 0x74, 0x62, 0xe8, 0xc5, 0xc0, + 0x7b, 0x3c, 0xde, 0xcf, 0x37, 0x80, /* U+39 "9" */ - 0x74, 0x62, 0xf0, 0x8b, 0x80, + 0x7b, 0x3c, 0xdf, 0xc, 0x67, 0x0, /* U+3A ":" */ - 0x90, + 0xf0, 0xf0, /* U+3B ";" */ - 0x41, 0x60, + 0x6c, 0x6, 0xf0, /* U+3C "<" */ - 0x12, 0x48, 0x42, 0x10, + 0x19, 0x99, 0x86, 0x18, 0x60, /* U+3D "=" */ - 0xf8, 0x3e, + 0xfc, 0xf, 0xc0, /* U+3E ">" */ - 0x84, 0x21, 0x24, 0x80, + 0xc3, 0xc, 0x33, 0x33, 0x0, /* U+3F "?" */ - 0x7a, 0x10, 0x84, 0x10, 0x1, 0x0, + 0x7b, 0x30, 0xc6, 0x30, 0x3, 0x0, /* U+40 "@" */ - 0x7a, 0x19, 0x6b, 0x9a, 0x7, 0x80, + 0x7d, 0x8f, 0x7e, 0xfd, 0xf8, 0x1f, 0x0, /* U+41 "A" */ - 0x31, 0x28, 0x7f, 0x86, 0x18, 0x40, + 0x31, 0xec, 0xf3, 0xff, 0x3c, 0xc0, /* U+42 "B" */ - 0xfa, 0x18, 0x7e, 0x86, 0x1f, 0x80, + 0xfb, 0x3c, 0xfe, 0xcf, 0x3f, 0x80, /* U+43 "C" */ - 0x7a, 0x18, 0x20, 0x82, 0x17, 0x80, + 0x7b, 0x3c, 0x30, 0xc3, 0x37, 0x80, /* U+44 "D" */ - 0xf2, 0x28, 0x61, 0x86, 0x2f, 0x0, + 0xf3, 0x6c, 0xf3, 0xcf, 0x6f, 0x0, /* U+45 "E" */ - 0xfe, 0x8, 0x3c, 0x82, 0xf, 0xc0, + 0xff, 0xc, 0x3e, 0xc3, 0xf, 0xc0, /* U+46 "F" */ - 0xfe, 0x8, 0x3c, 0x82, 0x8, 0x0, + 0xff, 0xc, 0x3e, 0xc3, 0xc, 0x0, /* U+47 "G" */ - 0x7a, 0x18, 0x27, 0x86, 0x17, 0x80, + 0x7b, 0x3c, 0x37, 0xcf, 0x37, 0xc0, /* U+48 "H" */ - 0x86, 0x18, 0x7f, 0x86, 0x18, 0x40, + 0xcf, 0x3c, 0xff, 0xcf, 0x3c, 0xc0, /* U+49 "I" */ - 0xe9, 0x24, 0xb8, + 0xfc, 0xc3, 0xc, 0x30, 0xcf, 0xc0, /* U+4A "J" */ - 0x8, 0x42, 0x10, 0xc5, 0xc0, + 0xc, 0x30, 0xc3, 0xf, 0x37, 0x80, /* U+4B "K" */ - 0x86, 0x29, 0x38, 0x92, 0x28, 0x40, + 0xc7, 0x9b, 0x67, 0x8d, 0x99, 0xb1, 0x80, /* U+4C "L" */ - 0x82, 0x8, 0x20, 0x82, 0xf, 0xc0, + 0xc3, 0xc, 0x30, 0xc3, 0xf, 0xc0, /* U+4D "M" */ - 0x87, 0x3b, 0x61, 0x86, 0x18, 0x40, + 0xc7, 0xdf, 0xfe, 0xbc, 0x78, 0xf1, 0x80, /* U+4E "N" */ - 0x87, 0x1a, 0x65, 0x8e, 0x18, 0x40, + 0xc7, 0xcf, 0xde, 0xfc, 0xf8, 0xf1, 0x80, /* U+4F "O" */ - 0x7a, 0x18, 0x61, 0x86, 0x17, 0x80, + 0x7b, 0x3c, 0xf3, 0xcf, 0x37, 0x80, /* U+50 "P" */ - 0xfa, 0x18, 0x7e, 0x82, 0x8, 0x0, + 0xfb, 0x3c, 0xfe, 0xc3, 0xc, 0x0, /* U+51 "Q" */ - 0x7a, 0x18, 0x61, 0x96, 0x27, 0x40, + 0x7b, 0x3c, 0xf3, 0xcf, 0x66, 0xc0, /* U+52 "R" */ - 0xfa, 0x18, 0x7e, 0x92, 0x28, 0x40, + 0xfb, 0x3c, 0xfe, 0xdb, 0x3c, 0xc0, /* U+53 "S" */ - 0x7a, 0x18, 0x1e, 0x6, 0x17, 0x80, + 0x7b, 0x3c, 0x1e, 0xf, 0x37, 0x80, /* U+54 "T" */ - 0xf9, 0x8, 0x42, 0x10, 0x80, + 0xfc, 0xc3, 0xc, 0x30, 0xc3, 0x0, /* U+55 "U" */ - 0x86, 0x18, 0x61, 0x86, 0x17, 0x80, + 0xcf, 0x3c, 0xf3, 0xcf, 0x37, 0x80, /* U+56 "V" */ - 0x86, 0x18, 0x61, 0x85, 0x23, 0x0, + 0xcf, 0x3c, 0xf3, 0xcd, 0xe3, 0x0, /* U+57 "W" */ - 0x86, 0x18, 0x61, 0xb7, 0x38, 0x40, + 0xc7, 0x8f, 0x1e, 0xbf, 0xfd, 0xf1, 0x80, /* U+58 "X" */ - 0x86, 0x14, 0x8c, 0x4a, 0x18, 0x40, + 0xc3, 0x66, 0x3c, 0x18, 0x3c, 0x66, 0xc3, /* U+59 "Y" */ - 0x8c, 0x62, 0xe2, 0x10, 0x80, + 0xc3, 0x66, 0x3c, 0x18, 0x18, 0x18, 0x18, /* U+5A "Z" */ - 0xf8, 0x44, 0x44, 0x43, 0xe0, + 0xfc, 0x31, 0x8c, 0x63, 0xf, 0xc0, /* U+5B "[" */ - 0xf2, 0x49, 0x38, + 0xfc, 0xcc, 0xcc, 0xf0, /* U+5C "\\" */ - 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, + 0xc0, 0x60, 0x30, 0x18, 0xc, 0x6, 0x3, /* U+5D "]" */ - 0xe4, 0x92, 0x78, + 0xf3, 0x33, 0x33, 0xf0, /* U+5E "^" */ - 0x22, 0xa2, + 0x10, 0x71, 0xb6, 0x30, /* U+5F "_" */ - 0xf8, - - /* U+60 "`" */ - 0x88, 0x80, - - /* U+61 "a" */ - 0x70, 0x5f, 0x17, 0x80, - - /* U+62 "b" */ - 0x84, 0x3d, 0x18, 0xc7, 0xc0, - - /* U+63 "c" */ - 0x74, 0x61, 0x17, 0x0, - - /* U+64 "d" */ - 0x8, 0x5f, 0x18, 0xc5, 0xe0, - - /* U+65 "e" */ - 0x74, 0x7f, 0x7, 0x0, - - /* U+66 "f" */ - 0x18, 0x92, 0x3e, 0x20, 0x82, 0x0, - - /* U+67 "g" */ - 0x7c, 0x62, 0xf0, 0xb8, - - /* U+68 "h" */ - 0x84, 0x3d, 0x18, 0xc6, 0x20, - - /* U+69 "i" */ - 0x43, 0x24, 0xb8, - - /* U+6A "j" */ - 0x10, 0x31, 0x11, 0x96, - - /* U+6B "k" */ - 0x84, 0x23, 0x2e, 0x4a, 0x20, - - /* U+6C "l" */ - 0xc9, 0x24, 0xb8, - - /* U+6D "m" */ - 0xd5, 0x6b, 0x5a, 0x80, - - /* U+6E "n" */ - 0xf4, 0x63, 0x18, 0x80, - - /* U+6F "o" */ - 0x74, 0x63, 0x17, 0x0, - - /* U+70 "p" */ - 0xf4, 0x63, 0xe8, 0x40, - - /* U+71 "q" */ - 0x7c, 0x62, 0xf0, 0x84, - - /* U+72 "r" */ - 0xbe, 0x21, 0x8, 0x0, - - /* U+73 "s" */ - 0x7c, 0x1c, 0x1f, 0x0, - - /* U+74 "t" */ - 0x42, 0x3c, 0x84, 0x24, 0xc0, - - /* U+75 "u" */ - 0x8c, 0x63, 0x17, 0x0, - - /* U+76 "v" */ - 0x8c, 0x62, 0xa2, 0x0, - - /* U+77 "w" */ - 0x8d, 0x6b, 0x55, 0x0, - - /* U+78 "x" */ - 0x8a, 0x88, 0xa8, 0x80, - - /* U+79 "y" */ - 0x8c, 0x62, 0xf0, 0xb8, - - /* U+7A "z" */ - 0xf8, 0x88, 0x8f, 0x80, - - /* U+7B "{" */ - 0x34, 0x48, 0x44, 0x30, - - /* U+7C "|" */ 0xff, + /* U+60 "`" */ + 0xc6, 0x30, + + /* U+61 "a" */ + 0x78, 0x37, 0xf3, 0x7c, + + /* U+62 "b" */ + 0xc3, 0xf, 0xb3, 0xcf, 0x3f, 0x80, + + /* U+63 "c" */ + 0x7e, 0x31, 0x87, 0x80, + + /* U+64 "d" */ + 0xc, 0x37, 0xf3, 0xcf, 0x37, 0xc0, + + /* U+65 "e" */ + 0x7b, 0x3f, 0xf0, 0x78, + + /* U+66 "f" */ + 0x3b, 0x3e, 0xc6, 0x31, 0x80, + + /* U+67 "g" */ + 0x7f, 0x3c, 0xdf, 0xf, 0xe0, + + /* U+68 "h" */ + 0xc3, 0xf, 0xb3, 0xcf, 0x3c, 0xc0, + + /* U+69 "i" */ + 0x60, 0x38, 0xc6, 0x31, 0xe0, + + /* U+6A "j" */ + 0x18, 0x6, 0x31, 0x8c, 0x7e, + + /* U+6B "k" */ + 0xc3, 0xc, 0xf6, 0xf3, 0x6c, 0xc0, + + /* U+6C "l" */ + 0xe3, 0x18, 0xc6, 0x31, 0xe0, + + /* U+6D "m" */ + 0xcd, 0xff, 0x5e, 0xbc, 0x60, + + /* U+6E "n" */ + 0xfb, 0x3c, 0xf3, 0xcc, + + /* U+6F "o" */ + 0x7b, 0x3c, 0xf3, 0x78, + + /* U+70 "p" */ + 0xfb, 0x3c, 0xfe, 0xc3, 0x0, + + /* U+71 "q" */ + 0x7f, 0x3c, 0xdf, 0xc, 0x30, + + /* U+72 "r" */ + 0xfb, 0x3c, 0x30, 0xc0, + + /* U+73 "s" */ + 0x7f, 0x7, 0x83, 0xf8, + + /* U+74 "t" */ + 0x61, 0x8f, 0xd8, 0x61, 0x83, 0xc0, + + /* U+75 "u" */ + 0xcf, 0x3c, 0xf3, 0x7c, + + /* U+76 "v" */ + 0xcf, 0x3c, 0xde, 0x30, + + /* U+77 "w" */ + 0xc7, 0x8f, 0x5b, 0xe6, 0xc0, + + /* U+78 "x" */ + 0xc6, 0xd8, 0xe3, 0x6c, 0x60, + + /* U+79 "y" */ + 0xcf, 0x3c, 0xdf, 0xd, 0xe0, + + /* U+7A "z" */ + 0xfc, 0x63, 0x18, 0xfc, + + /* U+7B "{" */ + 0x1c, 0xc3, 0x38, 0x30, 0xc1, 0xc0, + + /* U+7C "|" */ + 0xff, 0xfc, + /* U+7D "}" */ - 0xc2, 0x21, 0x22, 0xc0, + 0xe0, 0xc3, 0x7, 0x30, 0xce, 0x0, /* U+7E "~" */ - 0x45, 0x44, + 0x77, 0xb8, /* U+7F "" */ 0xc1, 0x42, 0xbd, 0x2c, 0x40, 0x81, 0x0 @@ -312,103 +313,103 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t gylph_bitmap[] = { *--------------------*/ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { - {.bitmap_index = 0, .adv_w = 0, .box_h = 0, .box_w = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */, - {.bitmap_index = 0, .adv_w = 128, .box_h = 0, .box_w = 0, .ofs_x = 0, .ofs_y = 0}, - {.bitmap_index = 0, .adv_w = 128, .box_h = 7, .box_w = 1, .ofs_x = 3, .ofs_y = -1}, - {.bitmap_index = 1, .adv_w = 128, .box_h = 3, .box_w = 4, .ofs_x = 2, .ofs_y = 3}, - {.bitmap_index = 3, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 9, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 14, .adv_w = 128, .box_h = 6, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 19, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 25, .adv_w = 128, .box_h = 3, .box_w = 3, .ofs_x = 2, .ofs_y = 3}, - {.bitmap_index = 27, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 30, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 33, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 38, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = 0}, - {.bitmap_index = 42, .adv_w = 128, .box_h = 3, .box_w = 2, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 43, .adv_w = 128, .box_h = 1, .box_w = 5, .ofs_x = 1, .ofs_y = 1}, - {.bitmap_index = 44, .adv_w = 128, .box_h = 1, .box_w = 1, .ofs_x = 3, .ofs_y = -1}, - {.bitmap_index = 45, .adv_w = 128, .box_h = 7, .box_w = 7, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 52, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 57, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 62, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 67, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 72, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 77, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 82, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 87, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 92, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 97, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 102, .adv_w = 128, .box_h = 4, .box_w = 1, .ofs_x = 3, .ofs_y = 0}, - {.bitmap_index = 103, .adv_w = 128, .box_h = 6, .box_w = 2, .ofs_x = 2, .ofs_y = -2}, - {.bitmap_index = 105, .adv_w = 128, .box_h = 7, .box_w = 4, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 109, .adv_w = 128, .box_h = 3, .box_w = 5, .ofs_x = 1, .ofs_y = 1}, - {.bitmap_index = 111, .adv_w = 128, .box_h = 7, .box_w = 4, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 115, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 121, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 127, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 133, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 139, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 145, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 151, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 157, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 163, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 169, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 175, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 178, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 183, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 189, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 195, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 201, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 207, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 213, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 219, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 225, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 231, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 237, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 242, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 248, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 254, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 260, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 266, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 271, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 276, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 279, .adv_w = 128, .box_h = 7, .box_w = 7, .ofs_x = 0, .ofs_y = -1}, - {.bitmap_index = 286, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 289, .adv_w = 128, .box_h = 3, .box_w = 5, .ofs_x = 1, .ofs_y = 3}, - {.bitmap_index = 291, .adv_w = 128, .box_h = 1, .box_w = 5, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 292, .adv_w = 128, .box_h = 3, .box_w = 3, .ofs_x = 2, .ofs_y = 3}, - {.bitmap_index = 294, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 298, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 303, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 307, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 312, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 316, .adv_w = 128, .box_h = 7, .box_w = 6, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 322, .adv_w = 128, .box_h = 6, .box_w = 5, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 326, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 331, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 334, .adv_w = 128, .box_h = 8, .box_w = 4, .ofs_x = 2, .ofs_y = -2}, - {.bitmap_index = 338, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 343, .adv_w = 128, .box_h = 7, .box_w = 3, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 346, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 350, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 354, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 358, .adv_w = 128, .box_h = 6, .box_w = 5, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 362, .adv_w = 128, .box_h = 6, .box_w = 5, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 366, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 370, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 374, .adv_w = 128, .box_h = 7, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 379, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 383, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 387, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 391, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 395, .adv_w = 128, .box_h = 6, .box_w = 5, .ofs_x = 1, .ofs_y = -2}, - {.bitmap_index = 399, .adv_w = 128, .box_h = 5, .box_w = 5, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 403, .adv_w = 128, .box_h = 7, .box_w = 4, .ofs_x = 1, .ofs_y = -1}, - {.bitmap_index = 407, .adv_w = 128, .box_h = 8, .box_w = 1, .ofs_x = 3, .ofs_y = -2}, - {.bitmap_index = 408, .adv_w = 128, .box_h = 7, .box_w = 4, .ofs_x = 2, .ofs_y = -1}, - {.bitmap_index = 412, .adv_w = 128, .box_h = 3, .box_w = 5, .ofs_x = 1, .ofs_y = 3}, - {.bitmap_index = 414, .adv_w = 128, .box_h = 7, .box_w = 7, .ofs_x = 0, .ofs_y = -1} + {.bitmap_index = 0, .adv_w = 0, .box_w = 0, .box_h = 0, .ofs_x = 0, .ofs_y = 0} /* id = 0 reserved */, + {.bitmap_index = 0, .adv_w = 128, .box_w = 1, .box_h = 1, .ofs_x = 0, .ofs_y = 8}, + {.bitmap_index = 1, .adv_w = 128, .box_w = 2, .box_h = 7, .ofs_x = 3, .ofs_y = 1}, + {.bitmap_index = 3, .adv_w = 128, .box_w = 6, .box_h = 3, .ofs_x = 1, .ofs_y = 5}, + {.bitmap_index = 6, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 13, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 19, .adv_w = 128, .box_w = 7, .box_h = 6, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 25, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 32, .adv_w = 128, .box_w = 3, .box_h = 3, .ofs_x = 2, .ofs_y = 5}, + {.bitmap_index = 34, .adv_w = 128, .box_w = 4, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 38, .adv_w = 128, .box_w = 4, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 42, .adv_w = 128, .box_w = 8, .box_h = 5, .ofs_x = 0, .ofs_y = 2}, + {.bitmap_index = 47, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 2}, + {.bitmap_index = 51, .adv_w = 128, .box_w = 3, .box_h = 3, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 53, .adv_w = 128, .box_w = 6, .box_h = 1, .ofs_x = 1, .ofs_y = 4}, + {.bitmap_index = 54, .adv_w = 128, .box_w = 2, .box_h = 2, .ofs_x = 3, .ofs_y = 1}, + {.bitmap_index = 55, .adv_w = 128, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 62, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 68, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 74, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 80, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 86, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 93, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 99, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 105, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 111, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 117, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 123, .adv_w = 128, .box_w = 2, .box_h = 6, .ofs_x = 3, .ofs_y = 1}, + {.bitmap_index = 125, .adv_w = 128, .box_w = 3, .box_h = 7, .ofs_x = 2, .ofs_y = 0}, + {.bitmap_index = 128, .adv_w = 128, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 133, .adv_w = 128, .box_w = 6, .box_h = 3, .ofs_x = 1, .ofs_y = 3}, + {.bitmap_index = 136, .adv_w = 128, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 141, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 147, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 154, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 160, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 166, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 172, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 178, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 184, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 190, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 196, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 202, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 208, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 214, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 221, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 227, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 234, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 241, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 247, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 253, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 259, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 265, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 271, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 277, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 283, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 289, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 296, .adv_w = 128, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 303, .adv_w = 128, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 310, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 316, .adv_w = 128, .box_w = 4, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 320, .adv_w = 128, .box_w = 8, .box_h = 7, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 327, .adv_w = 128, .box_w = 4, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 331, .adv_w = 128, .box_w = 7, .box_h = 4, .ofs_x = 0, .ofs_y = 4}, + {.bitmap_index = 335, .adv_w = 128, .box_w = 8, .box_h = 1, .ofs_x = 0, .ofs_y = 0}, + {.bitmap_index = 336, .adv_w = 128, .box_w = 4, .box_h = 3, .ofs_x = 3, .ofs_y = 5}, + {.bitmap_index = 338, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 342, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 348, .adv_w = 128, .box_w = 5, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 352, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 358, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 362, .adv_w = 128, .box_w = 5, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 367, .adv_w = 128, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 372, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 378, .adv_w = 128, .box_w = 5, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 383, .adv_w = 128, .box_w = 5, .box_h = 8, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 388, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 394, .adv_w = 128, .box_w = 5, .box_h = 7, .ofs_x = 2, .ofs_y = 1}, + {.bitmap_index = 399, .adv_w = 128, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 404, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 408, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 412, .adv_w = 128, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 417, .adv_w = 128, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 422, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 426, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 430, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 436, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 440, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 444, .adv_w = 128, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 449, .adv_w = 128, .box_w = 7, .box_h = 5, .ofs_x = 0, .ofs_y = 1}, + {.bitmap_index = 454, .adv_w = 128, .box_w = 6, .box_h = 6, .ofs_x = 1, .ofs_y = 0}, + {.bitmap_index = 459, .adv_w = 128, .box_w = 6, .box_h = 5, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 463, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 469, .adv_w = 128, .box_w = 2, .box_h = 7, .ofs_x = 3, .ofs_y = 1}, + {.bitmap_index = 471, .adv_w = 128, .box_w = 6, .box_h = 7, .ofs_x = 1, .ofs_y = 1}, + {.bitmap_index = 477, .adv_w = 128, .box_w = 7, .box_h = 2, .ofs_x = 0, .ofs_y = 6}, + {.bitmap_index = 479, .adv_w = 128, .box_w = 7, .box_h = 7, .ofs_x = 0, .ofs_y = 1} }; /*--------------------- @@ -418,10 +419,11 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = { /*Collect the unicode lists and glyph_id offsets*/ -static const lv_font_fmt_txt_cmap_t cmaps[] = { +static const lv_font_fmt_txt_cmap_t cmaps[] = +{ { - .range_start = 32, .range_length = 96, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY, - .glyph_id_start = 1, .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0 + .range_start = 32, .range_length = 96, .glyph_id_start = 1, + .unicode_list = NULL, .glyph_id_ofs_list = NULL, .list_length = 0, .type = LV_FONT_FMT_TXT_CMAP_FORMAT0_TINY } }; @@ -436,12 +438,12 @@ static lv_font_fmt_txt_dsc_t font_dsc = { .glyph_bitmap = gylph_bitmap, .glyph_dsc = glyph_dsc, .cmaps = cmaps, + .kern_dsc = NULL, + .kern_scale = 0, .cmap_num = 1, .bpp = 1, - - .kern_scale = 0, - .kern_dsc = NULL, .kern_classes = 0, + .bitmap_format = 0 }; @@ -451,11 +453,20 @@ static lv_font_fmt_txt_dsc_t font_dsc = { /*Initialize a public general font descriptor*/ lv_font_t lv_font_unscii_8 = { - .dsc = &font_dsc, /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ - .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ .get_glyph_dsc = lv_font_get_glyph_dsc_fmt_txt, /*Function pointer to get glyph's data*/ - .line_height = 8, /*The maximum line height required by the font*/ - .base_line = 2, /*Baseline measured from the bottom of the line*/ + .get_glyph_bitmap = lv_font_get_bitmap_fmt_txt, /*Function pointer to get glyph's bitmap*/ + .line_height = 9, /*The maximum line height required by the font*/ + .base_line = 0, /*Baseline measured from the bottom of the line*/ +#if !(LVGL_VERSION_MAJOR == 6 && LVGL_VERSION_MINOR == 0) + .subpx = LV_FONT_SUBPX_NONE, +#endif +#if LV_VERSION_CHECK(7, 4, 0) + .underline_position = 0, + .underline_thickness = 0, +#endif + .dsc = &font_dsc /*The custom font data. Will be accessed by `get_glyph_bitmap/dsc` */ }; + + #endif /*#if LV_FONT_UNSCII_8*/