diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-27 08:32:54 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-27 08:32:54 (GMT) |
| commit | c8694c78c6cc05ae09e862e7ecd09407c7a3c3b7 (patch) | |
| tree | 6bb1cc86276aef2d4f6f8a23727cc23e8bb4e7e0 /src/displayapp/fonts | |
| parent | 1f39379a6519055d5633a560d041be6a69d4a2f5 (diff) | |
| parent | ea4e6d8ad74ea982ad29c047c86bdac95a4ca539 (diff) | |
Merge ../InfiniSim/InfiniTime into ultraredux
Diffstat (limited to 'src/displayapp/fonts')
| -rw-r--r-- | src/displayapp/fonts/neofont.c | 10 | ||||
| -rw-r--r-- | src/displayapp/fonts/neofont.h | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c index 538b16b..12a467a 100644 --- a/src/displayapp/fonts/neofont.c +++ b/src/displayapp/fonts/neofont.c @@ -292,6 +292,12 @@ static uint8_t glyphs[][2] = { _, _, _, _, X, _ ), + G( X, _, _, + _, _, X, + _, X, _, + X, _, _, + _, _, X ), + G( _, X, _, X, X, X, _, X, _, @@ -344,7 +350,7 @@ static const uint8_t * neofont0_glyph_bitmap_cb(const lv_font_t * font, uint32_t } if (unicode_letter == ' ') { return spc; } - static const char *symbols = "-/:.,_?!#"; + static const char *symbols = "-/:.,_?!%#"; if (unicode_letter < 0x80) { char*x = strchr(symbols,((uint8_t)unicode_letter)); if (x != NULL) { @@ -354,7 +360,7 @@ static const uint8_t * neofont0_glyph_bitmap_cb(const lv_font_t * font, uint32_t return glyphs[sizeof(glyphs)/sizeof(glyphs[0])-1]; } -const lv_font_t neofont0 = { +lv_font_t neofont0 = { .get_glyph_dsc = neofont0_glyph_dsc_cb, /*Set a callback to get info about gylphs*/ .get_glyph_bitmap = neofont0_glyph_bitmap_cb, /*Set a callback to get bitmap of a glyp*/ .line_height = 6, /*The real line height where any text fits*/ diff --git a/src/displayapp/fonts/neofont.h b/src/displayapp/fonts/neofont.h index b6064b5..b01a7af 100644 --- a/src/displayapp/fonts/neofont.h +++ b/src/displayapp/fonts/neofont.h @@ -8,7 +8,7 @@ extern "C" { #endif -extern const lv_font_t neofont0; +// extern const lv_font_t neofont0; // extern const lv_font_t neofont1; // extern const lv_font_t neofont2; extern const lv_font_t neofont3; |