X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald_fonts.h;h=0ca914da581d54041ff1b7b9f4af0e5b1140f931;hp=d749dc6f3113efd62e49b77c438b1ae8c8004e36;hb=7591b56527b514071ba465297b77a3bae4f57548;hpb=16600ff42846105227c8a3cbb4f2b818ca41811d

diff --git a/ui/oswald_fonts.h b/ui/oswald_fonts.h
index d749dc6..0ca914d 100644
--- a/ui/oswald_fonts.h
+++ b/ui/oswald_fonts.h
@@ -4,27 +4,22 @@
 #include "oswald.h"
 
 typedef enum {
-//	FONT_4x6 = 0,
-//	FONT_5x8 = 0,
-//	FONT_5x12,
-	FONT_6x8 = 0,
-//	FONT_6x10,
-//	FONT_7x12,
-	FONT_7x12b,
-//	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 {
+	oswald_font_type font_type;
 	uint8_t width;
 	uint8_t height;
 	uint8_t *data;