Power saving changes, add new fonts, bitmaps and screens

[oswald.git] / ui / oswald_fonts.c

diff --git a/ui/oswald_fonts.c b/ui/oswald_fonts.c
index 762c3c591853088bf8f846da0daa11820e60910f..7f8419c6cc001082b8ef85c2d627840c9c3a6afb 100644 (file)
--- a/ui/oswald_fonts.c
+++ b/ui/oswald_fonts.c
@@ -1,40 +1,65 @@
 #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"
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/lcd13x21.h"
+
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/lcd8x13.h"
+
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/fixed5x7.h"
+
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/fixed6x9.h"
+
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/DroidSans8x12.h"
+
+#if defined(__GNUC__) && (__MSP430X__ > 0)
+__attribute__((__far__))
+#endif
+#include "fonts/DroidSansBold8x12.h"
 
 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},
+       {
+               FONT_TYPE_MONOSPACE,
+               FONT_WIDTH_LCDnone_8x13,
+               FONT_HEIGHT_LCDnone_8x13,
+               (uint8_t *)FONT_DATA_LCDnone_8x13
+       }, {
+               FONT_TYPE_MONOSPACE,
+               FONT_WIDTH_LCDnone_13x21,
+               FONT_HEIGHT_LCDnone_13x21,
+               (uint8_t *)FONT_DATA_LCDnone_13x21
+       }, {
+               FONT_TYPE_MONOSPACE,
+               FONT_WIDTH_Fixed_5x7,
+               FONT_HEIGHT_Fixed_5x7,
+               (uint8_t *)FONT_DATA_Fixed_5x7
+       }, {
+               FONT_TYPE_MONOSPACE,
+               FONT_WIDTH_Fixed_6x9,
+               FONT_HEIGHT_Fixed_6x9,
+               (uint8_t *)FONT_DATA_Fixed_6x9
+       }, {
+               FONT_TYPE_PROPORTIONAL,
+               FONT_WIDTH_Droid_SansMedium_8x12,
+               FONT_HEIGHT_Droid_SansMedium_8x12,
+               (uint8_t *)FONT_DATA_Droid_SansMedium_8x12
+       }, {
+               FONT_TYPE_PROPORTIONAL,
+               FONT_WIDTH_Droid_SansBold_8x12,
+               FONT_HEIGHT_Droid_SansBold_8x12,
+               (uint8_t *)FONT_DATA_Droid_SansBold_8x12
+       },
 };
-