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

[oswald.git] / ui / oswald_fonts.c

diff --git a/ui/oswald_fonts.c b/ui/oswald_fonts.c
index 762c3c591853088bf8f846da0daa11820e60910f..763ac4adca0cb5b97330cb38cf8107dce587024c 100644 (file)
--- a/ui/oswald_fonts.c
+++ b/ui/oswald_fonts.c
@@ -1,40 +1,40 @@
 #include "oswald_fonts.h"
 
 #include "oswald_fonts.h"
 

-#include "fonts/4x6_horizontal_LSB_1.h"
-#include "fonts/5x8_horizontal_LSB_1.h"
-#include "fonts/5x12_horizontal_LSB_1.h"
-#include "fonts/6x8_horizontal_LSB_1.h"
-#include "fonts/6x10_horizontal_LSB_1.h"
-#include "fonts/7x12b_horizontal_LSB_1.h"
-#include "fonts/7x12_horizontal_LSB_1.h"
-#include "fonts/8x8_horizontal_LSB_1.h"
-#include "fonts/8x12_horizontal_LSB_1.h"
-#include "fonts/8x14_horizontal_LSB_1.h"
-#include "fonts/10x16_horizontal_LSB_1.h"
-#include "fonts/12x16_horizontal_LSB_1.h"
-#include "fonts/12x20_horizontal_LSB_1.h"
-#include "fonts/16x26_horizontal_LSB_1.h"
-#include "fonts/22x36_horizontal_LSB_1.h"
-#include "fonts/24x40_horizontal_LSB_1.h"
-#include "fonts/32x53_horizontal_LSB_1.h"
+//#include "fonts/m4x6_horizontal_LSB_1.h"
+//#include "fonts/m5x8_horizontal_LSB_1.h"
+//#include "fonts/m5x12_horizontal_LSB_1.h"
+#include "fonts/m6x8_horizontal_LSB_1.h"
+//#include "fonts/m6x10_horizontal_LSB_1.h"
+#include "fonts/m7x12b_horizontal_LSB_1.h"
+//#include "fonts/m7x12_horizontal_LSB_1.h"
+//#include "fonts/m8x8_horizontal_LSB_1.h"
+//#include "fonts/m8x12_horizontal_LSB_1.h"
+//#include "fonts/m8x14_horizontal_LSB_1.h"
+//#include "fonts/m10x16_horizontal_LSB_1.h"
+//#include "fonts/m12x16_horizontal_LSB_1.h"
+//#include "fonts/m12x20_horizontal_LSB_1.h"
+#include "fonts/m16x26_horizontal_LSB_1.h"
+//#include "fonts/m22x36_horizontal_LSB_1.h"
+//#include "fonts/m24x40_horizontal_LSB_1.h"
+//#include "fonts/m32x53_horizontal_LSB_1.h"

 
 const oswald_font oswald_fonts[LAST_FONT] = {
 
 const oswald_font oswald_fonts[LAST_FONT] = {

-       { 4, 6, (char **)font_4x6},
-       { 5, 8, (char **)font_5x8},
-       { 5, 12, (char **)font_5x12},
-       { 6, 8, (char **)font_6x8},
-       { 6, 10, (char **)font_6x10},
-       { 7, 12, (char **)font_7x12},
-       { 7, 12, (char **)font_7x12b},
-       { 8, 8, (char **)font_8x8},
-       { 8, 12, (char **)font_8x12},
-       { 8, 14, (char **)font_8x14},
-       { 10, 16, (char **)font_10x16},
-       { 12, 16, (char **)font_12x16},
-       { 12, 20, (char **)font_12x20},
-       { 16, 26, (char **)font_16x26},
-       { 22, 36, (char **)font_22x36},
-       { 24, 40, (char **)font_24x40},
-       { 32, 53, (char **)font_32x53},
+//     { 4, 6, (char *)font_4x6},
+//     { 5, 8, (char *)font_5x8},
+//     { 5, 12, (char *)font_5x12},
+       { 6, 8, (uint8_t *)font_6x8},
+//     { 6, 10, (char *)font_6x10},
+//     { 7, 12, (uint8_t *)font_7x12},
+       { 7, 12, (uint8_t *)font_7x12b},
+//     { 8, 8, (char *)font_8x8},
+//     { 8, 12, (char *)font_8x12},
+//     { 8, 14, (char *)font_8x14},
+//     { 10, 16, (char *)font_10x16},
+//     { 12, 16, (char *)font_12x16},
+//     { 12, 20, (char *)font_12x20},
+       { 16, 26, (uint8_t *)font_16x26},
+//     { 22, 36, (char *)font_22x36},
+//     { 24, 40, (char *)font_24x40},
+//     { 32, 53, (char *)font_32x53},

 };
 
 };