Merge branch 'develop'

GOB52 · Feb 6, 2023 · d569b32 · d569b32
2 parents 0e3cb2c + 1ba06c6
commit d569b32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -52,4 +52,6 @@
 !/src/res/dummy_mc.cpp
 !/src/res/dummy_logo.cpp
 !/src/res/w???.cpp
+!/src/res/font.cpp
+
 
diff --git a/src/res/font.cpp b/src/res/font.cpp
@@ -0,0 +1,11 @@
+/*
+  Font definition
+ */
+#include <M5GFX.h>
+#include <lgfx/Fonts/IPA/lgfx_font_japan.h>
+#include "u8g2_font_profont22_tr.h"
+#include "resource.h"
+
+const lgfx::U8g2font titleFont( u8g2_font_profont22_tr );
+const lgfx::U8g2font tickerFont( lgfx_font_japan_gothic_p_20 );
+