Skip to content

Commit cfa88ae

Browse files
committed
Merge branch 'develop'
2 parents 607cc7b + 26bb186 commit cfa88ae

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
.vscode/ipch
4040

4141
# Resource
42-
/src/df88.*
42+
/src/df88.cpp

src/app.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,12 @@ void TinyDarius::setup(LGFX* output)
109109
{
110110
abort();
111111
}
112-
//#if __has_include("df88.cpp")
112+
#if __has_include("df88.cpp")
113113
p->setFont(&df88_gfx_font);
114-
//#endif
115-
// p->setFont(&Font2);
114+
#else
115+
p->setFont(&Font0);
116+
#endif
117+
116118
p->setAddrWindow(0, 0, SCREEN_WIDTH, STRIP_HEIGHT);
117119
}
118120

src/df88.hpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/*!
2+
TinyDarius
3+
4+
@file df88.hpp
5+
@brief 8x8 Font
6+
*/
7+
#include <lgfx/v1/lgfx_fonts.hpp>
8+
9+
#if __has_include(<df88.cpp>)
10+
extern const ::lgfx::GFXfont df88_gfx_font;
11+
#endif

0 commit comments

Comments
 (0)