projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix undefined preprocessor symbol.
[bertos.git]
/
gfx
/
font.c
diff --git
a/gfx/font.c
b/gfx/font.c
index 934f851a2aa549bf235bc002bcd922b2a195286c..767c269e855351daea42c8206a59d91d7f3b361a 100755
(executable)
--- a/
gfx/font.c
+++ b/
gfx/font.c
@@
-15,6
+15,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.3 2006/02/10 12:29:05 bernie
+ *#* Add multiple font support in bitmaps.
+ *#*
*#* Revision 1.2 2005/11/04 18:17:45 bernie
*#* Fix header guards and includes for new location of gfx module.
*#*
*#* Revision 1.2 2005/11/04 18:17:45 bernie
*#* Fix header guards and includes for new location of gfx module.
*#*
@@
-42,7
+45,7
@@
#include "font.h"
#include "font.h"
-
const PROGMEM uint8_t font
[256 * 6] =
+
static const PROGMEM uint8_t default_font_glyphs
[256 * 6] =
{
/* 0x00 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */
{
/* 0x00 */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* */
@@
-333,3
+336,11
@@
const PROGMEM uint8_t font[256 * 6] =
0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x00, /* þ */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* ÿ */
};
0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x00, /* þ */
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* ÿ */
};
+
+struct Font default_font =
+{
+ /* .glyph = */ default_font_glyphs,
+ /* .width = */ 6,
+ /* .height = */ 8
+};
+