Shorten charger plug "tail"

[oswald.git] / ui / oswald_fonts.h

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