Starting to get rid of borrowed code (LcdDisplay, Fonts), integrate

[oswald.git] / ui / oswald_fonts.h

diff --git a/ui/oswald_fonts.h b/ui/oswald_fonts.h
index 0f590c4f6ba56daa1433b9f9e089d4d53ab912b6..d749dc6f3113efd62e49b77c438b1ae8c8004e36 100644 (file)
--- a/ui/oswald_fonts.h
+++ b/ui/oswald_fonts.h
@@ -4,30 +4,30 @@
 #include "oswald.h"
 
 typedef enum {
-       FONT_4x6 = 0,
-       FONT_5x8,
-       FONT_5x12,
-       FONT_6x8,
-       FONT_6x10,
+//     FONT_4x6 = 0,
+//     FONT_5x8 = 0,
+//     FONT_5x12,
+       FONT_6x8 = 0,
+//     FONT_6x10,
+//     FONT_7x12,
        FONT_7x12b,
-       FONT_7x12,
-       FONT_8x8,
-       FONT_8x12,
-       FONT_8x14,
-       FONT_10x16,
-       FONT_12x16,
-       FONT_12x20,
+//     FONT_8x8,
+//     FONT_8x12,
+//     FONT_8x14,
+//     FONT_10x16,
+//     FONT_12x16,
+//     FONT_12x20,
        FONT_16x26,
-       FONT_22x36,
-       FONT_24x40,
-       FONT_32x53,
+//     FONT_22x36,
+//     FONT_24x40,
+//     FONT_32x53,
        LAST_FONT
 } oswald_font_face;
 
 typedef struct {
-       u8t width;
-       u8t height;
-       char **data;
+       uint8_t width;
+       uint8_t height;
+       uint8_t *data;
 } oswald_font;
 
 extern const oswald_font oswald_fonts[];