feedc0de/espfontlib
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

WIP: Sync from fork #2

Draft
CommanderRedYT wants to merge 2 commits from CommanderRedYT/main into main
pull from: CommanderRedYT/main
merge into: feedc0de:main
Conversation 0 Commits 2 Files Changed 4 +19
4 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Fonts/GFXFF/TomThumb.cpp
View File

@ -1,5 +1,9 @@
#include "TomThumb.h" #include "TomThumb.h"
#include "sdkconfig.h"
#ifdef CONFIG_TFT_LOAD_GFXFF
namespace espgui { namespace espgui {
#define TOMTHUMB_USE_EXTENDED 0 #define TOMTHUMB_USE_EXTENDED 0
@ -430,3 +434,4 @@ const GFXfont TomThumb {
0x20, 0x7E, 6 }; 0x20, 0x7E, 6 };
} // namespace espgui } // namespace espgui
#endif

5
src/Fonts/GFXFF/TomThumb.h
View File

@ -48,6 +48,10 @@
#pragma once #pragma once
#include "sdkconfig.h"
#ifdef CONFIG_TFT_LOAD_GFXFF
// system includes // system includes
#include <cstdint> #include <cstdint>
@ -63,3 +67,4 @@ extern const GFXglyph TomThumbGlyphs[];
extern const GFXfont TomThumb; extern const GFXfont TomThumb;
} // namespace espgui } // namespace espgui
#endif

4
src/din1451alt10pt8b.cpp
View File

@ -1,5 +1,8 @@
#include "din1451alt10pt8b.h" #include "din1451alt10pt8b.h"
#include "sdkconfig.h"
#ifdef CONFIG_TFT_LOAD_GFXFF
namespace espgui { namespace espgui {
const uint8_t din1451alt10pt8bBitmaps[] = { const uint8_t din1451alt10pt8bBitmaps[] = {
@ -461,3 +464,4 @@ const GFXfont din1451alt10pt8b {
// Approx. 4245 bytes // Approx. 4245 bytes
} // namespace espgui } // namespace espgui
#endif

5
src/din1451alt10pt8b.h
View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include "sdkconfig.h"
#ifdef CONFIG_TFT_LOAD_GFXFF
// system includes // system includes
#include <cstdint> #include <cstdint>
@ -15,3 +19,4 @@ extern const GFXglyph din1451alt10pt8bGlyphs[];
extern const GFXfont din1451alt10pt8b; extern const GFXfont din1451alt10pt8b;
} // namespace espgui } // namespace espgui
#endif