Dariaceli's Git
Browse code

Use strutils instead of snprintf (to save some bytes), set default year to 2014, partial revamp of the stopwatch

Dario Rodriguez authored on 14/01/2014 22:59:59
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 940a301
... ... 
@@ -34,11 +34,8 @@ void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t
34 34
35 35 
 void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t fg, const uint8_t thickness);
36 36
37 
-uint8_t oswald_getwidth_character(const oswald_font_face face, const uint8_t Character);
38 
-
39 37 
 uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const uint8_t Character);
40 38
41 
-int oswald_getwidth_string(const oswald_font_face face, char *str);
42 39
43 40 
 void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, char *str);
44 41
... ... 
@@ -50,8 +47,16 @@ void oswald_draw_rect(const unsigned int x1, const unsigned int y1, const unsign
50 47
51 48 
 void oswald_draw_font58(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
52 49
50 
+void oswald_writestr_font58(const unsigned int x1, unsigned int y1, const char *str, int *width, const uint8_t fg, const uint8_t bg);
51 
+
52 
+int oswald_getwidth_font58(char *str);
53 
+
53 54 
 void oswald_draw_font58_scaled(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg,const unsigned int scalex,const unsigned int scaley);
54 55
56 
+void oswald_writestr_font58_scaled(const unsigned int x1, unsigned int y1, const char *str, int *width, const uint8_t fg, const uint8_t bg,const unsigned int scalex,const unsigned int scaley);
57 
+
58 
+int oswald_getwidth_font58_scaled(char *str, int scalex, int scaley);
59 
+
55 60 
 void oswald_draw_microdigit(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
56 61
57 62 
 void oswald_draw_tinydigit(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
Browse code

Fix bt icon, restyle about screen, remove enter hint in alarm fired screen

Dario Rodriguez authored on 10/01/2014 22:59:59
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 1d76eeb
... ... 
@@ -34,8 +34,12 @@ void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t
34 34
35 35 
 void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t fg, const uint8_t thickness);
36 36
37 
+uint8_t oswald_getwidth_character(const oswald_font_face face, const uint8_t Character);
38 
+
37 39 
 uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const uint8_t Character);
38 40
41 
+int oswald_getwidth_string(const oswald_font_face face, char *str);
42 
+
39 43 
 void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, char *str);
40 44
41 45 
 uint8_t oswald_write_string_length(const uint8_t x, const uint8_t y, const uint8_t len, const oswald_font_face face, const boolean invert, char *str);
Browse code

Fix fg/bg issues in graphics library, invert analog clock, improve help clock, make date&time setup screen nicer, continue adaptations to conform to the new button layout

Dario Rodriguez authored on 18/12/2013 22:59:59
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 08909af
... ... 
@@ -20,22 +20,19 @@
20 20 
 void oswald_draw_bitmap_opts(const unsigned int xstart, const unsigned int ystart,
21 21 
 		const unsigned int xoff, const unsigned int yoff,
22 22 
 		const unsigned int width, const unsigned int height,
23 
-		const boolean invert,
23 
+		const boolean fg,
24 24 
 		const unsigned int bmp_width, const unsigned int bmp_height,
25 25 
 		const void *bmp);
26 26
27 
-#define oswald_draw_bitmpa_invert_opt(x,y,w,h,d,i) \
28 
-	oswald_draw_bitmap_opts(x,y,0,0,w,h,i,w,h,d)
27 
+#define oswald_draw_bitmap(x,y,w,h,fg, d) \
28 
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,fg,w,h,d)
29 29
30 
-#define oswald_draw_bitmap(x,y,w,h,d) \
31 
-	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,w,h,d)
30 
+#define oswald_draw_bitmap_size(x, y, w, h, bw, bh, fg, d) \
31 
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,fg,bw,bh,d)
32 32
33 
-#define oswald_draw_bitmap_size(x, y, w, h, bw, bh, d) \
34 
-	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,bw,bh,d)
33 
+void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t fg);
35 34
36 
-void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
37 
-
38 
-void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t thickness);
35 
+void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t fg, const uint8_t thickness);
39 36
40 37 
 uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const uint8_t Character);
41 38
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_graphics.h
History View file @ bce8609
... ... 
@@ -45,4 +45,18 @@ uint8_t oswald_write_string_length(const uint8_t x, const uint8_t y, const uint8
45 45
46 46 
 void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const int16_t number);
47 47
48 
+void oswald_draw_rect(const unsigned int x1, const unsigned int y1, const unsigned int x2, const unsigned int y2, const uint8_t color);
49 
+
50 
+void oswald_draw_font58(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
51 
+
52 
+void oswald_draw_font58_scaled(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg,const unsigned int scalex,const unsigned int scaley);
53 
+
54 
+void oswald_draw_microdigit(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
55 
+
56 
+void oswald_draw_tinydigit(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
57 
+
58 
+void oswald_draw_bigdigit(const unsigned int x1, unsigned int y1, const uint8_t character, int *width, const uint8_t fg, const uint8_t bg);
59 
+
60 
+void oswald_draw_grid(const unsigned int x1, const unsigned int y1, const unsigned int x2, const unsigned int y2, const unsigned int ix, const unsigned int iy);
48 61 
 #endif
62 
+
Browse code

Some minor improvements.

Nils Faerber authored on 06/07/2013 21:21:35
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 5cb2f89
... ... 
@@ -9,7 +9,7 @@
9 9
10 10
11 11 
 #define COLOR_WHITE	0
12 
-//#define COLOR_BLACK	1
12 
+#define COLOR_BLACK	1
13 13 
 #define COLOR_XOR	2
14 14 
 #define COLOR_INV	3
15 15
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_graphics.h
History View file @ 1b57900
... ... 
@@ -6,21 +6,43 @@
6 6 
 #include "oswald_fonts.h"
7 7
8 8 
 #include "oswald_graphics.h"
9 
-// #include "Fonts.h"
10 9
11 10
12 
-void oswald_draw_pixel(const unsigned int xstart, const unsigned int ystart);
11 
+#define COLOR_WHITE	0
12 
+//#define COLOR_BLACK	1
13 
+#define COLOR_XOR	2
14 
+#define COLOR_INV	3
13 15
14 
-void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
16 
+
17 
+#define oswald_draw_pixel(xstart, ystart, color) \
18 
+	hal_lcd_set_pixel(xstart, ystart, color)
19 
+
20 
+void oswald_draw_bitmap_opts(const unsigned int xstart, const unsigned int ystart,
21 
+		const unsigned int xoff, const unsigned int yoff,
22 
+		const unsigned int width, const unsigned int height,
23 
+		const boolean invert,
24 
+		const unsigned int bmp_width, const unsigned int bmp_height,
25 
+		const void *bmp);
26 
+
27 
+#define oswald_draw_bitmpa_invert_opt(x,y,w,h,d,i) \
28 
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,i,w,h,d)
29 
+
30 
+#define oswald_draw_bitmap(x,y,w,h,d) \
31 
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,w,h,d)
32 
+
33 
+#define oswald_draw_bitmap_size(x, y, w, h, bw, bh, d) \
34 
+	oswald_draw_bitmap_opts(x,y,0,0,w,h,FALSE,bw,bh,d)
15 35
16 36 
 void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
17 37
18 38 
 void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t thickness);
19 39
20 
-uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const uint8_t Character);
40 
+uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const uint8_t Character);
41 
+
42 
+void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, char *str);
21 43
22 
-void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, char *str);
44 
+uint8_t oswald_write_string_length(const uint8_t x, const uint8_t y, const uint8_t len, const oswald_font_face face, const boolean invert, char *str);
23 45
24 
-void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const int16_t number);
46 
+void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const boolean invert, const int16_t number);
25 47
26 48 
 #endif
Browse code

Add version information and info screen, some more work on the accel screen

Nils Faerber authored on 05/05/2013 01:54:24
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 84e4829
... ... 
@@ -9,6 +9,8 @@
9 9 
 // #include "Fonts.h"
10 10
11 11
12 
+void oswald_draw_pixel(const unsigned int xstart, const unsigned int ystart);
13 
+
12 14 
 void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
13 15
14 16 
 void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
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_graphics.h
History View file @ 76d86b6
... ... 
@@ -6,11 +6,10 @@
6 6 
 #include "oswald_fonts.h"
7 7
8 8 
 #include "oswald_graphics.h"
9 
-#include "Fonts.h"
9 
+// #include "Fonts.h"
10 10
11 
-void oswald_draw_bitmap_offset(const unsigned int xstart, const unsigned int ystart, const unsigned int xoff, const unsigned int yoff, const unsigned int  width, const unsigned int  height, const void *bmp);
12 11
13 
-/*inline*/ void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
12 
+void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
14 13
15 14 
 void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
16 15
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_graphics.h
History View file @ 16600ff
... ... 
@@ -6,18 +6,20 @@
6 6 
 #include "oswald_fonts.h"
7 7
8 8 
 #include "oswald_graphics.h"
9 
+#include "Fonts.h"
9 10
11 
+void oswald_draw_bitmap_offset(const unsigned int xstart, const unsigned int ystart, const unsigned int xoff, const unsigned int yoff, const unsigned int  width, const unsigned int  height, const void *bmp);
10 12
11 
-void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);
13 
+/*inline*/ void oswald_draw_bitmap(const unsigned int xstart, const unsigned int ystart, const unsigned int width, const unsigned int height, const void *bmp);
12 14
13 
-void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
15 
+void oswald_draw_line(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend);
14 16
15 
-void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
17 
+void oswald_draw_line_ww(const uint8_t xstart, const uint8_t ystart, const uint8_t xend, const uint8_t yend, const uint8_t thickness);
16 18
17 
-u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character);
19 
+uint8_t oswald_write_character(const uint8_t x, const uint8_t y, const oswald_font_face face, const uint8_t Character);
18 20
19 
-void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str);
21 
+void oswald_write_string(const uint8_t x, const uint8_t y, const oswald_font_face face, char *str);
20 22
21 
-void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number);
23 
+void oswald_write_number(const uint8_t x, const uint8_t y, const oswald_font_face face, const int16_t number);
22 24
23 25 
 #endif
Browse code

Bluetooth handling, screen reworks for icons

Nils Faerber authored on 21/04/2013 23:10:13
Showing 1 changed files
ui/oswald_graphics.h
History View file @ b83e605
... ... 
@@ -8,6 +8,8 @@
8 8 
 #include "oswald_graphics.h"
9 9
10 10
11 
+void oswald_draw_bitmap(const uint8_t xstart, const uint8_t ystart, const uint8_t width, const uint8_t height, const void *bmp);
12 
+
11 13 
 void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
12 14
13 15 
 void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
Browse code

Oh boy... lots of changes, too many to describe

Nils Faerber authored on 21/04/2013 14:26:38
Showing 1 changed files
ui/oswald_graphics.h
History View file @ 5d0ff00
... ... 
@@ -8,7 +8,7 @@
8 8 
 #include "oswald_graphics.h"
9 9
10 10
11 
-void oswald_draw_Line(u8t xstart, u8t ystart, u8t xend, u8t yend);
11 
+void oswald_draw_Line(uint8_t xstart, uint8_t ystart, uint8_t xend, uint8_t yend);
12 12
13 13 
 void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
14 14
Browse code

add missing files

Nils Faerber authored on 19/03/2013 19:24:35
Showing 1 changed files
ui/oswald_graphics.h
History View file @ dff6532
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,21 @@
1 
+#ifndef _OSWALD_GRAPHICS_H
2 
+#define _OSWALD_GRAPHICS_H
3 
+
4 
+#include "oswald.h"
5 
+#include "oswald_strings.h"
6 
+#include "oswald_fonts.h"
7 
+
8 
+#include "oswald_graphics.h"
9 
+
10 
+
11 
+void oswald_draw_Line(u8t xstart, u8t ystart, u8t xend, u8t yend);
12 
+
13 
+void oswald_draw_line_ww(u8t xstart, u8t ystart, u8t xend, u8t yend, u8t thickness);
14 
+
15 
+u8t oswald_write_character(u8t x, u8t y, oswald_font_face face, u8t Character);
16 
+
17 
+void oswald_write_string(u8t x, u8t y, oswald_font_face face, u8t *str);
18 
+
19 
+void oswald_Write_number(u8t x, u8t y, oswald_font_face face, s16t number);
20 
+
21 
+#endif