diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:30:14 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-03-27 07:30:14 (GMT) |
| commit | 02d1b93d971e849a70e8c8ee0023a37e9976b196 (patch) | |
| tree | fceebd15b2d96776f1427ac28ccfd8e103e9d5b3 /src/displayapp/fonts | |
| parent | 7d1a91eea086caf4b6ebfdae7f83ec9a86fe0d82 (diff) | |
| parent | 6ef63b0f3c687126805635510f0d2f0ed8eb76b8 (diff) | |
Merge ../InfiniSim/InfiniTime into ultraredux
Diffstat (limited to 'src/displayapp/fonts')
| -rw-r--r-- | src/displayapp/fonts/neofont.c | 2 | ||||
| -rw-r--r-- | src/displayapp/fonts/neofont.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/fonts/neofont.c b/src/displayapp/fonts/neofont.c index e2e67e7..538b16b 100644 --- a/src/displayapp/fonts/neofont.c +++ b/src/displayapp/fonts/neofont.c @@ -532,7 +532,7 @@ static const uint8_t * neofont1_glyph_bitmap_cb(const lv_font_t * font, uint32_t } /*Describe the properties of a font*/ -const lv_font_t neofont1 = { +lv_font_t neofont1 = { .get_glyph_dsc = neofont1_glyph_dsc_cb, /*Set a callback to get info about gylphs*/ .get_glyph_bitmap = neofont1_glyph_bitmap_cb, /*Set a callback to get bitmap of a glyp*/ .line_height = 12, /*The real line height where any text fits*/ diff --git a/src/displayapp/fonts/neofont.h b/src/displayapp/fonts/neofont.h index 94d9e59..b6064b5 100644 --- a/src/displayapp/fonts/neofont.h +++ b/src/displayapp/fonts/neofont.h @@ -9,7 +9,7 @@ extern "C" { #endif extern const lv_font_t neofont0; -extern const lv_font_t neofont1; +// extern const lv_font_t neofont1; // extern const lv_font_t neofont2; extern const lv_font_t neofont3; |