projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add lcd_hd44 test module.
[bertos.git]
/
bertos
/
fonts
/
fixed6x8.c
diff --git
a/bertos/fonts/fixed6x8.c
b/bertos/fonts/fixed6x8.c
index 978cdf2ad6865035155f2cc21038abbb7aae3994..ea37b2346362cc580b9ab88e9e7cdccbe3f1c93d 100644
(file)
--- a/
bertos/fonts/fixed6x8.c
+++ b/
bertos/fonts/fixed6x8.c
@@
-31,14
+31,15
@@
*
* -->
*
*
* -->
*
+ * \brief Font 8x6 IBM-PC 8bit
+ *
* \version $Id$
*
* \author Bernardo Innocenti <bernie@develer.com>
*
* \version $Id$
*
* \author Bernardo Innocenti <bernie@develer.com>
*
- * \brief Font 8x6 IBM-PC 8bit
*/
*/
-#include
"font.h"
+#include
<gfx/font.h>
static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
{
static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
{
@@
-332,6
+333,8
@@
static const PROGMEM uint8_t default_font_glyphs[256 * 6] =
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* ÿ */
};
0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* ÿ */
};
+
+#ifndef default_font
struct Font default_font =
{
/* .glyph = */ default_font_glyphs,
struct Font default_font =
{
/* .glyph = */ default_font_glyphs,
@@
-339,3
+342,4
@@
struct Font default_font =
/* .height = */ 8
};
/* .height = */ 8
};
+#endif