X-Git-Url: https://git.karo-electronics.de/?p=oswald.git;a=blobdiff_plain;f=ui%2Foswald.h;h=ee51438c1edbe39141fc39627f3683b8db1f5208;hp=6e641eb35113db769b66508f572029a3a5206a59;hb=b83e605bc8ba69950a84b6ed268f0c196f68762c;hpb=8e3cbad72c8e3abb97f2081527f91af98d8558be

diff --git a/ui/oswald.h b/ui/oswald.h
index 6e641eb..ee51438 100644
--- a/ui/oswald.h
+++ b/ui/oswald.h
@@ -1,7 +1,10 @@
 #ifndef _OSWALD_H
 #define _OSWALD_H
+#include <stdio.h>
+#include <string.h>
+#include <stdint.h>
 
-#define DEBUG 1
+//#define DEBUG 1
 #ifdef DEBUG
 #define dbg_out( args... ) fprintf(stderr, args)
 #else
@@ -30,19 +33,38 @@ typedef struct {
 	u8t	minute;
 	u8t	second;
 	u8t	day;
+	u8t	wday; // day in week, 0=sunday, 1=monday,...
 	u8t	month;
-	u8t	year;
+	u16t	year;
+	boolean	clk24hr;
+	boolean day_first;
 } clock_state;
 
+#define WDAY_SUNDAY	(1 << 0)
+#define WDAY_MONDAY	(1 << 1)
+#define WDAY_TUESDAY	(1 << 2)
+#define WDAY_WEDNESDAY	(1 << 3)
+#define WDAY_THURSDAY	(1 << 4)
+#define WDAY_FRIDAY	(1 << 5)
+#define WDAY_SATURDAY	(1 << 6)
+typedef struct {
+	u8t	hour;
+	u8t	minute;
+	u8t	wday; // bitfield 0 to 6, 1=sunday, 2=monday, 4=tuesday...
+} alarm_clk;
+
 typedef enum {
 	IDLE_SCREEN = 0,
+	ALARM_SETUP_SCREEN,
+	STOP_WATCH_SCREEN,
+	BLUETOOTH_SCREEN,
 	ACCEL_DISPLAY_SCREEN,
-	DATETIME_SETTING_SCREEN,
 	MENU_TEST_SCREEN,
-//	SCREEN2_SCREEN,
-//	SCREEN3_SCREEN,
 //	APPLICATION_SCREEN,
 	LAST_SCREEN,		// a marker for the last (not valid) screen)
+	DATETIME_SETTING_SCREEN,
+	ALARM_SCREEN,
+	SCREENS_END,
 } screen_number;
 
 typedef enum {
@@ -56,13 +78,16 @@ typedef enum {
 
 #define EVENT_SCREEN_VISIBLE		(1<<0)		// screen just became visible
 #define EVENT_SCREEN_DESTROY		(1<<1)		// screen is destroyed
-#define EVENT_ONE_SEC_TIMER		(1<<2)
-#define EVENT_MS_TIMER			(1<<3)
-#define EVENT_USER_BUTTONS		(1<<4)
-#define EVENT_ACCEL_UPDATE		(1<<5)
-#define EVENT_AMBIENTLIGHT_UPDATE	(1<<6)
-#define EVENT_POWER_CHANGE		(1<<7)
-#define EVENT_COMMS			(1<<8)
+#define EVENT_ONE_SEC_TIMER		(1<<2)		// one second timer for reguler clock
+#define EVENT_HALF_SEC_TIMER		(1<<3)		// half second timer for blinking displays
+#define EVENT_CS_TIMER			(1<<4)		// centisecond timer, e.g. for stop watch
+#define EVENT_USER_BUTTONS		(1<<5)		// button presses
+#define EVENT_ACCEL_UPDATE		(1<<6)		// accelerometer updates
+#define EVENT_AMBIENTLIGHT_UPDATE	(1<<7)		// ambient light sensor updates
+#define EVENT_POWER_CHANGE		(1<<8)		// power source status change
+#define EVENT_COMMS			(1<<9)		// communication, like Bluetooth I/O
+#define EVENT_POWER_STATE		(1<<10)		// power source changed or similar
+
 
 typedef struct {
 	u16t event_mask;				// the event the screen wants to receive
@@ -76,5 +101,32 @@ typedef struct {
 	boolean pending_idle;
 } watch_state;
 
-#endif
+typedef struct {
+	u8t	x;
+	u8t	y;
+	u8t	z;
+} accel_data_t;
+
+#define POWER_SOURCE_BATTERY	0
+#define POWER_SOURCE_EXTERNAL	1
+
+#define POWER_CHARGER_DONE	0
+#define POWER_CHARGER_PRECHARGE	1
+#define POWER_CHARGER_CHARGING	2
+#define POWER_CHARGER_UNK	3
+
+typedef struct {
+	u8t	source;
+	u8t	charge_state;
+	u8t	percent;
+	u16t	level;
+} power_state;
+
+typedef enum {
+	BLUETOOTH_OFF = 0,
+	BLUETOOTH_ON,
+	BLUETOOTH_CONNECTED,
+	BLUETOOTH_ILL
+} bluetooth_state;
 
+#endif