Dariaceli's Git
Browse code

Replace font handling, add new watch face, add calendar. More watchfaces, make calendar interactive and start rearranging button functions

Dario Rodriguez authored on 17/12/2013 22:59:59
Showing 1 changed files
ui/oswald_fonts.c
History View file @ bce8609
... ... 
@@ -1,65 +1,8 @@
1 1 
 #include "oswald_fonts.h"
2 
-
3 
-#if defined(__GNUC__) && (__MSP430X__ > 0)
4 
-__attribute__((__far__))
5 
-#endif
6 
-#include "fonts/lcd13x21.h"
7 
-
8 
-#if defined(__GNUC__) && (__MSP430X__ > 0)
9 
-__attribute__((__far__))
10 
-#endif
11 
-#include "fonts/lcd8x13.h"
12 
-
13 
-#if defined(__GNUC__) && (__MSP430X__ > 0)
14 
-__attribute__((__far__))
15 
-#endif
16 
-#include "fonts/fixed5x7.h"
17 
-
18 
-#if defined(__GNUC__) && (__MSP430X__ > 0)
19 
-__attribute__((__far__))
20 
-#endif
21 
-#include "fonts/fixed6x9.h"
22 
-
2 
+#if 0
23 3 
 #if defined(__GNUC__) && (__MSP430X__ > 0)
24 4 
 __attribute__((__far__))
25 5 
 #endif
26 
-#include "fonts/DroidSans8x12.h"
27 
-
28 
-#if defined(__GNUC__) && (__MSP430X__ > 0)
29 
-__attribute__((__far__))
30 6 
 #endif
31 
-#include "fonts/DroidSansBold8x12.h"
7 
+#include "fonts/font5x8.h"
32 8
33 
-const oswald_font oswald_fonts[LAST_FONT] = {
34 
-	{
35 
-		FONT_TYPE_MONOSPACE,
36 
-		FONT_WIDTH_LCDnone_8x13,
37 
-		FONT_HEIGHT_LCDnone_8x13,
38 
-		(uint8_t *)FONT_DATA_LCDnone_8x13
39 
-	}, {
40 
-		FONT_TYPE_MONOSPACE,
41 
-		FONT_WIDTH_LCDnone_13x21,
42 
-		FONT_HEIGHT_LCDnone_13x21,
43 
-		(uint8_t *)FONT_DATA_LCDnone_13x21
44 
-	}, {
45 
-		FONT_TYPE_MONOSPACE,
46 
-		FONT_WIDTH_Fixed_5x7,
47 
-		FONT_HEIGHT_Fixed_5x7,
48 
-		(uint8_t *)FONT_DATA_Fixed_5x7
49 
-	}, {
50 
-		FONT_TYPE_MONOSPACE,
51 
-		FONT_WIDTH_Fixed_6x9,
52 
-		FONT_HEIGHT_Fixed_6x9,
53 
-		(uint8_t *)FONT_DATA_Fixed_6x9
54 
-	}, {
55 
-		FONT_TYPE_PROPORTIONAL,
56 
-		FONT_WIDTH_Droid_SansMedium_8x12,
57 
-		FONT_HEIGHT_Droid_SansMedium_8x12,
58 
-		(uint8_t *)FONT_DATA_Droid_SansMedium_8x12
59 
-	}, {
60 
-		FONT_TYPE_PROPORTIONAL,
61 
-		FONT_WIDTH_Droid_SansBold_8x12,
62 
-		FONT_HEIGHT_Droid_SansBold_8x12,
63 
-		(uint8_t *)FONT_DATA_Droid_SansBold_8x12
64 
-	},
65 
-};
Browse code

Power saving changes, add new fonts, bitmaps and screens

Nils Faerber authored on 19/05/2013 00:07:04
Showing 1 changed files
ui/oswald_fonts.c
History View file @ 1b57900
... ... 
@@ -28,7 +28,7 @@ __attribute__((__far__))
28 28 
 #if defined(__GNUC__) && (__MSP430X__ > 0)
29 29 
 __attribute__((__far__))
30 30 
 #endif
31 
-#include "fonts/DroidSans-Bold11x14.h"
31 
+#include "fonts/DroidSansBold8x12.h"
32 32
33 33 
 const oswald_font oswald_fonts[LAST_FONT] = {
34 34 
 	{
... ... 
@@ -58,8 +58,8 @@ const oswald_font oswald_fonts[LAST_FONT] = {
58 58 
 		(uint8_t *)FONT_DATA_Droid_SansMedium_8x12
59 59 
 	}, {
60 60 
 		FONT_TYPE_PROPORTIONAL,
61 
-		FONT_WIDTH_Droid_SansBold_11x14,
62 
-		FONT_HEIGHT_Droid_SansBold_11x14,
63 
-		(uint8_t *)FONT_DATA_Droid_SansBold_11x14
61 
+		FONT_WIDTH_Droid_SansBold_8x12,
62 
+		FONT_HEIGHT_Droid_SansBold_8x12,
63 
+		(uint8_t *)FONT_DATA_Droid_SansBold_8x12
64 64 
 	},
65 65 
 };
Browse code

Rework font code, add new fonts, also proportional, rework watch usage - "SET" button now enters settings mode

Nils Faerber authored on 04/05/2013 19:23:25
Showing 1 changed files
ui/oswald_fonts.c
History View file @ 76d86b6
... ... 
@@ -1,40 +1,65 @@
1 1 
 #include "oswald_fonts.h"
2 2
3 
-//#include "fonts/m4x6_horizontal_LSB_1.h"
4 
-//#include "fonts/m5x8_horizontal_LSB_1.h"
5 
-//#include "fonts/m5x12_horizontal_LSB_1.h"
6 
-#include "fonts/m6x8_horizontal_LSB_1.h"
7 
-//#include "fonts/m6x10_horizontal_LSB_1.h"
8 
-#include "fonts/m7x12b_horizontal_LSB_1.h"
9 
-//#include "fonts/m7x12_horizontal_LSB_1.h"
10 
-//#include "fonts/m8x8_horizontal_LSB_1.h"
11 
-//#include "fonts/m8x12_horizontal_LSB_1.h"
12 
-//#include "fonts/m8x14_horizontal_LSB_1.h"
13 
-//#include "fonts/m10x16_horizontal_LSB_1.h"
14 
-//#include "fonts/m12x16_horizontal_LSB_1.h"
15 
-//#include "fonts/m12x20_horizontal_LSB_1.h"
16 
-#include "fonts/m16x26_horizontal_LSB_1.h"
17 
-//#include "fonts/m22x36_horizontal_LSB_1.h"
18 
-//#include "fonts/m24x40_horizontal_LSB_1.h"
19 
-//#include "fonts/m32x53_horizontal_LSB_1.h"
3 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
4 
+__attribute__((__far__))
5 
+#endif
6 
+#include "fonts/lcd13x21.h"
7 
+
8 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
9 
+__attribute__((__far__))
10 
+#endif
11 
+#include "fonts/lcd8x13.h"
12 
+
13 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
14 
+__attribute__((__far__))
15 
+#endif
16 
+#include "fonts/fixed5x7.h"
17 
+
18 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
19 
+__attribute__((__far__))
20 
+#endif
21 
+#include "fonts/fixed6x9.h"
22 
+
23 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
24 
+__attribute__((__far__))
25 
+#endif
26 
+#include "fonts/DroidSans8x12.h"
27 
+
28 
+#if defined(__GNUC__) && (__MSP430X__ > 0)
29 
+__attribute__((__far__))
30 
+#endif
31 
+#include "fonts/DroidSans-Bold11x14.h"
20 32
21 33 
 const oswald_font oswald_fonts[LAST_FONT] = {
22 
-//	{ 4, 6, (char *)font_4x6},
23 
-//	{ 5, 8, (char *)font_5x8},
24 
-//	{ 5, 12, (char *)font_5x12},
25 
-	{ 6, 8, (uint8_t *)font_6x8},
26 
-//	{ 6, 10, (char *)font_6x10},
27 
-//	{ 7, 12, (uint8_t *)font_7x12},
28 
-	{ 7, 12, (uint8_t *)font_7x12b},
29 
-//	{ 8, 8, (char *)font_8x8},
30 
-//	{ 8, 12, (char *)font_8x12},
31 
-//	{ 8, 14, (char *)font_8x14},
32 
-//	{ 10, 16, (char *)font_10x16},
33 
-//	{ 12, 16, (char *)font_12x16},
34 
-//	{ 12, 20, (char *)font_12x20},
35 
-	{ 16, 26, (uint8_t *)font_16x26},
36 
-//	{ 22, 36, (char *)font_22x36},
37 
-//	{ 24, 40, (char *)font_24x40},
38 
-//	{ 32, 53, (char *)font_32x53},
34 
+	{
35 
+		FONT_TYPE_MONOSPACE,
36 
+		FONT_WIDTH_LCDnone_8x13,
37 
+		FONT_HEIGHT_LCDnone_8x13,
38 
+		(uint8_t *)FONT_DATA_LCDnone_8x13
39 
+	}, {
40 
+		FONT_TYPE_MONOSPACE,
41 
+		FONT_WIDTH_LCDnone_13x21,
42 
+		FONT_HEIGHT_LCDnone_13x21,
43 
+		(uint8_t *)FONT_DATA_LCDnone_13x21
44 
+	}, {
45 
+		FONT_TYPE_MONOSPACE,
46 
+		FONT_WIDTH_Fixed_5x7,
47 
+		FONT_HEIGHT_Fixed_5x7,
48 
+		(uint8_t *)FONT_DATA_Fixed_5x7
49 
+	}, {
50 
+		FONT_TYPE_MONOSPACE,
51 
+		FONT_WIDTH_Fixed_6x9,
52 
+		FONT_HEIGHT_Fixed_6x9,
53 
+		(uint8_t *)FONT_DATA_Fixed_6x9
54 
+	}, {
55 
+		FONT_TYPE_PROPORTIONAL,
56 
+		FONT_WIDTH_Droid_SansMedium_8x12,
57 
+		FONT_HEIGHT_Droid_SansMedium_8x12,
58 
+		(uint8_t *)FONT_DATA_Droid_SansMedium_8x12
59 
+	}, {
60 
+		FONT_TYPE_PROPORTIONAL,
61 
+		FONT_WIDTH_Droid_SansBold_11x14,
62 
+		FONT_HEIGHT_Droid_SansBold_11x14,
63 
+		(uint8_t *)FONT_DATA_Droid_SansBold_11x14
64 
+	},
39 65 
 };
40 
-
Browse code

Starting to get rid of borrowed code (LcdDisplay, Fonts), integrate new fonts and stuff

Nils Faerber authored on 28/04/2013 22:38:41
Showing 1 changed files
ui/oswald_fonts.c
History View file @ 16600ff
... ... 
@@ -1,40 +1,40 @@
1 1 
 #include "oswald_fonts.h"
2 2
3 
-#include "fonts/4x6_horizontal_LSB_1.h"
4 
-#include "fonts/5x8_horizontal_LSB_1.h"
5 
-#include "fonts/5x12_horizontal_LSB_1.h"
6 
-#include "fonts/6x8_horizontal_LSB_1.h"
7 
-#include "fonts/6x10_horizontal_LSB_1.h"
8 
-#include "fonts/7x12b_horizontal_LSB_1.h"
9 
-#include "fonts/7x12_horizontal_LSB_1.h"
10 
-#include "fonts/8x8_horizontal_LSB_1.h"
11 
-#include "fonts/8x12_horizontal_LSB_1.h"
12 
-#include "fonts/8x14_horizontal_LSB_1.h"
13 
-#include "fonts/10x16_horizontal_LSB_1.h"
14 
-#include "fonts/12x16_horizontal_LSB_1.h"
15 
-#include "fonts/12x20_horizontal_LSB_1.h"
16 
-#include "fonts/16x26_horizontal_LSB_1.h"
17 
-#include "fonts/22x36_horizontal_LSB_1.h"
18 
-#include "fonts/24x40_horizontal_LSB_1.h"
19 
-#include "fonts/32x53_horizontal_LSB_1.h"
3 
+//#include "fonts/m4x6_horizontal_LSB_1.h"
4 
+//#include "fonts/m5x8_horizontal_LSB_1.h"
5 
+//#include "fonts/m5x12_horizontal_LSB_1.h"
6 
+#include "fonts/m6x8_horizontal_LSB_1.h"
7 
+//#include "fonts/m6x10_horizontal_LSB_1.h"
8 
+#include "fonts/m7x12b_horizontal_LSB_1.h"
9 
+//#include "fonts/m7x12_horizontal_LSB_1.h"
10 
+//#include "fonts/m8x8_horizontal_LSB_1.h"
11 
+//#include "fonts/m8x12_horizontal_LSB_1.h"
12 
+//#include "fonts/m8x14_horizontal_LSB_1.h"
13 
+//#include "fonts/m10x16_horizontal_LSB_1.h"
14 
+//#include "fonts/m12x16_horizontal_LSB_1.h"
15 
+//#include "fonts/m12x20_horizontal_LSB_1.h"
16 
+#include "fonts/m16x26_horizontal_LSB_1.h"
17 
+//#include "fonts/m22x36_horizontal_LSB_1.h"
18 
+//#include "fonts/m24x40_horizontal_LSB_1.h"
19 
+//#include "fonts/m32x53_horizontal_LSB_1.h"
20 20
21 21 
 const oswald_font oswald_fonts[LAST_FONT] = {
22 
-	{ 4, 6, (char **)font_4x6},
23 
-	{ 5, 8, (char **)font_5x8},
24 
-	{ 5, 12, (char **)font_5x12},
25 
-	{ 6, 8, (char **)font_6x8},
26 
-	{ 6, 10, (char **)font_6x10},
27 
-	{ 7, 12, (char **)font_7x12},
28 
-	{ 7, 12, (char **)font_7x12b},
29 
-	{ 8, 8, (char **)font_8x8},
30 
-	{ 8, 12, (char **)font_8x12},
31 
-	{ 8, 14, (char **)font_8x14},
32 
-	{ 10, 16, (char **)font_10x16},
33 
-	{ 12, 16, (char **)font_12x16},
34 
-	{ 12, 20, (char **)font_12x20},
35 
-	{ 16, 26, (char **)font_16x26},
36 
-	{ 22, 36, (char **)font_22x36},
37 
-	{ 24, 40, (char **)font_24x40},
38 
-	{ 32, 53, (char **)font_32x53},
22 
+//	{ 4, 6, (char *)font_4x6},
23 
+//	{ 5, 8, (char *)font_5x8},
24 
+//	{ 5, 12, (char *)font_5x12},
25 
+	{ 6, 8, (uint8_t *)font_6x8},
26 
+//	{ 6, 10, (char *)font_6x10},
27 
+//	{ 7, 12, (uint8_t *)font_7x12},
28 
+	{ 7, 12, (uint8_t *)font_7x12b},
29 
+//	{ 8, 8, (char *)font_8x8},
30 
+//	{ 8, 12, (char *)font_8x12},
31 
+//	{ 8, 14, (char *)font_8x14},
32 
+//	{ 10, 16, (char *)font_10x16},
33 
+//	{ 12, 16, (char *)font_12x16},
34 
+//	{ 12, 20, (char *)font_12x20},
35 
+	{ 16, 26, (uint8_t *)font_16x26},
36 
+//	{ 22, 36, (char *)font_22x36},
37 
+//	{ 24, 40, (char *)font_24x40},
38 
+//	{ 32, 53, (char *)font_32x53},
39 39 
 };
40 40
Browse code

add missing files

Nils Faerber authored on 19/03/2013 19:24:35
Showing 1 changed files
ui/oswald_fonts.c
History View file @ dff6532
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,40 @@
1 
+#include "oswald_fonts.h"
2 
+
3 
+#include "fonts/4x6_horizontal_LSB_1.h"
4 
+#include "fonts/5x8_horizontal_LSB_1.h"
5 
+#include "fonts/5x12_horizontal_LSB_1.h"
6 
+#include "fonts/6x8_horizontal_LSB_1.h"
7 
+#include "fonts/6x10_horizontal_LSB_1.h"
8 
+#include "fonts/7x12b_horizontal_LSB_1.h"
9 
+#include "fonts/7x12_horizontal_LSB_1.h"
10 
+#include "fonts/8x8_horizontal_LSB_1.h"
11 
+#include "fonts/8x12_horizontal_LSB_1.h"
12 
+#include "fonts/8x14_horizontal_LSB_1.h"
13 
+#include "fonts/10x16_horizontal_LSB_1.h"
14 
+#include "fonts/12x16_horizontal_LSB_1.h"
15 
+#include "fonts/12x20_horizontal_LSB_1.h"
16 
+#include "fonts/16x26_horizontal_LSB_1.h"
17 
+#include "fonts/22x36_horizontal_LSB_1.h"
18 
+#include "fonts/24x40_horizontal_LSB_1.h"
19 
+#include "fonts/32x53_horizontal_LSB_1.h"
20 
+
21 
+const oswald_font oswald_fonts[LAST_FONT] = {
22 
+	{ 4, 6, (char **)font_4x6},
23 
+	{ 5, 8, (char **)font_5x8},
24 
+	{ 5, 12, (char **)font_5x12},
25 
+	{ 6, 8, (char **)font_6x8},
26 
+	{ 6, 10, (char **)font_6x10},
27 
+	{ 7, 12, (char **)font_7x12},
28 
+	{ 7, 12, (char **)font_7x12b},
29 
+	{ 8, 8, (char **)font_8x8},
30 
+	{ 8, 12, (char **)font_8x12},
31 
+	{ 8, 14, (char **)font_8x14},
32 
+	{ 10, 16, (char **)font_10x16},
33 
+	{ 12, 16, (char **)font_12x16},
34 
+	{ 12, 20, (char **)font_12x20},
35 
+	{ 16, 26, (char **)font_16x26},
36 
+	{ 22, 36, (char **)font_22x36},
37 
+	{ 24, 40, (char **)font_24x40},
38 
+	{ 32, 53, (char **)font_32x53},
39 
+};
40 
+