mirror
/
OpenRTX
kopia lustrzana https://github.com/OpenRTX/OpenRTX
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Graphics: removed 18pt and 24pt fonts 

Removing 18pt and 24pt fonts from graphics layer since currently are unused
and take up flash space. On MD-380, removal freed up 12'928 bytes in the
.text section.
pull/238/head
Silvano Seva 2023-12-26 18:54:36 +01:00
rodzic cb7b605251
commit 7b0ff04a2d
2 zmienionych plików z 3 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
openrtx/include/core/graphics.h
Wyświetl plik

@ -86,8 +86,8 @@ typedef enum
FONT_SIZE_10PT, FONT_SIZE_10PT,
FONT_SIZE_12PT, FONT_SIZE_12PT,
FONT_SIZE_16PT, FONT_SIZE_16PT,
FONT_SIZE_18PT,
FONT_SIZE_24PT FONT_SIZE_NUM
} fontSize_t; } fontSize_t;
typedef enum typedef enum

6
openrtx/src/core/graphics.c
Wyświetl plik

@ -71,8 +71,6 @@ static const GFXfont fonts[] = { TomThumb, // 5pt
FreeSans10pt7b, // 10pt FreeSans10pt7b, // 10pt
FreeSans12pt7b, // 12pt FreeSans12pt7b, // 12pt
FreeSans16pt7b, // 16pt FreeSans16pt7b, // 16pt
FreeSans18pt7b, // 16pt
FreeSans24pt7b, // 24pt
#elif defined FONT_UBUNTU_REGULAR #elif defined FONT_UBUNTU_REGULAR
UbuntuRegular6pt7b, // 6pt UbuntuRegular6pt7b, // 6pt
UbuntuRegular8pt7b, // 8pt UbuntuRegular8pt7b, // 8pt
@ -80,8 +78,6 @@ static const GFXfont fonts[] = { TomThumb, // 5pt
UbuntuRegular10pt7b, // 10pt UbuntuRegular10pt7b, // 10pt
UbuntuRegular12pt7b, // 12pt UbuntuRegular12pt7b, // 12pt
UbuntuRegular16pt7b, // 16pt UbuntuRegular16pt7b, // 16pt
UbuntuRegular18pt7b, // 16pt
UbuntuRegular24pt7b, // 24pt
#else #else
#error Unsupported font family! #error Unsupported font family!
#endif #endif
@ -634,7 +630,7 @@ point_t gfx_drawSymbol(point_t start, symbolSize_t size, textAlign_t alignment,
* *
* TODO: improve this. * TODO: improve this.
*/ */
int symSize = size + FONT_SIZE_24PT + 1; int symSize = size + FONT_SIZE_NUM;
char buffer[2] = {0}; char buffer[2] = {0};
buffer[0] = (char) symbol; buffer[0] = (char) symbol;