Power saving changes, add new fonts, bitmaps and screens

[oswald.git] / ui / oswald.h

diff --git a/ui/oswald.h b/ui/oswald.h
index b03a6b33331d7717679ba7e65bb7be65ad4c47c3..dd61eed982df7c264859e9f459bf68b9f37af42f 100644 (file)
--- a/ui/oswald.h
+++ b/ui/oswald.h
@@ -4,6 +4,8 @@
 #include <string.h>
 #include <stdint.h>
 
+#define OSWALD_VERSION "v0.3"
+
 //#define DEBUG 1
 #ifdef DEBUG
 #define dbg_out( args... ) fprintf(stderr, args)
@@ -51,13 +53,17 @@ typedef struct {
 
 typedef enum {
        IDLE_SCREEN = 0,
+       MAIN_MENU_SCREEN,
        ALARM_SETUP_SCREEN,
        STOP_WATCH_SCREEN,
        BLUETOOTH_SCREEN,
        ACCEL_DISPLAY_SCREEN,
-       MENU_TEST_SCREEN,
-//     APPLICATION_SCREEN,
+       MESSAGES_SCREEN,
+       INFO_SCREEN,
        LAST_SCREEN,            // a marker for the last (not valid) screen)
+       MESSAGE_SCREEN,
+       MENU_TEST_SCREEN,
+       APPLICATION_SCREEN,
        DATETIME_SETTING_SCREEN,
        ALARM_SCREEN,
        SCREENS_END,
@@ -103,9 +109,9 @@ typedef struct {
 } watch_state;
 
 typedef struct {
-       uint8_t x;
-       uint8_t y;
-       uint8_t z;
+       int8_t  x;
+       int8_t  y;
+       int8_t  z;
 } accel_data_t;
 
 #define POWER_SOURCE_BATTERY   0