Dariaceli's Git
Browse code

Enable 4 alarms, fix alarm UI, implement a rough version of the main menu

Dario Rodriguez authored on 08/01/2014 22:59:59
Showing 1 changed files
ui/oswald_main.h
History View file @ 4bbe690
... ... 
@@ -3,8 +3,10 @@
3 3
4 4 
 #include "oswald.h"
5 5
6 
+#define MAX_ALARM 4
7 
+
6 8 
 extern clock_state OswaldClk;
7 
-extern alarm_clk OswaldAlarm;
9 
+extern alarm_clk OswaldAlarm[MAX_ALARM];
8 10 
 extern power_state OswaldPowerState;
9 11 
 extern watch_state OswaldState;
10 12 
 extern watch_screen OswaldScreens[];
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_main.h
History View file @ 76d86b6
... ... 
@@ -14,12 +14,12 @@ extern char MainMessage[];
14 14 
 void oswald_one_second_tick();
15 15
16 16 
 /* sets internal 'RTC' time */
17 
-void oswald_set_time(u8t hour, u8t minute, u8t second, boolean clk24hr);
18 
-void oswald_set_date(u8t day, u8t month, u16t year, boolean day_first);
17 
+void oswald_set_time(uint8_t hour, uint8_t minute, uint8_t second, boolean clk24hr);
18 
+void oswald_set_date(uint8_t day, uint8_t month, uint16_t year, boolean day_first);
19 19
20 20 
 void oswald_handle_button_press(watch_button button);
21 
-void oswald_handle_accel_event(u8t x, u8t y, u8t z);
22 
-void oswald_handle_ambientlight_event(u8t light_level);
21 
+void oswald_handle_accel_event(uint8_t x, uint8_t y, uint8_t z);
22 
+void oswald_handle_ambientlight_event(uint8_t light_level);
23 23 
 void oswald_handle_idle_event(void);
24 24 
 void oswald_one_second_tick(void);
25 25 
 void oswald_halfsecond_tick(void);
Browse code

Bluetooth handling, screen reworks for icons

Nils Faerber authored on 21/04/2013 23:10:13
Showing 1 changed files
ui/oswald_main.h
History View file @ b83e605
... ... 
@@ -8,6 +8,7 @@ extern alarm_clk OswaldAlarm;
8 8 
 extern power_state OswaldPowerState;
9 9 
 extern watch_state OswaldState;
10 10 
 extern watch_screen OswaldScreens[];
11 
+extern char MainMessage[];
11 12
12 13 
 /* gets triggered by OS timer function */
13 14 
 void oswald_one_second_tick();
... ... 
@@ -24,5 +25,5 @@ void oswald_one_second_tick(void);
24 25 
 void oswald_halfsecond_tick(void);
25 26 
 void oswald_centisecond_tick(void);
26 27 
 void oswald_init(void);
27 
-
28 
+void oswald_handle_comm_input(uint16_t mlen, const void *mdat);
28 29 
 #endif
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_main.h
History View file @ 5d0ff00
... ... 
@@ -4,6 +4,8 @@
4 4 
 #include "oswald.h"
5 5
6 6 
 extern clock_state OswaldClk;
7 
+extern alarm_clk OswaldAlarm;
8 
+extern power_state OswaldPowerState;
7 9 
 extern watch_state OswaldState;
8 10 
 extern watch_screen OswaldScreens[];
9 11
... ... 
@@ -24,4 +26,3 @@ void oswald_centisecond_tick(void);
24 26 
 void oswald_init(void);
25 27
26 28 
 #endif
27 
-
Browse code

Countless fixes and enhancements

Nils Faerber authored on 12/08/2012 21:14:19
Showing 1 changed files
ui/oswald_main.h
History View file @ e9b651b
... ... 
@@ -11,12 +11,16 @@ extern watch_screen OswaldScreens[];
11 11 
 void oswald_one_second_tick();
12 12
13 13 
 /* sets internal 'RTC' time */
14 
-void oswald_set_time(u8t hour, u8t minute, u8t second);
14 
+void oswald_set_time(u8t hour, u8t minute, u8t second, boolean clk24hr);
15 
+void oswald_set_date(u8t day, u8t month, u16t year, boolean day_first);
15 16
16 17 
 void oswald_handle_button_press(watch_button button);
17 18 
 void oswald_handle_accel_event(u8t x, u8t y, u8t z);
18 19 
 void oswald_handle_ambientlight_event(u8t light_level);
19 20 
 void oswald_handle_idle_event(void);
21 
+void oswald_one_second_tick(void);
22 
+void oswald_halfsecond_tick(void);
23 
+void oswald_centisecond_tick(void);
20 24 
 void oswald_init(void);
21 25
22 26 
 #endif
Browse code

Make idle selectable

Nils Faerber authored on 12/08/2012 02:11:30
Showing 1 changed files
ui/oswald_main.h
History View file @ 8e3cbad
... ... 
@@ -9,9 +9,14 @@ extern watch_screen OswaldScreens[];
9 9
10 10 
 /* gets triggered by OS timer function */
11 11 
 void oswald_one_second_tick();
12 
+
13 
+/* sets internal 'RTC' time */
12 14 
 void oswald_set_time(u8t hour, u8t minute, u8t second);
13 15
14 16 
 void oswald_handle_button_press(watch_button button);
17 
+void oswald_handle_accel_event(u8t x, u8t y, u8t z);
18 
+void oswald_handle_ambientlight_event(u8t light_level);
19 
+void oswald_handle_idle_event(void);
15 20 
 void oswald_init(void);
16 21
17 22 
 #endif
Browse code

Redesign to an event based handling

Nils Faerber authored on 07/08/2012 22:09:29
Showing 1 changed files
ui/oswald_main.h
History View file @ 019424a
... ... 
@@ -5,6 +5,7 @@
5 5
6 6 
 extern clock_state OswaldClk;
7 7 
 extern watch_state OswaldState;
8 
+extern watch_screen OswaldScreens[];
8 9
9 10 
 /* gets triggered by OS timer function */
10 11 
 void oswald_one_second_tick();
Browse code

Too much to note...

Nils Faerber authored on 05/08/2012 17:07:17
Showing 1 changed files
ui/oswald_main.h
History View file @ e09935a
1 1 
new file mode 100644
... ... 
@@ -0,0 +1,17 @@
1 
+#ifndef _OSWALD_MAIN_H
2 
+#define _OSWALD_MAIN_H
3 
+
4 
+#include "oswald.h"
5 
+
6 
+extern clock_state OswaldClk;
7 
+extern watch_state OswaldState;
8 
+
9 
+/* gets triggered by OS timer function */
10 
+void oswald_one_second_tick();
11 
+void oswald_set_time(u8t hour, u8t minute, u8t second);
12 
+
13 
+void oswald_handle_button_press(watch_button button);
14 
+void oswald_init(void);
15 
+
16 
+#endif
17 
+